From 0f41dc814f910b33c8227816e07d038a9f93c539 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 14 Aug 2019 11:35:52 +0200 Subject: [PATCH] Switch many common tasks defined in buildSrc to lazy creation also refactor some locally defined tasks to the creation avoidance API --- buildSrc/src/main/kotlin/artifacts.kt | 9 +-- buildSrc/src/main/kotlin/embeddable.kt | 64 +++++++++++-------- buildSrc/src/main/kotlin/tasks.kt | 8 ++- compiler/compiler-runner/build.gradle.kts | 4 +- compiler/daemon/build.gradle.kts | 2 +- .../daemon/daemon-client-new/build.gradle.kts | 2 +- compiler/tests-different-jdk/build.gradle.kts | 2 +- .../protobuf-relocated/build.gradle.kts | 2 +- .../build.gradle | 2 +- .../kotlinx-metadata/jvm/build.gradle.kts | 2 +- .../jsr223-embeddable/build.gradle.kts | 2 +- .../jvm-host-embeddable/build.gradle.kts | 3 +- .../jvm-minimal-for-test/build.gradle.kts | 2 +- libraries/tools/kotlin-allopen/build.gradle | 2 +- .../build.gradle.kts | 6 +- .../new-model-in-old-plugin/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../kotlin-gradle-plugin/build.gradle.kts | 4 +- libraries/tools/kotlin-noarg/build.gradle | 2 +- .../kotlin-sam-with-receiver/build.gradle | 2 +- .../build.gradle | 3 +- .../tools/kotlin-serialization/build.gradle | 2 +- .../jvm-abi-gen/embeddable/build.gradle.kts | 3 +- .../build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../build.gradle.kts | 3 +- prepare/idea-plugin/build.gradle.kts | 2 +- .../build.gradle.kts | 3 +- .../kotlin-daemon-embeddable/build.gradle.kts | 2 +- 29 files changed, 77 insertions(+), 69 deletions(-) diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt index b890fb6856e..ab34734f64a 100644 --- a/buildSrc/src/main/kotlin/artifacts.kt +++ b/buildSrc/src/main/kotlin/artifacts.kt @@ -69,12 +69,12 @@ fun Project.runtimeJarArtifactBy(task: Task, artifactRef: Any, body: Configurabl } } -fun Project.runtimeJar(task: T, body: T.() -> Unit = {}): T { +fun Project.runtimeJar(task: TaskProvider, body: T.() -> Unit = {}): TaskProvider { extra["runtimeJarTask"] = task tasks.findByName("jar")?.let { defaultJarTask -> removeArtifacts(configurations.getOrCreate("archives"), defaultJarTask) } - return task.apply { + task.configure { configurations.findByName("embedded")?.let { embedded -> dependsOn(embedded) from { @@ -86,9 +86,10 @@ fun Project.runtimeJar(task: T, body: T.() -> Unit = {}): T { body() project.runtimeJarArtifactBy(this, this) } + return task } -fun Project.runtimeJar(body: Jar.() -> Unit = {}): Jar = runtimeJar(getOrCreateTask("jar", body), { }) +fun Project.runtimeJar(body: Jar.() -> Unit = {}): TaskProvider = runtimeJar(getOrCreateTask("jar", body), { }) fun Project.sourcesJar(body: Jar.() -> Unit = {}): TaskProvider { val task = tasks.register("sourcesJar") { @@ -116,7 +117,7 @@ fun Project.sourcesJar(body: Jar.() -> Unit = {}): TaskProvider { return task } -fun Project.javadocJar(body: Jar.() -> Unit = {}): Jar = getOrCreateTask("javadocJar") { +fun Project.javadocJar(body: Jar.() -> Unit = {}): TaskProvider = getOrCreateTask("javadocJar") { duplicatesStrategy = DuplicatesStrategy.EXCLUDE classifier = "javadoc" tasks.findByName("javadoc")?.let { it as Javadoc }?.takeIf { it.enabled }?.let { diff --git a/buildSrc/src/main/kotlin/embeddable.kt b/buildSrc/src/main/kotlin/embeddable.kt index fef790c61ac..12ad645ab52 100644 --- a/buildSrc/src/main/kotlin/embeddable.kt +++ b/buildSrc/src/main/kotlin/embeddable.kt @@ -3,8 +3,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.api.Project import org.gradle.api.file.DuplicatesStrategy +import org.gradle.api.tasks.TaskProvider import org.gradle.jvm.tasks.Jar -import org.gradle.kotlin.dsl.task import org.gradle.kotlin.dsl.* import java.io.File @@ -59,12 +59,12 @@ private fun ShadowJar.configureEmbeddableCompilerRelocation(withJavaxInject: Boo } } -private fun Project.compilerShadowJar(taskName: String, body: ShadowJar.() -> Unit): Jar { +private fun Project.compilerShadowJar(taskName: String, body: ShadowJar.() -> Unit): TaskProvider { val compilerJar = configurations.getOrCreate("compilerJar") dependencies.add(compilerJar.name, dependencies.project(":kotlin-compiler", configuration = "runtimeJar")) - return task(taskName) { + return tasks.register(taskName) { destinationDir = File(buildDir, "libs") setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE) from(compilerJar) @@ -72,31 +72,39 @@ private fun Project.compilerShadowJar(taskName: String, body: ShadowJar.() -> Un } } -fun Project.embeddableCompiler(taskName: String = "embeddable", body: ShadowJar.() -> Unit = {}): Jar = - compilerShadowJar(taskName) { - configureEmbeddableCompilerRelocation() - body() - } +fun Project.embeddableCompiler(taskName: String = "embeddable", body: ShadowJar.() -> Unit = {}): TaskProvider = + compilerShadowJar(taskName) { + configureEmbeddableCompilerRelocation() + body() + } -fun Project.compilerDummyForDependenciesRewriting(taskName: String = "compilerDummy", body: ShadowJar.() -> Unit = {}): Jar = - compilerShadowJar(taskName) { - exclude(packagesToExcludeFromDummy) - body() - } +fun Project.compilerDummyForDependenciesRewriting( + taskName: String = "compilerDummy", body: ShadowJar.() -> Unit = {} +): TaskProvider = + compilerShadowJar(taskName) { + exclude(packagesToExcludeFromDummy) + body() + } const val COMPILER_DUMMY_JAR_CONFIGURATION_NAME = "compilerDummyJar" -fun Project.compilerDummyJar(task: Jar, body: Jar.() -> Unit = {}) { - task.body() - addArtifact(COMPILER_DUMMY_JAR_CONFIGURATION_NAME, task, task) +fun Project.compilerDummyJar(task: TaskProvider, body: Jar.() -> Unit = {}) { + task.configure(body) + task.configure { + addArtifact(COMPILER_DUMMY_JAR_CONFIGURATION_NAME, this, this) + } } -fun Project.embeddableCompilerDummyForDependenciesRewriting(taskName: String = "embeddable", body: Jar.() -> Unit = {}): Jar { +fun Project.embeddableCompilerDummyForDependenciesRewriting( + taskName: String = "embeddable", body: Jar.() -> Unit = {} +): TaskProvider { val compilerDummyJar = configurations.getOrCreate("compilerDummyJar") - dependencies.add(compilerDummyJar.name, - dependencies.project(":kotlin-compiler-embeddable", configuration = COMPILER_DUMMY_JAR_CONFIGURATION_NAME)) + dependencies.add( + compilerDummyJar.name, + dependencies.project(":kotlin-compiler-embeddable", configuration = COMPILER_DUMMY_JAR_CONFIGURATION_NAME) + ) - return task(taskName) { + return tasks.register(taskName) { destinationDir = File(buildDir, "libs") setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE) from(compilerDummyJar) @@ -105,14 +113,16 @@ fun Project.embeddableCompilerDummyForDependenciesRewriting(taskName: String = " } } -fun Project.rewriteDepsToShadedJar(originalJarTask: Jar, shadowJarTask: Jar, body: Jar.() -> Unit = {}): Jar { - originalJarTask.apply { +fun Project.rewriteDepsToShadedJar( + originalJarTask: TaskProvider, shadowJarTask: TaskProvider, body: Jar.() -> Unit = {} +): TaskProvider { + originalJarTask.configure { classifier = "original" } val compilerDummyJarFile by lazy { configurations.getAt("compilerDummyJar").singleFile } - return shadowJarTask.apply { + shadowJarTask.configure { dependsOn(originalJarTask) from(originalJarTask)// { include("**") } @@ -123,7 +133,11 @@ fun Project.rewriteDepsToShadedJar(originalJarTask: Jar, shadowJarTask: Jar, bod classifier = "" body() } + return shadowJarTask } -fun Project.rewriteDepsToShadedCompiler(originalJarTask: Jar, body: Jar.() -> Unit = {}): Jar = - rewriteDepsToShadedJar(originalJarTask, embeddableCompilerDummyForDependenciesRewriting(), body) +fun Project.rewriteDepsToShadedCompiler(originalJarTask: TaskProvider, body: Jar.() -> Unit = {}): TaskProvider = + rewriteDepsToShadedJar(originalJarTask, embeddableCompilerDummyForDependenciesRewriting(), body) + +fun Project.rewriteDefaultJarDepsToShadedCompiler(body: Jar.() -> Unit = {}): TaskProvider = + rewriteDepsToShadedJar(tasks.named("jar"), embeddableCompilerDummyForDependenciesRewriting(), body) diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 0e5f52050f9..b0bca14ad6a 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -21,6 +21,7 @@ import org.gradle.api.Project import org.gradle.api.Task import org.gradle.api.internal.tasks.testing.filter.DefaultTestFilter +import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.testing.Test import org.gradle.kotlin.dsl.extra import org.gradle.kotlin.dsl.project @@ -36,7 +37,7 @@ fun Project.projectTest( parallel: Boolean = false, shortenTempRootName: Boolean = false, body: Test.() -> Unit = {} -): Test = getOrCreateTask(taskName) { +): TaskProvider = getOrCreateTask(taskName) { doFirst { val commandLineIncludePatterns = (filter as? DefaultTestFilter)?.commandLineIncludePatterns ?: emptySet() val patterns = filter.includePatterns + commandLineIncludePatterns @@ -141,8 +142,9 @@ fun Project.projectTest( private inline fun String.isFirstChar(f: (Char) -> Boolean) = isNotEmpty() && f(first()) -inline fun Project.getOrCreateTask(taskName: String, body: T.() -> Unit): T = - (tasks.findByName(taskName)?.let { it as T } ?: task(taskName)).apply { body() } +inline fun Project.getOrCreateTask(taskName: String, noinline body: T.() -> Unit): TaskProvider = + if (tasks.names.contains(taskName)) tasks.named(taskName, T::class.java).apply { configure(body) } + else tasks.register(taskName, T::class.java, body) object TaskUtils { fun useAndroidSdk(task: Task) { diff --git a/compiler/compiler-runner/build.gradle.kts b/compiler/compiler-runner/build.gradle.kts index a92cf72e479..9f6d7083322 100644 --- a/compiler/compiler-runner/build.gradle.kts +++ b/compiler/compiler-runner/build.gradle.kts @@ -29,8 +29,6 @@ sourceSets { publish() -val jar: Jar by tasks - -runtimeJar(rewriteDepsToShadedCompiler(jar)) +runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) sourcesJar() javadocJar() diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts index 53008ccebd9..35b81045cbb 100644 --- a/compiler/daemon/build.gradle.kts +++ b/compiler/daemon/build.gradle.kts @@ -50,7 +50,7 @@ publish() noDefaultJar() -runtimeJar(task("shadowJar")) { +runtimeJar(tasks.register("shadowJar")) { from(mainSourceSet.output) } diff --git a/compiler/daemon/daemon-client-new/build.gradle.kts b/compiler/daemon/daemon-client-new/build.gradle.kts index e140f905513..07e03512c3f 100644 --- a/compiler/daemon/daemon-client-new/build.gradle.kts +++ b/compiler/daemon/daemon-client-new/build.gradle.kts @@ -65,7 +65,7 @@ publish() noDefaultJar() -runtimeJar(task("shadowJar")) { +runtimeJar(tasks.register("shadowJar")) { from(mainSourceSet.output) } diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts index d98e1f16800..2769874b432 100644 --- a/compiler/tests-different-jdk/build.gradle.kts +++ b/compiler/tests-different-jdk/build.gradle.kts @@ -34,7 +34,7 @@ fun Project.codegenTest( target: Int, jvm: String, jdk: String, targetInTestClass: String = "$target", body: Test.() -> Unit -): Test = projectTest("codegenTarget${targetInTestClass}Jvm${jvm}Test") { +): TaskProvider = projectTest("codegenTarget${targetInTestClass}Jvm${jvm}Test") { dependsOn(":dist") workingDir = rootDir diff --git a/dependencies/protobuf/protobuf-relocated/build.gradle.kts b/dependencies/protobuf/protobuf-relocated/build.gradle.kts index 98c077ec55e..11cfe96c540 100644 --- a/dependencies/protobuf/protobuf-relocated/build.gradle.kts +++ b/dependencies/protobuf/protobuf-relocated/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { baseProtobufSources("com.google.protobuf:protobuf-java:$protobufVersion:sources") } -val prepare = task("prepare") { +val prepare = tasks.register("prepare") { destinationDir = File(outputJarsPath) version = protobufVersion classifier = "" diff --git a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle index db24cc05841..ccd251c6257 100644 --- a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle +++ b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle @@ -37,5 +37,5 @@ dependencies { // Relocate `com.intellij.*` and some other classes to match those in the `kotlin-compiler-embeddable` // (for example, the actual package at runtime is `org.jetbrains.kotlin.com.intellij.*`): -ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDepsToShadedCompiler(project, jar, {}), {}) +ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {}) // In a standalone build, you can setup the relocation with the Shadow plugin. \ No newline at end of file diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts index f7b55a15e33..651268caf58 100644 --- a/libraries/kotlinx-metadata/jvm/build.gradle.kts +++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts @@ -54,7 +54,7 @@ if (deployVersion != null) { noDefaultJar() -task("shadowJar") { +tasks.register("shadowJar") { callGroovy("manifestAttributes", manifest, project) manifest.attributes["Implementation-Version"] = version diff --git a/libraries/scripting/jsr223-embeddable/build.gradle.kts b/libraries/scripting/jsr223-embeddable/build.gradle.kts index 7c43c6d2b3e..5cf02a12683 100644 --- a/libraries/scripting/jsr223-embeddable/build.gradle.kts +++ b/libraries/scripting/jsr223-embeddable/build.gradle.kts @@ -29,7 +29,7 @@ publish() noDefaultJar() runtimeJar(rewriteDepsToShadedCompiler( - task("shadowJar") { + tasks.register("shadowJar") { from(packedJars) } )) diff --git a/libraries/scripting/jvm-host-embeddable/build.gradle.kts b/libraries/scripting/jvm-host-embeddable/build.gradle.kts index 4728385e419..9a94196ee43 100644 --- a/libraries/scripting/jvm-host-embeddable/build.gradle.kts +++ b/libraries/scripting/jvm-host-embeddable/build.gradle.kts @@ -23,7 +23,6 @@ publish() noDefaultJar() -val jar = tasks.getByName("jar") -runtimeJar(rewriteDepsToShadedCompiler(jar)) +runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) sourcesJar() javadocJar() diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts index 3201847ba3e..16e5141699e 100644 --- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts +++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts @@ -75,7 +75,7 @@ publishing { publications { create("internal") { artifactId = "kotlin-stdlib-minimal-for-test" - artifact(jar) + artifact(jar.get()) } } diff --git a/libraries/tools/kotlin-allopen/build.gradle b/libraries/tools/kotlin-allopen/build.gradle index 55db19286a3..40e3b63da98 100644 --- a/libraries/tools/kotlin-allopen/build.gradle +++ b/libraries/tools/kotlin-allopen/build.gradle @@ -34,7 +34,7 @@ jar { manifestAttributes(manifest, project) } -ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDepsToShadedCompiler(project, jar, {}), {}) +ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {}) artifacts { archives sourcesJar diff --git a/libraries/tools/kotlin-annotation-processing/build.gradle.kts b/libraries/tools/kotlin-annotation-processing/build.gradle.kts index 49fdc5f094f..c67f1234341 100644 --- a/libraries/tools/kotlin-annotation-processing/build.gradle.kts +++ b/libraries/tools/kotlin-annotation-processing/build.gradle.kts @@ -1,5 +1,4 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import org.gradle.api.internal.artifacts.publish.ArchivePublishArtifact import org.gradle.jvm.tasks.Jar description = "Kapt - Annotation processing for Kotlin" @@ -22,13 +21,12 @@ projectTest(parallel = true) { publish() -val jar: Jar by tasks -jar.apply { +tasks.named("jar").configure { classifier = "base" } runtimeJar(rewriteDepsToShadedCompiler( - task("shadowJar") { + tasks.register("shadowJar") { from(packedJars) } )) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-model-in-old-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-model-in-old-plugin/build.gradle.kts index 3799f476895..689c91def8c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-model-in-old-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-model-in-old-plugin/build.gradle.kts @@ -42,7 +42,7 @@ kotlin.target.compilations { } } -val runBenchmark by tasks.registering(JavaExec::class) { +val runBenchmark by tasks.registering { classpath = kotlin.target.compilations["benchmark"].run { runtimeDependencyFiles + output.allOutputs } main = "com.example.ABenchmarkKt" } diff --git a/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts index dd18e1b4896..a9c098b3a0a 100644 --- a/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts @@ -28,7 +28,7 @@ dependencies { } runtimeJar(rewriteDepsToShadedCompiler( - task("shadowJar") { + tasks.register("shadowJar") { from(packedJars) } )) diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 862a1dd8ce6..379d7e4ac08 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -13,8 +13,6 @@ plugins { publish() -// todo: make lazy -val jar: Jar by tasks val jarContents by configurations.creating sourcesJar() @@ -91,7 +89,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) { configurations.compile.get().exclude("com.android.tools.external.com-intellij", "intellij-core") } -runtimeJar(rewriteDepsToShadedCompiler(jar)) { +runtimeJar(rewriteDefaultJarDepsToShadedCompiler()).configure { dependsOn(jarContents) from { diff --git a/libraries/tools/kotlin-noarg/build.gradle b/libraries/tools/kotlin-noarg/build.gradle index be3ac0ae88a..ffba67fb827 100644 --- a/libraries/tools/kotlin-noarg/build.gradle +++ b/libraries/tools/kotlin-noarg/build.gradle @@ -40,7 +40,7 @@ jar { manifestAttributes(manifest, project) } -ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDepsToShadedCompiler(project, jar, {}), {}) +ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {}) artifacts { archives sourcesJar diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle b/libraries/tools/kotlin-sam-with-receiver/build.gradle index 86b8d40f902..9725262cb74 100644 --- a/libraries/tools/kotlin-sam-with-receiver/build.gradle +++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle @@ -40,7 +40,7 @@ jar { manifestAttributes(manifest, project) } -ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDepsToShadedCompiler(project, jar, {}), {}) +ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {}) artifacts { archives sourcesJar diff --git a/libraries/tools/kotlin-serialization-unshaded/build.gradle b/libraries/tools/kotlin-serialization-unshaded/build.gradle index 73c4f46b551..e44ab72c5f9 100644 --- a/libraries/tools/kotlin-serialization-unshaded/build.gradle +++ b/libraries/tools/kotlin-serialization-unshaded/build.gradle @@ -13,7 +13,8 @@ compileJava { options.fork = false } -jar { +TaskProvider jar = tasks.named("jar") +jar.configure { manifestAttributes(manifest, project) } diff --git a/libraries/tools/kotlin-serialization/build.gradle b/libraries/tools/kotlin-serialization/build.gradle index 6a77adffdac..3692167959c 100644 --- a/libraries/tools/kotlin-serialization/build.gradle +++ b/libraries/tools/kotlin-serialization/build.gradle @@ -28,7 +28,7 @@ jar { manifestAttributes(manifest, project) } -ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDepsToShadedCompiler(project, jar, {}), {}) +ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {}) artifacts { archives sourcesJar diff --git a/plugins/jvm-abi-gen/embeddable/build.gradle.kts b/plugins/jvm-abi-gen/embeddable/build.gradle.kts index 5f809efbd9d..34dbbe91b06 100644 --- a/plugins/jvm-abi-gen/embeddable/build.gradle.kts +++ b/plugins/jvm-abi-gen/embeddable/build.gradle.kts @@ -12,8 +12,7 @@ dependencies { publish() -val jar: Jar by tasks -runtimeJar(rewriteDepsToShadedCompiler(jar)) +runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) sourcesJar() diff --git a/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts b/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts index dfa579f5ca0..7a439389614 100644 --- a/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-embeddable/build.gradle.kts @@ -16,7 +16,7 @@ publish() noDefaultJar() runtimeJar(rewriteDepsToShadedCompiler( - task("shadowJar") { + tasks.register("shadowJar") { from(packedJars) } )) diff --git a/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts b/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts index da095fe3a75..4a564c34027 100644 --- a/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts +++ b/plugins/scripting/scripting-compiler-impl-embeddable/build.gradle.kts @@ -17,7 +17,7 @@ publish() noDefaultJar() runtimeJar(rewriteDepsToShadedCompiler( - task("shadowJar") { + tasks.register("shadowJar") { from(packedJars) } )) diff --git a/prepare/android-extensions-compiler-gradle/build.gradle.kts b/prepare/android-extensions-compiler-gradle/build.gradle.kts index feca579977c..646b893b209 100644 --- a/prepare/android-extensions-compiler-gradle/build.gradle.kts +++ b/prepare/android-extensions-compiler-gradle/build.gradle.kts @@ -29,8 +29,7 @@ sourceSets { publish() -val jar: Jar by tasks -runtimeJar(rewriteDepsToShadedCompiler(jar)) +runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) sourcesJar() diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 424db05d826..b7e50613707 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -157,7 +157,7 @@ dependencies { val jar = runtimeJar { from("$rootDir/resources/kotlinManifest.properties") archiveName = "kotlin-plugin.jar" -} +}.get() // make it eager to avoid corresponding refactorings in the kotlin-ultimate part for now val ideaPluginDir: File by rootProject.extra tasks.register("ideaPlugin") { diff --git a/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts b/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts index ccd904a4bf5..b6a76ff1851 100644 --- a/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts +++ b/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts @@ -12,8 +12,7 @@ dependencies { publish() -val jar: Jar by tasks -runtimeJar(rewriteDepsToShadedCompiler(jar)) +runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) sourcesJar() diff --git a/prepare/kotlin-daemon-embeddable/build.gradle.kts b/prepare/kotlin-daemon-embeddable/build.gradle.kts index 8a701499021..2d4f982988c 100644 --- a/prepare/kotlin-daemon-embeddable/build.gradle.kts +++ b/prepare/kotlin-daemon-embeddable/build.gradle.kts @@ -19,7 +19,7 @@ publish() noDefaultJar() runtimeJar(rewriteDepsToShadedCompiler( - task("shadowJar") { + tasks.register("shadowJar") { from(packedJars) } ))