fix: sign when publishing to central / metadata for all publications (#…

…116) Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
hashgraph · Nov 13, 2023 · d2eb8a7 · d2eb8a7
1 parent 1bfd67b
commit d2eb8a7
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 38 deletions.
diff --git a/pbj-core/buildSrc/src/main/kotlin/com.hedera.pbj.conventions.gradle.kts b/pbj-core/buildSrc/src/main/kotlin/com.hedera.pbj.conventions.gradle.kts
@@ -25,6 +25,7 @@ plugins {
     id("com.hedera.pbj.spotless-conventions")
     id("com.hedera.pbj.spotless-java-conventions")
     id("com.hedera.pbj.spotless-kotlin-conventions")
+    id("com.hedera.pbj.maven-publish")
 }
 
 group = "com.hedera.pbj"

diff --git a/pbj-core/buildSrc/src/main/kotlin/com.hedera.pbj.maven-publish.gradle.kts b/pbj-core/buildSrc/src/main/kotlin/com.hedera.pbj.maven-publish.gradle.kts
@@ -60,46 +60,10 @@ publishing {
             }
         }
     }
-    repositories {
-        maven {
-            name = "sonatype"
-            url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-            credentials {
-                username = System.getenv("OSSRH_USERNAME")
-                password = System.getenv("OSSRH_PASSWORD")
-            }
-        }
-        maven {
-            name = "sonatypeSnapshot"
-            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-            credentials {
-                username = System.getenv("OSSRH_USERNAME")
-                password = System.getenv("OSSRH_PASSWORD")
-            }
-        }
-    }
 }
 
 signing { useGpgCmd() }
 
 tasks.withType<Sign> {
     onlyIf { providers.gradleProperty("publishSigningEnabled").getOrElse("false").toBoolean() }
 }
-
-tasks.register("release-maven-central") {
-    group = "release"
-    dependsOn(
-        tasks.withType<PublishToMavenRepository>().matching {
-            it.name.endsWith("ToSonatypeRepository")
-        }
-    )
-}
-
-tasks.register("release-maven-central-snapshot") {
-    group = "release"
-    dependsOn(
-        tasks.withType<PublishToMavenRepository>().matching {
-            it.name.endsWith("ToSonatypeSnapshotRepository")
-        }
-    )
-}
diff --git a/pbj-core/buildSrc/src/main/kotlin/com.hedera.pbj.runtime.gradle.kts b/pbj-core/buildSrc/src/main/kotlin/com.hedera.pbj.runtime.gradle.kts
@@ -18,7 +18,6 @@ plugins {
     id("java-library")
     id("com.hedera.pbj.conventions")
     id("com.google.protobuf") // protobuf plugin is only used for tests
-    id("com.hedera.pbj.maven-publish")
 }
 
 tasks.generateGrammarSource {
@@ -33,4 +32,45 @@ protobuf {
     }
 }
 
-publishing { publications.create<MavenPublication>("maven") { from(components["java"]) } }
+val maven = publishing.publications.create<MavenPublication>("maven") { from(components["java"]) }
+
+signing.sign(maven)
+
+publishing {
+    repositories {
+        maven {
+            name = "sonatype"
+            url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+            credentials {
+                username = System.getenv("OSSRH_USERNAME")
+                password = System.getenv("OSSRH_PASSWORD")
+            }
+        }
+        maven {
+            name = "sonatypeSnapshot"
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+            credentials {
+                username = System.getenv("OSSRH_USERNAME")
+                password = System.getenv("OSSRH_PASSWORD")
+            }
+        }
+    }
+}
+
+tasks.register("release-maven-central") {
+    group = "release"
+    dependsOn(
+        tasks.withType<PublishToMavenRepository>().matching {
+            it.name.endsWith("ToSonatypeRepository")
+        }
+    )
+}
+
+tasks.register("release-maven-central-snapshot") {
+    group = "release"
+    dependsOn(
+        tasks.withType<PublishToMavenRepository>().matching {
+            it.name.endsWith("ToSonatypeSnapshotRepository")
+        }
+    )
+}