diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt index 92149396684..f1e68cc57da 100644 --- a/buildSrc/src/main/kotlin/artifacts.kt +++ b/buildSrc/src/main/kotlin/artifacts.kt @@ -62,8 +62,6 @@ fun Project.removeArtifacts(configuration: Configuration, task: Task) { fun Project.noDefaultJar() { tasks.named("jar").configure { - enabled = false - actions = emptyList() configurations.forEach { cfg -> removeArtifacts(cfg, this) } diff --git a/libraries/tools/kotlin-allopen/build.gradle b/libraries/tools/kotlin-allopen/build.gradle index 4837262e8eb..01a707301c2 100644 --- a/libraries/tools/kotlin-allopen/build.gradle +++ b/libraries/tools/kotlin-allopen/build.gradle @@ -35,6 +35,7 @@ jar { manifestAttributes(manifest, project) } +ArtifactsKt.noDefaultJar(project) ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {}) configureSourcesJar() configureJavadocJar() diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index ee85b4a1478..35128da0b96 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -103,6 +103,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) { configurations.compile.get().exclude("com.android.tools.external.com-intellij", "intellij-core") } +noDefaultJar() runtimeJar(rewriteDefaultJarDepsToShadedCompiler()).configure { dependsOn(jarContents) diff --git a/libraries/tools/kotlin-lombok/build.gradle.kts b/libraries/tools/kotlin-lombok/build.gradle.kts index 17afc442500..234c03eeb5d 100644 --- a/libraries/tools/kotlin-lombok/build.gradle.kts +++ b/libraries/tools/kotlin-lombok/build.gradle.kts @@ -21,6 +21,7 @@ publishGradlePlugin() sourcesJar() javadocJar() +noDefaultJar() runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) tasks { diff --git a/libraries/tools/kotlin-noarg/build.gradle b/libraries/tools/kotlin-noarg/build.gradle index 04ff0a7ed50..f60460e14e3 100644 --- a/libraries/tools/kotlin-noarg/build.gradle +++ b/libraries/tools/kotlin-noarg/build.gradle @@ -41,6 +41,7 @@ jar { manifestAttributes(manifest, project) } +ArtifactsKt.noDefaultJar(project) ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {}) configureSourcesJar() configureJavadocJar() diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle b/libraries/tools/kotlin-sam-with-receiver/build.gradle index 7ae03b1566d..a3a6b1bfab3 100644 --- a/libraries/tools/kotlin-sam-with-receiver/build.gradle +++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle @@ -41,6 +41,7 @@ jar { manifestAttributes(manifest, project) } +ArtifactsKt.noDefaultJar(project) ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {}) configureSourcesJar() configureJavadocJar() diff --git a/libraries/tools/kotlin-serialization/build.gradle b/libraries/tools/kotlin-serialization/build.gradle index 392b8d46a6f..3f880e1b3e4 100644 --- a/libraries/tools/kotlin-serialization/build.gradle +++ b/libraries/tools/kotlin-serialization/build.gradle @@ -31,6 +31,7 @@ jar { manifestAttributes(manifest, project) } +ArtifactsKt.noDefaultJar(project) ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {}) configureSourcesJar() configureJavadocJar() diff --git a/plugins/jvm-abi-gen/embeddable/build.gradle.kts b/plugins/jvm-abi-gen/embeddable/build.gradle.kts index 34dbbe91b06..bbd457133ed 100644 --- a/plugins/jvm-abi-gen/embeddable/build.gradle.kts +++ b/plugins/jvm-abi-gen/embeddable/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { publish() +noDefaultJar() runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) sourcesJar() diff --git a/prepare/android-extensions-compiler-gradle/build.gradle.kts b/prepare/android-extensions-compiler-gradle/build.gradle.kts index 4d10c88b276..eaf9607d39f 100644 --- a/prepare/android-extensions-compiler-gradle/build.gradle.kts +++ b/prepare/android-extensions-compiler-gradle/build.gradle.kts @@ -29,6 +29,7 @@ sourceSets { publish() +noDefaultJar() runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) sourcesJar() diff --git a/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts b/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts index b6a76ff1851..c97afe1e0a3 100644 --- a/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts +++ b/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { publish() +noDefaultJar() runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) sourcesJar() diff --git a/prepare/kotlin-daemon-embeddable/build.gradle.kts b/prepare/kotlin-daemon-embeddable/build.gradle.kts index d4a201c303b..332fb8517e1 100644 --- a/prepare/kotlin-daemon-embeddable/build.gradle.kts +++ b/prepare/kotlin-daemon-embeddable/build.gradle.kts @@ -10,6 +10,7 @@ dependencies { publish() +noDefaultJar() runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) sourcesJar() diff --git a/prepare/parcelize-compiler-gradle/build.gradle.kts b/prepare/parcelize-compiler-gradle/build.gradle.kts index 6f78dff311a..f3d36018e60 100644 --- a/prepare/parcelize-compiler-gradle/build.gradle.kts +++ b/prepare/parcelize-compiler-gradle/build.gradle.kts @@ -28,6 +28,7 @@ sourceSets { publish() +noDefaultJar() runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) sourcesJar()