Merge pull request #114 from MohamedRejeb/1.x

Update signing
MohamedRejeb · Sep 7, 2023 · fc694dd · fc694dd
2 parents 0cc3aa6 + 9e8bf57
commit fc694dd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -59,7 +59,7 @@ jobs:
         with:
           arguments: |
             ${{ matrix.target }}
-            closeSonatypeStagingRepository
+            closeAndReleaseSonatypeStagingRepository
             -Psigning.gnupg.passphrase='${{secrets.OSSRH_GPG_SECRET_KEY_PASSWORD}}'
             -Psigning.gnupg.keyName='${{secrets.OSSRH_GPG_SECRET_KEY_ID}}'
             -PsonatypeUsername='${{secrets.OSSRH_USERNAME}}'

diff --git a/convention-plugins/src/main/kotlin/root.publication.gradle.kts b/convention-plugins/src/main/kotlin/root.publication.gradle.kts
@@ -11,15 +11,14 @@ nexusPublishing {
     // Configure maven central repository
     // https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh
     repositories {
-        sonatype()
-//        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(System.getenv("OSSRH_USERNAME"))
-//            username.set(System.getenv("OSSRH_USERNAME"))
-//            password.set(System.getenv("OSSRH_PASSWORD"))
-//        }
+        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.property("sonatypeUsername")?.toString())
+            username.set(project.property("sonatypeUsername")?.toString())
+            password.set(project.property("sonatypePassword")?.toString())
+        }
     }
 }