From a42f607ecf1b590e10bb5bc5ddd7c79bedde45ff Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Thu, 21 Feb 2019 22:22:47 +0300 Subject: [PATCH] Build: Fix artifacts signing for maven central With gradle > 5.0 `publish()` helper call should be done before `noDefaultJar()` or any other artifact hacks, otherwise singing plugin doesn't sign any jars --- build-common/build.gradle.kts | 4 ++-- compiler/compiler-runner/build.gradle.kts | 4 ++-- compiler/daemon/daemon-client/build.gradle.kts | 4 ++-- konan/library-reader/build.gradle.kts | 4 ++-- konan/utils/build.gradle.kts | 3 ++- libraries/kotlinx-metadata/jvm/build.gradle.kts | 10 +++++----- libraries/scripting/common/build.gradle.kts | 4 ++-- libraries/scripting/intellij/build.gradle.kts | 5 ++--- .../scripting/jvm-host-embeddable/build.gradle.kts | 4 ++-- libraries/scripting/jvm-host/build.gradle.kts | 3 ++- libraries/scripting/jvm/build.gradle.kts | 6 ++---- .../kotlin-annotation-processing/build.gradle.kts | 4 ++-- .../tools/kotlin-annotations-android/build.gradle.kts | 3 ++- .../tools/kotlin-gradle-plugin-api/build.gradle.kts | 3 ++- .../tools/kotlin-gradle-plugin-model/build.gradle.kts | 3 ++- libraries/tools/kotlin-gradle-plugin/build.gradle.kts | 3 ++- libraries/tools/kotlin-main-kts/build.gradle.kts | 4 ++-- libraries/tools/kotlin-script-util/build.gradle.kts | 3 ++- .../android-extensions-runtime/build.gradle.kts | 4 ++-- plugins/jvm-abi-gen/build.gradle.kts | 3 ++- plugins/kapt3/kapt3-compiler/build.gradle.kts | 4 ++-- plugins/kapt3/kapt3-runtime/build.gradle.kts | 4 ++-- .../sam-with-receiver-cli/build.gradle.kts | 4 ++-- plugins/scripting/scripting-cli/build.gradle.kts | 4 ++-- .../scripting/scripting-embeddable/build.gradle.kts | 5 ++++- .../source-sections-compiler/build.gradle.kts | 4 ++-- .../build.gradle.kts | 3 ++- prepare/compiler-client-embeddable/build.gradle.kts | 4 ++-- prepare/compiler-embeddable/build.gradle.kts | 4 ++-- prepare/compiler/build.gradle.kts | 4 ++-- prepare/compiler/build.gradle.kts.182 | 4 ++-- prepare/compiler/build.gradle.kts.as34 | 3 ++- .../build.gradle.kts | 5 +++-- 33 files changed, 72 insertions(+), 61 deletions(-) diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index 98ad4c404a9..2e1166a9509 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -32,6 +32,8 @@ sourceSets { "test" { projectDefault() } } +publish() + runtimeJar() sourcesJar() javadocJar() @@ -39,5 +41,3 @@ javadocJar() testsJar() projectTest() - -publish() diff --git a/compiler/compiler-runner/build.gradle.kts b/compiler/compiler-runner/build.gradle.kts index 1a979bf6749..77f252b7971 100644 --- a/compiler/compiler-runner/build.gradle.kts +++ b/compiler/compiler-runner/build.gradle.kts @@ -25,10 +25,10 @@ sourceSets { "test" {} } +publish() + val jar: Jar by tasks runtimeJar(rewriteDepsToShadedCompiler(jar)) sourcesJar() javadocJar() - -publish() diff --git a/compiler/daemon/daemon-client/build.gradle.kts b/compiler/daemon/daemon-client/build.gradle.kts index 6d7e04ca648..80a0f5850d5 100644 --- a/compiler/daemon/daemon-client/build.gradle.kts +++ b/compiler/daemon/daemon-client/build.gradle.kts @@ -41,6 +41,8 @@ sourceSets { "test" {} } +publish() + noDefaultJar() runtimeJar(task("shadowJar")) { @@ -55,5 +57,3 @@ javadocJar() dist() ideaPlugin() - -publish() diff --git a/konan/library-reader/build.gradle.kts b/konan/library-reader/build.gradle.kts index e14e2343d01..db1836e410b 100644 --- a/konan/library-reader/build.gradle.kts +++ b/konan/library-reader/build.gradle.kts @@ -23,6 +23,6 @@ sourceSets { "test" { none() } } -standardPublicJars() - publish() + +standardPublicJars() diff --git a/konan/utils/build.gradle.kts b/konan/utils/build.gradle.kts index d8e3a19a61a..1389a367926 100644 --- a/konan/utils/build.gradle.kts +++ b/konan/utils/build.gradle.kts @@ -14,6 +14,7 @@ sourceSets { "test" { none() } } +publish() + standardPublicJars() -publish() diff --git a/libraries/kotlinx-metadata/jvm/build.gradle.kts b/libraries/kotlinx-metadata/jvm/build.gradle.kts index acf6cb8d886..f7b55a15e33 100644 --- a/libraries/kotlinx-metadata/jvm/build.gradle.kts +++ b/libraries/kotlinx-metadata/jvm/build.gradle.kts @@ -47,6 +47,11 @@ dependencies { testRuntime(project(":kotlin-reflect")) } + +if (deployVersion != null) { + publish() +} + noDefaultJar() task("shadowJar") { @@ -75,8 +80,3 @@ sourcesJar { } javadocJar() - -if (deployVersion != null) { - publish() -} - diff --git a/libraries/scripting/common/build.gradle.kts b/libraries/scripting/common/build.gradle.kts index 18095b0d252..c2741395da5 100644 --- a/libraries/scripting/common/build.gradle.kts +++ b/libraries/scripting/common/build.gradle.kts @@ -18,6 +18,8 @@ sourceSets { "test" {} } +publish() + val jar = runtimeJar() val sourcesJar = sourcesJar() val javadocJar = javadocJar() @@ -27,5 +29,3 @@ dist() ideaPlugin { from(jar, sourcesJar) } - -publish() diff --git a/libraries/scripting/intellij/build.gradle.kts b/libraries/scripting/intellij/build.gradle.kts index 24db888604b..96a4abb0a11 100644 --- a/libraries/scripting/intellij/build.gradle.kts +++ b/libraries/scripting/intellij/build.gradle.kts @@ -16,9 +16,8 @@ sourceSets { "test" { } } +publish() + standardPublicJars() ideaPlugin() - -publish() - diff --git a/libraries/scripting/jvm-host-embeddable/build.gradle.kts b/libraries/scripting/jvm-host-embeddable/build.gradle.kts index 7562ef6bfe0..82d2cd25c81 100644 --- a/libraries/scripting/jvm-host-embeddable/build.gradle.kts +++ b/libraries/scripting/jvm-host-embeddable/build.gradle.kts @@ -24,6 +24,8 @@ sourceSets { "test" {} } +publish() + noDefaultJar() runtimeJar(rewriteDepsToShadedCompiler( @@ -33,5 +35,3 @@ runtimeJar(rewriteDepsToShadedCompiler( )) sourcesJar() javadocJar() - -publish() diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts index a5073370fde..0a7f783683c 100644 --- a/libraries/scripting/jvm-host/build.gradle.kts +++ b/libraries/scripting/jvm-host/build.gradle.kts @@ -26,9 +26,10 @@ sourceSets { "test" { projectDefault() } } +publish() + standardPublicJars() -publish() projectTest { workingDir = rootDir diff --git a/libraries/scripting/jvm/build.gradle.kts b/libraries/scripting/jvm/build.gradle.kts index 4072cbba709..5eda59ba0ee 100644 --- a/libraries/scripting/jvm/build.gradle.kts +++ b/libraries/scripting/jvm/build.gradle.kts @@ -17,6 +17,8 @@ sourceSets { "test" {} } +publish() + val jar = runtimeJar() val sourcesJar = sourcesJar() val javadocJar = javadocJar() @@ -26,7 +28,3 @@ dist() ideaPlugin { from(jar, sourcesJar) } - -standardPublicJars() - -publish() diff --git a/libraries/tools/kotlin-annotation-processing/build.gradle.kts b/libraries/tools/kotlin-annotation-processing/build.gradle.kts index 62e2a21334f..83d9f037784 100644 --- a/libraries/tools/kotlin-annotation-processing/build.gradle.kts +++ b/libraries/tools/kotlin-annotation-processing/build.gradle.kts @@ -20,6 +20,8 @@ projectTest { workingDir = projectDir } +publish() + val jar: Jar by tasks jar.apply { classifier = "base" @@ -33,5 +35,3 @@ runtimeJar(rewriteDepsToShadedCompiler( sourcesJar() javadocJar() - -publish() diff --git a/libraries/tools/kotlin-annotations-android/build.gradle.kts b/libraries/tools/kotlin-annotations-android/build.gradle.kts index f3bda56f4d6..82083b08e00 100644 --- a/libraries/tools/kotlin-annotations-android/build.gradle.kts +++ b/libraries/tools/kotlin-annotations-android/build.gradle.kts @@ -22,9 +22,10 @@ sourceSets { } } +publish() + sourcesJar() javadocJar() runtimeJar() dist() -publish() diff --git a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts index 7e4d0225c9d..98021054c4b 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts @@ -7,9 +7,10 @@ plugins { id("jps-compatible") } -standardPublicJars() publish() +standardPublicJars() + dependencies { compile(kotlinStdlib()) compile(project(":kotlin-native:kotlin-native-utils")) diff --git a/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts index d8c7dbe6d68..46d0a4c18de 100644 --- a/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts @@ -6,9 +6,10 @@ plugins { maven } -standardPublicJars() publish() +standardPublicJars() + dependencies { compile(kotlinStdlib()) } diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 5770d9fa502..77859c2dfef 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -11,13 +11,14 @@ plugins { id("jps-compatible") } +publish() + // todo: make lazy val jar: Jar by tasks runtimeJar(rewriteDepsToShadedCompiler(jar)) sourcesJar() javadocJar() -publish() repositories { google() diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index 35de3e3812c..09c1fd3b4e2 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -55,6 +55,8 @@ sourceSets { "test" { } } +publish() + noDefaultJar() val packJar by task { @@ -98,5 +100,3 @@ dist( sourcesJar() javadocJar() - -publish() diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index 4b8b119f1e2..3a025df0a89 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -40,10 +40,11 @@ projectTest { workingDir = rootDir } +publish() + runtimeJar() sourcesJar() javadocJar() -publish() ideaPlugin() diff --git a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts index ffe87887b14..ec128dc4c3c 100644 --- a/plugins/android-extensions/android-extensions-runtime/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-runtime/build.gradle.kts @@ -17,10 +17,10 @@ sourceSets { "test" {} } +publish() + runtimeJar() sourcesJar() javadocJar() dist(targetName = "android-extensions-runtime.jar") - -publish() diff --git a/plugins/jvm-abi-gen/build.gradle.kts b/plugins/jvm-abi-gen/build.gradle.kts index 31a8acd1daa..8062912d446 100644 --- a/plugins/jvm-abi-gen/build.gradle.kts +++ b/plugins/jvm-abi-gen/build.gradle.kts @@ -33,9 +33,10 @@ projectTest { dependsOn(":dist") } +publish() + sourcesJar() javadocJar() dist() -publish() testsJar() \ No newline at end of file diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index cd29ba78aa3..77768587aca 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -50,6 +50,8 @@ projectTest { dependsOn(":dist") } +publish() + runtimeJar { fromEmbeddedComponents() } @@ -58,5 +60,3 @@ sourcesJar() javadocJar() dist() - -publish() diff --git a/plugins/kapt3/kapt3-runtime/build.gradle.kts b/plugins/kapt3/kapt3-runtime/build.gradle.kts index d408f0f0dfa..7cb0aaac6a1 100644 --- a/plugins/kapt3/kapt3-runtime/build.gradle.kts +++ b/plugins/kapt3/kapt3-runtime/build.gradle.kts @@ -16,10 +16,10 @@ sourceSets { "test" {} } +publish() + runtimeJar() sourcesJar() javadocJar() dist(targetName = "kotlin-annotation-processing-runtime.jar") - -publish() diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts index f78eabc87af..428a5371eef 100644 --- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts +++ b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts @@ -23,13 +23,13 @@ sourceSets { "test" { projectDefault() } } +publish() + val jar = runtimeJar {} sourcesJar() javadocJar() testsJar {} -publish() - dist { rename("kotlin-", "") } diff --git a/plugins/scripting/scripting-cli/build.gradle.kts b/plugins/scripting/scripting-cli/build.gradle.kts index d6860f78d47..5d3284fcbcb 100644 --- a/plugins/scripting/scripting-cli/build.gradle.kts +++ b/plugins/scripting/scripting-cli/build.gradle.kts @@ -43,12 +43,12 @@ tasks.withType> { } } +publish() + val jar = runtimeJar {} sourcesJar() javadocJar() -publish() - dist() ideaPlugin() diff --git a/plugins/scripting/scripting-embeddable/build.gradle.kts b/plugins/scripting/scripting-embeddable/build.gradle.kts index 145aff1fd78..d6e86fd1dc9 100644 --- a/plugins/scripting/scripting-embeddable/build.gradle.kts +++ b/plugins/scripting/scripting-embeddable/build.gradle.kts @@ -12,12 +12,15 @@ dependencies { packedJars(project(":kotlin-scripting-jvm")) { isTransitive = false } } +publish() + noDefaultJar() + runtimeJar(rewriteDepsToShadedCompiler( task("shadowJar") { from(packedJars) } )) + sourcesJar() javadocJar() -publish() diff --git a/plugins/source-sections/source-sections-compiler/build.gradle.kts b/plugins/source-sections/source-sections-compiler/build.gradle.kts index 5ac3c486e6e..4fae10028ee 100644 --- a/plugins/source-sections/source-sections-compiler/build.gradle.kts +++ b/plugins/source-sections/source-sections-compiler/build.gradle.kts @@ -38,10 +38,10 @@ projectTest { workingDir = rootDir } +publish() + runtimeJar() sourcesJar() javadocJar() dist() - -publish() diff --git a/prepare/android-extensions-compiler-gradle/build.gradle.kts b/prepare/android-extensions-compiler-gradle/build.gradle.kts index e034679d559..5186d1363cf 100644 --- a/prepare/android-extensions-compiler-gradle/build.gradle.kts +++ b/prepare/android-extensions-compiler-gradle/build.gradle.kts @@ -34,8 +34,9 @@ jar.apply { duplicatesStrategy = DuplicatesStrategy.FAIL } +publish() + runtimeJar(rewriteDepsToShadedCompiler(jar)) sourcesJar() javadocJar() -publish() diff --git a/prepare/compiler-client-embeddable/build.gradle.kts b/prepare/compiler-client-embeddable/build.gradle.kts index ff836517553..53cf6b2be7e 100644 --- a/prepare/compiler-client-embeddable/build.gradle.kts +++ b/prepare/compiler-client-embeddable/build.gradle.kts @@ -49,6 +49,8 @@ projectTest { } } +publish() + noDefaultJar() runtimeJar(task("shadowJar")) { @@ -57,5 +59,3 @@ runtimeJar(task("shadowJar")) { sourcesJar() javadocJar() - -publish() diff --git a/prepare/compiler-embeddable/build.gradle.kts b/prepare/compiler-embeddable/build.gradle.kts index 4d00e6c0534..4299a7ad792 100644 --- a/prepare/compiler-embeddable/build.gradle.kts +++ b/prepare/compiler-embeddable/build.gradle.kts @@ -12,6 +12,8 @@ dependencies { runtime(commonDep("org.jetbrains.intellij.deps", "trove4j")) } +publish() + noDefaultJar() // dummy is used for rewriting dependencies to the shaded packages in the embeddable compiler @@ -26,5 +28,3 @@ runtimeJar(embeddableCompiler()) { sourcesJar() javadocJar() -publish() - diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index e0c1c56f285..a07ea4ad1ab 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -91,6 +91,8 @@ dependencies { fatJarContentsStripMetadata(intellijDep()) { includeJars("oro-2.0.8", "jdom", "log4j" ) } } +publish() + noDefaultJar() val packCompiler by task { @@ -156,5 +158,3 @@ sourcesJar { } javadocJar() - -publish() diff --git a/prepare/compiler/build.gradle.kts.182 b/prepare/compiler/build.gradle.kts.182 index 0919b26bf18..3fb77cb22c1 100644 --- a/prepare/compiler/build.gradle.kts.182 +++ b/prepare/compiler/build.gradle.kts.182 @@ -154,6 +154,8 @@ dist(targetName = "$compilerBaseName.jar", fromTask = pack) { from(trove4jJar) } +publish() + runtimeJarArtifactBy(pack, pack.outputs.files.singleFile) { name = compilerBaseName classifier = "" @@ -164,5 +166,3 @@ sourcesJar { } javadocJar() - -publish() diff --git a/prepare/compiler/build.gradle.kts.as34 b/prepare/compiler/build.gradle.kts.as34 index d57c846e9d5..a548f3ba320 100644 --- a/prepare/compiler/build.gradle.kts.as34 +++ b/prepare/compiler/build.gradle.kts.as34 @@ -146,6 +146,8 @@ dist(targetName = "$compilerBaseName.jar", fromTask = pack) { from(trove4jJar) } +publish() + runtimeJarArtifactBy(pack, pack.outputs.files.singleFile) { name = compilerBaseName classifier = "" @@ -157,4 +159,3 @@ sourcesJar { javadocJar() -publish() diff --git a/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts b/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts index 85d2fa287e2..e7ea998d2fd 100644 --- a/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts +++ b/prepare/kotlin-annotation-processing-embeddable/build.gradle.kts @@ -14,12 +14,13 @@ dependencies { packedJars(project(":kotlin-annotation-processing")) { isTransitive = false } } +publish() + runtimeJar(rewriteDepsToShadedCompiler( task("shadowJar") { from(packedJars) } )) + sourcesJar() javadocJar() - -publish()