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
2019-02-21 22:22:47 +03:00
parent df3aa48c9b
commit a42f607ecf
33 changed files with 72 additions and 61 deletions
@@ -32,6 +32,8 @@ sourceSets {
    "test" { projectDefault() }
 }

+publish()
+
 runtimeJar()
 sourcesJar()
 javadocJar()
@@ -39,5 +41,3 @@ javadocJar()
 testsJar()

 projectTest()
-
-publish()
@@ -25,10 +25,10 @@ sourceSets {
    "test" {}
 }

+publish()
+
 val jar: Jar by tasks

 runtimeJar(rewriteDepsToShadedCompiler(jar))
 sourcesJar()
 javadocJar()
-
-publish()
@@ -41,6 +41,8 @@ sourceSets {
    "test" {}
 }

+publish()
+
 noDefaultJar()

 runtimeJar(task<ShadowJar>("shadowJar")) {
@@ -55,5 +57,3 @@ javadocJar()
 dist()

 ideaPlugin()
-
-publish()
@@ -23,6 +23,6 @@ sourceSets {
    "test" { none() }
 }

-standardPublicJars()
-
 publish()
+
+standardPublicJars()
@@ -14,6 +14,7 @@ sourceSets {
    "test" { none() }
 }

+publish()
+
 standardPublicJars()

-publish()
@@ -47,6 +47,11 @@ dependencies {
    testRuntime(project(":kotlin-reflect"))
 }

+
+if (deployVersion != null) {
+    publish()
+}
+
 noDefaultJar()

 task<ShadowJar>("shadowJar") {
@@ -75,8 +80,3 @@ sourcesJar {
 }

 javadocJar()
-
-if (deployVersion != null) {
-    publish()
-}
-
@@ -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()
@@ -16,9 +16,8 @@ sourceSets {
    "test" { }
 }

+publish()
+
 standardPublicJars()

 ideaPlugin()
-
-publish()
-
@@ -24,6 +24,8 @@ sourceSets {
    "test" {}
 }

+publish()
+
 noDefaultJar()

 runtimeJar(rewriteDepsToShadedCompiler(
@@ -33,5 +35,3 @@ runtimeJar(rewriteDepsToShadedCompiler(
 ))
 sourcesJar()
 javadocJar()
-
-publish()
@@ -26,9 +26,10 @@ sourceSets {
    "test" { projectDefault() }
 }

+publish()
+
 standardPublicJars()

-publish()

 projectTest {
    workingDir = rootDir
@@ -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()
@@ -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()
@@ -22,9 +22,10 @@ sourceSets {
    }
 }

+publish()
+
 sourcesJar()
 javadocJar()
 runtimeJar()
 dist()

-publish()
@@ -7,9 +7,10 @@ plugins {
    id("jps-compatible")
 }

-standardPublicJars()
 publish()

+standardPublicJars()
+
 dependencies {
    compile(kotlinStdlib())
    compile(project(":kotlin-native:kotlin-native-utils"))
@@ -6,9 +6,10 @@ plugins {
    maven
 }

-standardPublicJars()
 publish()

+standardPublicJars()
+
 dependencies {
    compile(kotlinStdlib())
 }
@@ -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()
@@ -55,6 +55,8 @@ sourceSets {
    "test" { }
 }

+publish()
+
 noDefaultJar()

 val packJar by task<ShadowJar> {
@@ -98,5 +100,3 @@ dist(

 sourcesJar()
 javadocJar()
-
-publish()
@@ -40,10 +40,11 @@ projectTest {
    workingDir = rootDir
 }

+publish()
+
 runtimeJar()
 sourcesJar()
 javadocJar()

-publish()

 ideaPlugin()
@@ -17,10 +17,10 @@ sourceSets {
    "test" {}
 }

+publish()
+
 runtimeJar()
 sourcesJar()
 javadocJar()

 dist(targetName = "android-extensions-runtime.jar")
-
-publish()
@@ -33,9 +33,10 @@ projectTest {
    dependsOn(":dist")
 }

+publish()
+
 sourcesJar()
 javadocJar()
 dist()
-publish()

 testsJar()
@@ -50,6 +50,8 @@ projectTest {
    dependsOn(":dist")
 }

+publish()
+
 runtimeJar {
    fromEmbeddedComponents()
 }
@@ -58,5 +60,3 @@ sourcesJar()
 javadocJar()

 dist()
-
-publish()
@@ -16,10 +16,10 @@ sourceSets {
    "test" {}
 }

+publish()
+
 runtimeJar()
 sourcesJar()
 javadocJar()

 dist(targetName = "kotlin-annotation-processing-runtime.jar")
-
-publish()
@@ -23,13 +23,13 @@ sourceSets {
    "test" { projectDefault() }
 }

+publish()
+
 val jar = runtimeJar {}
 sourcesJar()
 javadocJar()
 testsJar {}

-publish()
-
 dist {
    rename("kotlin-", "")
 }
@@ -43,12 +43,12 @@ tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
    }
 }

+publish()
+
 val jar = runtimeJar {}
 sourcesJar()
 javadocJar()

-publish()
-
 dist()

 ideaPlugin()
@@ -12,12 +12,15 @@ dependencies {
    packedJars(project(":kotlin-scripting-jvm")) { isTransitive = false }
 }

+publish()
+
 noDefaultJar()
+
 runtimeJar(rewriteDepsToShadedCompiler(
    task<ShadowJar>("shadowJar")  {
        from(packedJars)
    }
 ))
+
 sourcesJar()
 javadocJar()
-publish()
@@ -38,10 +38,10 @@ projectTest {
    workingDir = rootDir
 }

+publish()
+
 runtimeJar()
 sourcesJar()
 javadocJar()

 dist()
-
-publish()
@@ -34,8 +34,9 @@ jar.apply {
    duplicatesStrategy = DuplicatesStrategy.FAIL
 }

+publish()
+
 runtimeJar(rewriteDepsToShadedCompiler(jar))
 sourcesJar()
 javadocJar()

-publish()
@@ -49,6 +49,8 @@ projectTest {
    }
 }

+publish()
+
 noDefaultJar()

 runtimeJar(task<ShadowJar>("shadowJar")) {
@@ -57,5 +59,3 @@ runtimeJar(task<ShadowJar>("shadowJar")) {

 sourcesJar()
 javadocJar()
-
-publish()
@@ -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()
-
@@ -91,6 +91,8 @@ dependencies {
    fatJarContentsStripMetadata(intellijDep()) { includeJars("oro-2.0.8", "jdom", "log4j" ) }
 }

+publish()
+
 noDefaultJar()

 val packCompiler by task<ShadowJar> {
@@ -156,5 +158,3 @@ sourcesJar {
 }

 javadocJar()
-
-publish()
@@ -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()
@@ -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()
@@ -14,12 +14,13 @@ dependencies {
    packedJars(project(":kotlin-annotation-processing")) { isTransitive = false }
 }

+publish()
+
 runtimeJar(rewriteDepsToShadedCompiler(
        task<ShadowJar>("shadowJar")  {
            from(packedJars)
        }
 ))
+
 sourcesJar()
 javadocJar()
-
-publish()