Merge pull request #116 from MohamedRejeb/1.x

Update signing
MohamedRejeb · Sep 7, 2023 · 4d3040d · 4d3040d
2 parents 41128ca + 4d8062e
commit 4d3040d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -63,4 +63,11 @@ jobs:
             -Psigning.gnupg.passphrase='${{secrets.OSSRH_GPG_SECRET_KEY_PASSWORD}}'
             -Psigning.gnupg.keyName='${{secrets.OSSRH_GPG_SECRET_KEY_ID}}'
             -PsonatypeUsername='${{secrets.OSSRH_USERNAME}}'
-            -PsonatypePassword='${{secrets.OSSRH_PASSWORD}}'
+            -PsonatypePassword='${{secrets.OSSRH_PASSWORD}}'
+        env:
+          OSSRH_STAGING_PROFILE_ID: ${{ secrets.OSSRH_STAGING_PROFILE_ID }}
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+          OSSRH_GPG_SECRET_KEY_ID: ${{ secrets.OSSRH_GPG_SECRET_KEY_ID }}
+          OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
diff --git a/convention-plugins/src/main/kotlin/root.publication.gradle.kts b/convention-plugins/src/main/kotlin/root.publication.gradle.kts
@@ -14,11 +14,9 @@ nexusPublishing {
         sonatype {
             nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
             snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
-            stagingProfileId.set(System.getenv("OSSRH_STAGING_PROFILE_ID"))
-            println("OSSRH_USERNAME")
-            println(project.findProperty("sonatypeUsername")?.toString())
-            username.set(project.findProperty("sonatypeUsername")?.toString())
-            password.set(project.findProperty("sonatypePassword")?.toString())
+//            stagingProfileId.set(System.getenv("OSSRH_STAGING_PROFILE_ID"))
+            username.set(project.findProperty("sonatypeUsername")?.toString()?.replaceFirst("'", "")?.replaceFirst("'", ""))
+            password.set(project.findProperty("sonatypePassword")?.toString()?.replaceFirst("'", "")?.replaceFirst("'", ""))
         }
     }
 }