From c0e99428f5ebdb201c2d435146af51373c724f41 Mon Sep 17 00:00:00 2001 From: Philipp Schirmer Date: Mon, 11 Mar 2024 11:46:06 +0100 Subject: [PATCH 1/4] Fix sign dependencies with multiple publications (#51) --- build.gradle.kts | 2 +- .../src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt | 5 +---- 2 files changed, 2 insertions(+), 5 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..94ec1ba 100644 --- a/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt +++ b/sonatype/src/main/kotlin/com/bakdata/gradle/SonatypePlugin.kt @@ -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 1125743a5e7687b630f95d3452369c7279c09cba Mon Sep 17 00:00:00 2001 From: bakdata-bot Date: Mon, 11 Mar 2024 10:47:12 +0000 Subject: [PATCH 2/4] [Gradle Release Plugin] - pre tag commit: '1.3.2'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index acee793..65f31a9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version=1.3.2-SNAPSHOT +version=1.3.2 org.gradle.caching=true org.gradle.parallel=true From bcd7270119bb24cfd971b29d8d05d4ab4cefa00c Mon Sep 17 00:00:00 2001 From: bakdata-bot Date: Mon, 11 Mar 2024 10:47:12 +0000 Subject: [PATCH 3/4] [Gradle Release Plugin] - new version commit: '1.3.3-SNAPSHOT'. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 65f31a9..c7053c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version=1.3.2 +version=1.3.3-SNAPSHOT org.gradle.caching=true org.gradle.parallel=true From 76708a797c5e7da2881484b993b7b08ca163c733 Mon Sep 17 00:00:00 2001 From: bakdata-bot Date: Mon, 11 Mar 2024 10:47:21 +0000 Subject: [PATCH 4/4] Changelog for version 1.3.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f195e0..7eefd25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## [1.3.2](https://github.com/bakdata/gradle-plugins/tree/1.3.2) (2024-03-11) +[View commits](https://github.com/bakdata/gradle-plugins/compare/1.3.1...1.3.2) + +**Merged pull requests:** + +- Fix sign dependencies with multiple publications [\#51](https://github.com/bakdata/gradle-plugins/pull/51) ([@philipp94831](https://github.com/philipp94831)) + ## [1.3.1](https://github.com/bakdata/gradle-plugins/tree/1.3.1) (2024-03-11) [View commits](https://github.com/bakdata/gradle-plugins/compare/1.3.0...1.3.1)