From 9ff6cba34b8168d53cb5f932860786b2f4c9537a Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Mon, 11 Mar 2024 11:24:18 +0100 Subject: [PATCH 1/2] Fix sign dependencies with multiple publications --- build.gradle.kts | 2 +- .../src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 89725ad..c604f6a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.bakdata.release") version "1.3.0" // eat your own dog food - apply the plugins to this plugin project id("com.bakdata.sonar") version "1.1.17" - id("com.bakdata.sonatype") version "1.2.2" + id("com.bakdata.sonatype") version "1.3.1" id("org.gradle.kotlin.kotlin-dsl") version "2.1.6" apply false id("com.gradle.plugin-publish") version "1.2.1" apply false } diff --git a/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt b/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt index 14c7a1a..3fc9704 100644 --- a/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt +++ b/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt @@ -1,5 +1,5 @@ /* - * The MIT License + * MIT License * * Copyright (c) 2024 bakdata GmbH * @@ -29,7 +29,6 @@ import org.gradle.api.GradleException import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.Task -import org.gradle.api.attributes.DocsType.JAVADOC import org.gradle.api.logging.Logging import org.gradle.api.plugins.JavaPlugin import org.gradle.api.plugins.JavaPluginExtension @@ -38,8 +37,6 @@ import org.gradle.api.publish.maven.MavenPublication import org.gradle.api.publish.maven.tasks.AbstractPublishToMaven import org.gradle.api.publish.maven.tasks.GenerateMavenPom import org.gradle.api.publish.maven.tasks.PublishToMavenLocal -import org.gradle.api.publish.plugins.PublishingPlugin -import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.bundling.Jar import org.gradle.kotlin.dsl.* import org.gradle.plugins.signing.Sign @@ -245,7 +242,7 @@ class SonatypePlugin : Plugin { sign(the().publications) } - tasks.named(PublishingPlugin.PUBLISH_LIFECYCLE_TASK_NAME) { dependsOn(tasks.withType()) } + tasks.matching { it is AbstractPublishToMaven }.all { dependsOn(tasks.withType()) } } } From 37b65e5c21e02c7b2d04f2148273d4586c3b1520 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Mon, 11 Mar 2024 11:25:13 +0100 Subject: [PATCH 2/2] Fix sign dependencies with multiple publications --- sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt b/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt index 3fc9704..94ec1ba 100644 --- a/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt +++ b/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt @@ -1,5 +1,5 @@ /* - * MIT License + * The MIT License * * Copyright (c) 2024 bakdata GmbH *