fix: Attempt to fix publishing

lsd-consulting · Feb 27, 2022 · 85fbee0 · 85fbee0
1 parent eca6669
commit 85fbee0
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/api/build.gradle b/api/build.gradle
@@ -1,5 +1,6 @@
 plugins {
-    id "java"
+    id "signing"
+//    id "java"
     id "org.jetbrains.kotlin.jvm"
     id "org.jetbrains.kotlin.plugin.spring" version "1.6.10"
 }

diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,7 @@
 plugins {
     id 'maven-publish'
-    id 'java'
+//    id 'java'
     id 'org.jetbrains.kotlin.jvm' version '1.6.10'
-    id 'signing'
     id 'jacoco'
     id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
     id 'com.palantir.git-version' version '0.12.3'

diff --git a/client/build.gradle b/client/build.gradle
@@ -1,6 +1,7 @@
 plugins {
+    id 'signing'
     id 'jacoco'
-    id "java"
+//    id "java"
     id "org.jetbrains.kotlin.jvm"
     id "org.jetbrains.kotlin.plugin.spring" version "1.6.10"
 }

diff --git a/publishing.gradle b/publishing.gradle
@@ -22,6 +22,7 @@ task javadocJar(type: Jar) {
 subprojects {
 
     apply plugin: 'maven-publish'
+    apply plugin: 'signing'
     publishing {
         publications {
             mavenJava(MavenPublication) {
@@ -72,6 +73,20 @@ subprojects {
             }
         }
     }
+
+    signing {
+        if (project.findProperty("signingKey")) {
+            // Use in-memory ascii-armored keys
+            def signingKey = findProperty("signingKey")
+            def signingPassword = findProperty("signingPassword")
+            useInMemoryPgpKeys(signingKey, signingPassword)
+            sign publishing.publications.mavenJava
+        } else {
+            // Use signing properties in ~/.gradle/gradle.properties
+            sign publishing.publications.mavenJava
+        }
+    }
+
 }
 
 nexusPublishing {
@@ -82,16 +97,3 @@ nexusPublishing {
         }
     }
 }
-
-signing {
-    if (project.findProperty("signingKey")) {
-        // Use in-memory ascii-armored keys
-        def signingKey = findProperty("signingKey")
-        def signingPassword = findProperty("signingPassword")
-        useInMemoryPgpKeys(signingKey, signingPassword)
-        sign publishing.publications
-    } else {
-        // Use signing properties in ~/.gradle/gradle.properties
-        sign publishing.publications
-    }
-}
diff --git a/server/build.gradle b/server/build.gradle
@@ -1,6 +1,7 @@
 plugins {
+    id 'signing'
     id "jacoco"
-    id "java"
+//    id "java"
     id "org.jetbrains.kotlin.jvm"
     id "org.jetbrains.kotlin.plugin.spring" version "1.6.10"
 }