Fix sign dependencies with multiple publications

bakdata · Mar 11, 2024 · 9ff6cba · 9ff6cba
1 parent 441cc65
commit 9ff6cba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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<Project> {
                 sign(the<PublishingExtension>().publications)
             }
 
-            tasks.named(PublishingPlugin.PUBLISH_LIFECYCLE_TASK_NAME) { dependsOn(tasks.withType<Sign>()) }
+            tasks.matching { it is AbstractPublishToMaven }.all { dependsOn(tasks.withType<Sign>()) }
         }
     }