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
This commit is contained in:
Vyacheslav Gerasimov
2019-02-21 22:22:47 +03:00
parent df3aa48c9b
commit a42f607ecf
33 changed files with 72 additions and 61 deletions
+2 -2
View File
@@ -32,6 +32,8 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
publish()
runtimeJar() runtimeJar()
sourcesJar() sourcesJar()
javadocJar() javadocJar()
@@ -39,5 +41,3 @@ javadocJar()
testsJar() testsJar()
projectTest() projectTest()
publish()
+2 -2
View File
@@ -25,10 +25,10 @@ sourceSets {
"test" {} "test" {}
} }
publish()
val jar: Jar by tasks val jar: Jar by tasks
runtimeJar(rewriteDepsToShadedCompiler(jar)) runtimeJar(rewriteDepsToShadedCompiler(jar))
sourcesJar() sourcesJar()
javadocJar() javadocJar()
publish()
@@ -41,6 +41,8 @@ sourceSets {
"test" {} "test" {}
} }
publish()
noDefaultJar() noDefaultJar()
runtimeJar(task<ShadowJar>("shadowJar")) { runtimeJar(task<ShadowJar>("shadowJar")) {
@@ -55,5 +57,3 @@ javadocJar()
dist() dist()
ideaPlugin() ideaPlugin()
publish()
+2 -2
View File
@@ -23,6 +23,6 @@ sourceSets {
"test" { none() } "test" { none() }
} }
standardPublicJars()
publish() publish()
standardPublicJars()
+2 -1
View File
@@ -14,6 +14,7 @@ sourceSets {
"test" { none() } "test" { none() }
} }
publish()
standardPublicJars() standardPublicJars()
publish()
@@ -47,6 +47,11 @@ dependencies {
testRuntime(project(":kotlin-reflect")) testRuntime(project(":kotlin-reflect"))
} }
if (deployVersion != null) {
publish()
}
noDefaultJar() noDefaultJar()
task<ShadowJar>("shadowJar") { task<ShadowJar>("shadowJar") {
@@ -75,8 +80,3 @@ sourcesJar {
} }
javadocJar() javadocJar()
if (deployVersion != null) {
publish()
}
+2 -2
View File
@@ -18,6 +18,8 @@ sourceSets {
"test" {} "test" {}
} }
publish()
val jar = runtimeJar() val jar = runtimeJar()
val sourcesJar = sourcesJar() val sourcesJar = sourcesJar()
val javadocJar = javadocJar() val javadocJar = javadocJar()
@@ -27,5 +29,3 @@ dist()
ideaPlugin { ideaPlugin {
from(jar, sourcesJar) from(jar, sourcesJar)
} }
publish()
@@ -16,9 +16,8 @@ sourceSets {
"test" { } "test" { }
} }
publish()
standardPublicJars() standardPublicJars()
ideaPlugin() ideaPlugin()
publish()
@@ -24,6 +24,8 @@ sourceSets {
"test" {} "test" {}
} }
publish()
noDefaultJar() noDefaultJar()
runtimeJar(rewriteDepsToShadedCompiler( runtimeJar(rewriteDepsToShadedCompiler(
@@ -33,5 +35,3 @@ runtimeJar(rewriteDepsToShadedCompiler(
)) ))
sourcesJar() sourcesJar()
javadocJar() javadocJar()
publish()
@@ -26,9 +26,10 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
publish()
standardPublicJars() standardPublicJars()
publish()
projectTest { projectTest {
workingDir = rootDir workingDir = rootDir
+2 -4
View File
@@ -17,6 +17,8 @@ sourceSets {
"test" {} "test" {}
} }
publish()
val jar = runtimeJar() val jar = runtimeJar()
val sourcesJar = sourcesJar() val sourcesJar = sourcesJar()
val javadocJar = javadocJar() val javadocJar = javadocJar()
@@ -26,7 +28,3 @@ dist()
ideaPlugin { ideaPlugin {
from(jar, sourcesJar) from(jar, sourcesJar)
} }
standardPublicJars()
publish()
@@ -20,6 +20,8 @@ projectTest {
workingDir = projectDir workingDir = projectDir
} }
publish()
val jar: Jar by tasks val jar: Jar by tasks
jar.apply { jar.apply {
classifier = "base" classifier = "base"
@@ -33,5 +35,3 @@ runtimeJar(rewriteDepsToShadedCompiler(
sourcesJar() sourcesJar()
javadocJar() javadocJar()
publish()
@@ -22,9 +22,10 @@ sourceSets {
} }
} }
publish()
sourcesJar() sourcesJar()
javadocJar() javadocJar()
runtimeJar() runtimeJar()
dist() dist()
publish()
@@ -7,9 +7,10 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
standardPublicJars()
publish() publish()
standardPublicJars()
dependencies { dependencies {
compile(kotlinStdlib()) compile(kotlinStdlib())
compile(project(":kotlin-native:kotlin-native-utils")) compile(project(":kotlin-native:kotlin-native-utils"))
@@ -6,9 +6,10 @@ plugins {
maven maven
} }
standardPublicJars()
publish() publish()
standardPublicJars()
dependencies { dependencies {
compile(kotlinStdlib()) compile(kotlinStdlib())
} }
@@ -11,13 +11,14 @@ plugins {
id("jps-compatible") id("jps-compatible")
} }
publish()
// todo: make lazy // todo: make lazy
val jar: Jar by tasks val jar: Jar by tasks
runtimeJar(rewriteDepsToShadedCompiler(jar)) runtimeJar(rewriteDepsToShadedCompiler(jar))
sourcesJar() sourcesJar()
javadocJar() javadocJar()
publish()
repositories { repositories {
google() google()
@@ -55,6 +55,8 @@ sourceSets {
"test" { } "test" { }
} }
publish()
noDefaultJar() noDefaultJar()
val packJar by task<ShadowJar> { val packJar by task<ShadowJar> {
@@ -98,5 +100,3 @@ dist(
sourcesJar() sourcesJar()
javadocJar() javadocJar()
publish()
@@ -40,10 +40,11 @@ projectTest {
workingDir = rootDir workingDir = rootDir
} }
publish()
runtimeJar() runtimeJar()
sourcesJar() sourcesJar()
javadocJar() javadocJar()
publish()
ideaPlugin() ideaPlugin()
@@ -17,10 +17,10 @@ sourceSets {
"test" {} "test" {}
} }
publish()
runtimeJar() runtimeJar()
sourcesJar() sourcesJar()
javadocJar() javadocJar()
dist(targetName = "android-extensions-runtime.jar") dist(targetName = "android-extensions-runtime.jar")
publish()
+2 -1
View File
@@ -33,9 +33,10 @@ projectTest {
dependsOn(":dist") dependsOn(":dist")
} }
publish()
sourcesJar() sourcesJar()
javadocJar() javadocJar()
dist() dist()
publish()
testsJar() testsJar()
@@ -50,6 +50,8 @@ projectTest {
dependsOn(":dist") dependsOn(":dist")
} }
publish()
runtimeJar { runtimeJar {
fromEmbeddedComponents() fromEmbeddedComponents()
} }
@@ -58,5 +60,3 @@ sourcesJar()
javadocJar() javadocJar()
dist() dist()
publish()
+2 -2
View File
@@ -16,10 +16,10 @@ sourceSets {
"test" {} "test" {}
} }
publish()
runtimeJar() runtimeJar()
sourcesJar() sourcesJar()
javadocJar() javadocJar()
dist(targetName = "kotlin-annotation-processing-runtime.jar") dist(targetName = "kotlin-annotation-processing-runtime.jar")
publish()
@@ -23,13 +23,13 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
publish()
val jar = runtimeJar {} val jar = runtimeJar {}
sourcesJar() sourcesJar()
javadocJar() javadocJar()
testsJar {} testsJar {}
publish()
dist { dist {
rename("kotlin-", "") rename("kotlin-", "")
} }
@@ -43,12 +43,12 @@ tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
} }
} }
publish()
val jar = runtimeJar {} val jar = runtimeJar {}
sourcesJar() sourcesJar()
javadocJar() javadocJar()
publish()
dist() dist()
ideaPlugin() ideaPlugin()
@@ -12,12 +12,15 @@ dependencies {
packedJars(project(":kotlin-scripting-jvm")) { isTransitive = false } packedJars(project(":kotlin-scripting-jvm")) { isTransitive = false }
} }
publish()
noDefaultJar() noDefaultJar()
runtimeJar(rewriteDepsToShadedCompiler( runtimeJar(rewriteDepsToShadedCompiler(
task<ShadowJar>("shadowJar") { task<ShadowJar>("shadowJar") {
from(packedJars) from(packedJars)
} }
)) ))
sourcesJar() sourcesJar()
javadocJar() javadocJar()
publish()
@@ -38,10 +38,10 @@ projectTest {
workingDir = rootDir workingDir = rootDir
} }
publish()
runtimeJar() runtimeJar()
sourcesJar() sourcesJar()
javadocJar() javadocJar()
dist() dist()
publish()
@@ -34,8 +34,9 @@ jar.apply {
duplicatesStrategy = DuplicatesStrategy.FAIL duplicatesStrategy = DuplicatesStrategy.FAIL
} }
publish()
runtimeJar(rewriteDepsToShadedCompiler(jar)) runtimeJar(rewriteDepsToShadedCompiler(jar))
sourcesJar() sourcesJar()
javadocJar() javadocJar()
publish()
@@ -49,6 +49,8 @@ projectTest {
} }
} }
publish()
noDefaultJar() noDefaultJar()
runtimeJar(task<ShadowJar>("shadowJar")) { runtimeJar(task<ShadowJar>("shadowJar")) {
@@ -57,5 +59,3 @@ runtimeJar(task<ShadowJar>("shadowJar")) {
sourcesJar() sourcesJar()
javadocJar() javadocJar()
publish()
+2 -2
View File
@@ -12,6 +12,8 @@ dependencies {
runtime(commonDep("org.jetbrains.intellij.deps", "trove4j")) runtime(commonDep("org.jetbrains.intellij.deps", "trove4j"))
} }
publish()
noDefaultJar() noDefaultJar()
// dummy is used for rewriting dependencies to the shaded packages in the embeddable compiler // dummy is used for rewriting dependencies to the shaded packages in the embeddable compiler
@@ -26,5 +28,3 @@ runtimeJar(embeddableCompiler()) {
sourcesJar() sourcesJar()
javadocJar() javadocJar()
publish()
+2 -2
View File
@@ -91,6 +91,8 @@ dependencies {
fatJarContentsStripMetadata(intellijDep()) { includeJars("oro-2.0.8", "jdom", "log4j" ) } fatJarContentsStripMetadata(intellijDep()) { includeJars("oro-2.0.8", "jdom", "log4j" ) }
} }
publish()
noDefaultJar() noDefaultJar()
val packCompiler by task<ShadowJar> { val packCompiler by task<ShadowJar> {
@@ -156,5 +158,3 @@ sourcesJar {
} }
javadocJar() javadocJar()
publish()
+2 -2
View File
@@ -154,6 +154,8 @@ dist(targetName = "$compilerBaseName.jar", fromTask = pack) {
from(trove4jJar) from(trove4jJar)
} }
publish()
runtimeJarArtifactBy(pack, pack.outputs.files.singleFile) { runtimeJarArtifactBy(pack, pack.outputs.files.singleFile) {
name = compilerBaseName name = compilerBaseName
classifier = "" classifier = ""
@@ -164,5 +166,3 @@ sourcesJar {
} }
javadocJar() javadocJar()
publish()
+2 -1
View File
@@ -146,6 +146,8 @@ dist(targetName = "$compilerBaseName.jar", fromTask = pack) {
from(trove4jJar) from(trove4jJar)
} }
publish()
runtimeJarArtifactBy(pack, pack.outputs.files.singleFile) { runtimeJarArtifactBy(pack, pack.outputs.files.singleFile) {
name = compilerBaseName name = compilerBaseName
classifier = "" classifier = ""
@@ -157,4 +159,3 @@ sourcesJar {
javadocJar() javadocJar()
publish()
@@ -14,12 +14,13 @@ dependencies {
packedJars(project(":kotlin-annotation-processing")) { isTransitive = false } packedJars(project(":kotlin-annotation-processing")) { isTransitive = false }
} }
publish()
runtimeJar(rewriteDepsToShadedCompiler( runtimeJar(rewriteDepsToShadedCompiler(
task<ShadowJar>("shadowJar") { task<ShadowJar>("shadowJar") {
from(packedJars) from(packedJars)
} }
)) ))
sourcesJar() sourcesJar()
javadocJar() javadocJar()
publish()