Potentially fix all deployment problems

BierDav · Jun 10, 2022 · 509d73e · 509d73e
1 parent 8bc3211
commit 509d73e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
@@ -19,11 +19,9 @@ jobs:
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
           gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
-          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+          gpg-passphrase: ${{secrets.OSSRH_GPG_SECRET_KEY_PASSWORD}}
       - name: Publish artifact
-        run: ./gradlew publish -Psignatory.keyId=${{secrets.OSSRH_GPG_SECRET_KEY_ID}} -Psigning.password=${{secrets.OSSRH_GPG_SECRET_KEY_PASSWORD}}
+        run: ./gradlew publish -Psigning.gnupg.keyName=${{secrets.OSSRH_GPG_SECRET_KEY_ID}} -Psigning.gnupg.passphrase=${{secrets.OSSRH_GPG_SECRET_KEY_PASSWORD}}
         env:
           MAVEN_USERNAME: ${{secrets.OSSRH_USERNAME}}
-          MAVEN_PASSWORD: ${{secrets.OSSRH_TOKEN}}
-          MAVEN_GPG_KEY_ID: ${{secrets.OSSRH_GPG_SECRET_KEY_ID}}
-          MAVEN_GPG_PASSPHRASE: ${{secrets.OSSRH_GPG_SECRET_KEY_PASSWORD}}
+          MAVEN_PASSWORD: ${{secrets.OSSRH_TOKEN}}
diff --git a/buildSrc/src/main/kotlin/maven-publish-script.gradle.kts b/buildSrc/src/main/kotlin/maven-publish-script.gradle.kts
@@ -1,3 +1,5 @@
+import java.net.URI
+
 val githubProject = "BierDav/Kotinmailer"
 
 description = "A simple coroutine based Kotlin Email API for client projects"
@@ -20,11 +22,16 @@ java {
 
 publishing {
     repositories {
-        maven("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") {
+        maven {
+            val snapshotRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+            val releaseRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+            val repoUrl = if (project.version.toString().endsWith("SNAPSHOT")) snapshotRepoUrl else releaseRepoUrl
+
+            url = URI.create(repoUrl)
             name = "ossrh"
             credentials {
-                username = System.getenv("MAVEN_USERNAME")
-                password = System.getenv("MAVEN_PASSWORD")
+                username = System.getenv("MAVEN_USERNAME") ?: property("credentials.username") as String
+                password = System.getenv("MAVEN_PASSWORD") ?: property("credentials.password") as String
             }
         }
     }

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,5 @@
 kotlin.code.style=official
 group=at.quickme.kotlinmailer
-version=0.0.1-SNAPSHOT
+version=0.0.2-SNAPSHOT
+
+signing.gnupg.useLegacyGpg=true