Pass details via command line gradle property

Author: Layoric

.github/workflows/publish-android-maven-central.yml

@@ -21,6 +21,7 @@ jobs:
         run: |
           echo "${{ secrets.OSSRH_GPG }}" > private-key.asc
           gpg --import --batch private-key.asc
+          echo "SIGNING_SECRET_KEY_RING_FILE=$(pwd)/private-key.asc" >> $GITHUB_ENV
 
       - name: Cache Gradle packages
         uses: actions/cache@v2
@@ -42,4 +43,6 @@ jobs:
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
         working-directory: ./src/AndroidClient
-        run: ./gradlew android:publishAllPublicationsToOSSRHRepository
+        run: ./gradlew android:publishAllPublicationsToOSSRHRepository \
+               -Psigning.keyId=${{ secrets.SIGNING_KEY_ID }} \
+               -Psigning.secretKeyRingFile=${{ env.SIGNING_SECRET_KEY_RING_FILE }}

.github/workflows/publish-client-maven-central.yml

@@ -21,6 +21,7 @@ jobs:
         run: |
           echo "${{ secrets.OSSRH_GPG }}" > private-key.asc
           gpg --import --batch private-key.asc
+          echo "SIGNING_SECRET_KEY_RING_FILE=$(pwd)/private-key.asc" >> $GITHUB_ENV
 
       - name: Cache Gradle packages
         uses: actions/cache@v2
@@ -42,4 +43,6 @@ jobs:
           OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
         working-directory: ./src/AndroidClient
-        run: ./gradlew client:publishAllPublicationsToOSSRHRepository
+        run: ./gradlew client:publishAllPublicationsToOSSRHRepository \
+               -Psigning.keyId=${{ secrets.SIGNING_KEY_ID }} \
+               -Psigning.secretKeyRingFile=${{ env.SIGNING_SECRET_KEY_RING_FILE }}

src/AndroidClient/android/build.gradle

@@ -11,11 +11,10 @@ if (project.hasProperty('versionSuffix')) {
     version = "${version}-${versionSuffix}"
 }
 
-if (project.hasProperty('signing.keyId') || System.getenv("SIGNING_KEY_ID")) {
+if (project.hasProperty('signing.keyId')) {
     println "Signing enabled"
     signing {
         sign configurations.archives
-        keyId = project.findProperty("signing.keyId") ?: System.getenv("SIGNING_KEY_ID")
     }
 } else {
     println "Signing disabled"

src/AndroidClient/client/build.gradle

@@ -11,14 +11,10 @@ if (project.hasProperty('versionSuffix')) {
     version = "${version}-${versionSuffix}"
 }
 
-apply plugin: 'signing'
-
-
-if (project.hasProperty('signing.keyId') || System.getenv("SIGNING_KEY_ID")) {
+if (project.hasProperty('signing.keyId')) {
     println "Signing enabled"
     signing {
         sign configurations.archives
-        keyId = project.findProperty("signing.keyId") ?: System.getenv("SIGNING_KEY_ID")
     }
 } else {
     println "Signing disabled"