Merge pull request #11 from salaboy/release-fix

Using Jreleaser

Author: salaboy

.github/workflows/release.yml

@@ -15,8 +15,11 @@ jobs:
     timeout-minutes: 30
     env:
       JDK_VER: 11
-      OSSRH_USER_TOKEN: ${{ secrets.OSSRH_USER_TOKEN }}
-      OSSRH_PWD_TOKEN: ${{ secrets.OSSRH_PWD_TOKEN }}
+      JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_KEY }}
+      JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+      JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PWD }}
+      JRELEASER_MAVENCENTRAL_SONATYPE_USERNAME: ${{ secrets.OSSRH_USER_TOKEN }}
+      JRELEASER_MAVENCENTRAL_SONATYPE_TOKEN:  ${{ secrets.OSSRH_PWD_TOKEN }}
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 11
@@ -82,4 +85,4 @@ jobs:
             echo ${{ secrets.GPG_PRIVATE_KEY }} | base64 -d > private-key.gpg
             export GPG_TTY=$(tty)
             gpg --batch --import private-key.gpg
-            ./gradlew publish -PGPG_KEY="$(cat private-key.gpg)" -PGPG_PWD="${{ secrets.GPG_PWD }}"
+           ./gradlew jreleaserFullRelease

client/build.gradle

@@ -4,8 +4,9 @@ plugins {
     // Generate IntelliJ IDEA's .idea & .iml project files
     id 'idea'
     id 'maven-publish'
-    id 'signing'
+//    id 'signing'
     id 'com.github.spotbugs' version '5.2.1'
+    id 'org.jreleaser' version '1.18.0'
 }
 
 group 'io.dapr'
@@ -175,14 +176,6 @@ publishing {
     }
 }
 
-signing {
-    sign publishing.publications.mavenJava
-    useInMemoryPgpKeys(
-            findProperty("GPG_KEY"),
-            findProperty("GPG_PWD")
-    )
-}
-
 java {
     withSourcesJar()
     withJavadocJar()
@@ -218,4 +211,24 @@ spotbugsTest {
             required = true
         }
     }
+}
+
+jreleaser {
+    signing {
+        active = 'ALWAYS'
+        armored = true
+    }
+    deploy {
+        maven {
+            nexus2 {
+                'maven-central' {
+                    active = 'ALWAYS'
+                    url = 'https://s01.oss.sonatype.org/service/local'
+                    snapshotUrl = 'https://s01.oss.sonatype.org/content/repositories/snapshots'
+                    closeRepository = true
+                    releaseRepository = true
+                }
+            }
+        }
+    }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists