Skip to content

Commit

Permalink
Don't dependsOn for JVM publish
Browse files Browse the repository at this point in the history
  • Loading branch information
nomisRev committed Jan 31, 2024
1 parent 3886a92 commit 2a99275
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
16 changes: 9 additions & 7 deletions build-src/src/main/kotlin/SignPublications.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import org.gradle.kotlin.dsl.withType
import org.gradle.plugins.signing.Sign
import org.gradle.plugins.signing.SigningExtension

fun Project.signPublications() {
fun Project.signPublications(createMavenFromJava: Boolean = false) {
configure<SigningExtension> {
if (shouldSign) {
try {
Expand All @@ -16,12 +16,14 @@ fun Project.signPublications() {
useGpgCmd()
}
sign(project.extensions.getByName<PublishingExtension>("publishing").publications)
tasks.withType<AbstractPublishToMaven> {
afterEvaluate { dependsOn("javadocJar") }
dependsOn(tasks.withType<Sign>())
}
tasks.withType<Sign> {
afterEvaluate { dependsOn("javadocJar") }
if (!createMavenFromJava) {
tasks.withType<AbstractPublishToMaven> {
afterEvaluate { dependsOn("javadocJar") }
dependsOn(tasks.withType<Sign>())
}
tasks.withType<Sign> {
afterEvaluate { dependsOn("javadocJar") }
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion build-src/src/main/kotlin/publish-kotlin-jvm.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ project.tasks.creating(Jar::class) {

setupPublishing(docsJar, sourcesJar, createMavenFromJava = true)

signPublications()
signPublications(createMavenFromJava = true)

0 comments on commit 2a99275

Please sign in to comment.