azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated ConfigureUtil usages in JS configuration DSL

Browse Source 
^KT-46019 In Progress
This commit is contained in:
Yahor Berdnikau
2022-06-27 23:06:07 +02:00
committed by Space
parent ae3451e2c8
commit ddeb8b0a1f
9 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/KotlinJsTarget.kt
+4 -4
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
import org.jetbrains.kotlin.gradle.utils.setProperty
import javax.inject.Inject
open class KotlinJsTarget
abstract class KotlinJsTarget
@Inject
constructor(
project: Project,
@@ -70,9 +70,9 @@ constructor(
if (irTarget == null)
super.kotlinComponents
else {
val mainCompilation = compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME)
val mainCompilation = compilations.getByName(MAIN_COMPILATION_NAME)
val usageContexts = createUsageContexts(mainCompilation) +
irTarget!!.createUsageContexts(irTarget!!.compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME))
irTarget!!.createUsageContexts(irTarget!!.compilations.getByName(MAIN_COMPILATION_NAME))
val componentName =
if (project.kotlinExtension is KotlinMultiplatformExtension)
@@ -96,7 +96,7 @@ constructor(
return usageContexts +
DefaultKotlinUsageContext(
compilation = compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME),
compilation = compilations.getByName(MAIN_COMPILATION_NAME),
usage = project.usageByName("java-api-jars"),
dependencyConfigurationName = commonFakeApiElementsConfigurationName,
overrideConfigurationArtifacts = project.setProperty { emptyList() }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinJsTargetDsl.kt
+17 -18
View File
@@ -5,10 +5,9 @@
package org.jetbrains.kotlin.gradle.targets.js.dsl
import groovy.lang.Closure
import org.gradle.api.Action
import org.gradle.api.GradleException
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.util.ConfigureUtil
import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
@@ -39,17 +38,17 @@ interface KotlinJsTargetDsl : KotlinTarget {
fun browser() = browser { }
fun browser(body: KotlinJsBrowserDsl.() -> Unit)
fun browser(fn: Closure<*>) {
fun browser(fn: Action<KotlinJsBrowserDsl>) {
browser {
ConfigureUtil.configure(fn, this)
fn.execute(this)
}
}
fun nodejs() = nodejs { }
fun nodejs(body: KotlinJsNodeDsl.() -> Unit)
fun nodejs(fn: Closure<*>) {
fun nodejs(fn: Action<KotlinJsNodeDsl>) {
nodejs {
ConfigureUtil.configure(fn, this)
fn.execute(this)
}
}
@@ -77,16 +76,16 @@ interface KotlinJsSubTargetDsl {
fun distribution(body: Distribution.() -> Unit)
@ExperimentalDistributionDsl
fun distribution(fn: Closure<*>) {
fun distribution(fn: Action<Distribution>) {
distribution {
ConfigureUtil.configure(fn, this)
fn.execute(this)
}
}
fun testTask(body: KotlinJsTest.() -> Unit)
fun testTask(fn: Closure<*>) {
fun testTask(fn: Action<KotlinJsTest>) {
testTask {
ConfigureUtil.configure(fn, this)
fn.execute(this)
}
}
@@ -95,23 +94,23 @@ interface KotlinJsSubTargetDsl {
interface KotlinJsBrowserDsl : KotlinJsSubTargetDsl {
fun commonWebpackConfig(body: KotlinWebpackConfig.() -> Unit)
fun commonWebpackConfig(fn: Closure<*>) {
fun commonWebpackConfig(fn: Action<KotlinWebpackConfig>) {
commonWebpackConfig {
ConfigureUtil.configure(fn, this)
fn.execute(this)
}
}
fun runTask(body: KotlinWebpack.() -> Unit)
fun runTask(fn: Closure<*>) {
fun runTask(fn: Action<KotlinWebpack>) {
runTask {
ConfigureUtil.configure(fn, this)
fn.execute(this)
}
}
fun webpackTask(body: KotlinWebpack.() -> Unit)
fun webpackTask(fn: Closure<*>) {
fun webpackTask(fn: Action<KotlinWebpack>) {
webpackTask {
ConfigureUtil.configure(fn, this)
fn.execute(this)
}
}
@@ -119,9 +118,9 @@ interface KotlinJsBrowserDsl : KotlinJsSubTargetDsl {
fun dceTask(body: KotlinJsDce.() -> Unit)
@ExperimentalDceDsl
fun dceTask(fn: Closure<*>) {
fun dceTask(fn: Action<KotlinJsDce>) {
dceTask {
ConfigureUtil.configure(fn, this)
fn.execute(this)
}
}
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/dsl/KotlinWasmTargetDsl.kt
+5 -6
View File
@@ -5,8 +5,7 @@
package org.jetbrains.kotlin.gradle.targets.js.dsl
import groovy.lang.Closure
import org.gradle.util.ConfigureUtil
import org.gradle.api.Action
import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
import org.jetbrains.kotlin.gradle.targets.js.binaryen.BinaryenExec
import org.jetbrains.kotlin.gradle.targets.js.d8.D8Exec
@@ -24,17 +23,17 @@ interface KotlinWasmSubTargetContainerDsl : KotlinTarget {
interface KotlinWasmTargetDsl : KotlinJsTargetDsl {
fun d8() = d8 { }
fun d8(body: KotlinWasmD8Dsl.() -> Unit)
fun d8(fn: Closure<*>) {
fun d8(fn: Action<KotlinWasmD8Dsl>) {
d8 {
ConfigureUtil.configure(fn, this)
fn.execute(this)
}
}
fun applyBinaryen() = applyBinaryen { }
fun applyBinaryen(body: BinaryenExec.() -> Unit)
fun applyBinaryen(fn: Closure<*>) {
fun applyBinaryen(fn: Action<BinaryenExec>) {
applyBinaryen {
ConfigureUtil.configure(fn, this)
fn.execute(this)
}
}
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinBrowserJsIr.kt
+1 -2
View File
@@ -10,7 +10,6 @@ import org.gradle.api.provider.Provider
import org.gradle.api.tasks.Copy
import org.gradle.language.base.plugins.LifecycleBasePlugin
import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
import org.jetbrains.kotlin.gradle.report.BuildMetricsReporterService
@@ -31,7 +30,7 @@ import org.jetbrains.kotlin.gradle.utils.newFileProperty
import java.io.File
import javax.inject.Inject
open class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
abstract class KotlinBrowserJsIr @Inject constructor(target: KotlinJsIrTarget) :
KotlinJsIrSubTarget(target, "browser"),
KotlinJsBrowserDsl {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinD8Ir.kt
+1 -1
View File
@@ -15,7 +15,7 @@ import org.jetbrains.kotlin.gradle.tasks.locateTask
import org.jetbrains.kotlin.gradle.tasks.withType
import javax.inject.Inject
open class KotlinD8Ir @Inject constructor(target: KotlinJsIrTarget) :
abstract class KotlinD8Ir @Inject constructor(target: KotlinJsIrTarget) :
KotlinJsIrSubTargetBase(target, "d8"),
KotlinWasmD8Dsl {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTarget.kt
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
import org.jetbrains.kotlin.gradle.utils.setProperty
import javax.inject.Inject
open class KotlinJsIrTarget
abstract class KotlinJsIrTarget
@Inject
constructor(
project: Project,
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinNodeJsIr.kt
+1 -1
View File
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.gradle.tasks.locateTask
import org.jetbrains.kotlin.gradle.tasks.withType
import javax.inject.Inject
open class KotlinNodeJsIr @Inject constructor(target: KotlinJsIrTarget) :
abstract class KotlinNodeJsIr @Inject constructor(target: KotlinJsIrTarget) :
KotlinJsIrSubTargetBase(target, "node"),
KotlinJsNodeDsl {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinBrowserJs.kt
+1 -1
View File
@@ -37,7 +37,7 @@ import java.io.File
import javax.inject.Inject
import org.jetbrains.kotlin.gradle.tasks.KotlinJsDce as KotlinJsDceTask
open class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
abstract class KotlinBrowserJs @Inject constructor(target: KotlinJsTarget) :
KotlinJsSubTarget(target, "browser"),
KotlinJsBrowserDsl {
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinNodeJs.kt
+1 -1
View File
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.gradle.tasks.dependsOn
import org.jetbrains.kotlin.gradle.tasks.withType
import javax.inject.Inject
open class KotlinNodeJs @Inject constructor(target: KotlinJsTarget) :
abstract class KotlinNodeJs @Inject constructor(target: KotlinJsTarget) :
KotlinJsSubTarget(target, "node"),
KotlinJsNodeDsl {
override val testTaskDescription: String