Use properties for configuration

Author: simolus3

.github/actions/android/action.yml

@@ -1,12 +1,9 @@
 name: "Build Android library"
 description: "Create artifact for Android library"
 inputs:
-  gpg-key:
-    required: false
-    description: "The GPG key to use when signing the publication"
-  gpg-password:
-    required: false
-    description: "Password for the GPG key."
+  sign-publication:
+    description: "Whether to sign the built library"
+    default: '1'
 
 runs:
   using: "composite"
@@ -31,14 +28,21 @@ runs:
           i686-linux-android
         cargo install cargo-ndk
     
-    - name: Build for Android
+    - name: Build signed library
       shell: bash
-      env:
-        GPG_PRIVATE_KEY: ${{ inputs.gpg-key }}
-        GPG_PASSWORD: ${{ inputs.gpg-password }}
+      if: ${{ inputs.sign-publication == '1' }}
       run: |
         cd android
-        ./gradlew build publishAllPublicationsToHereRepository
+        ./gradlew build publishAllPublicationsToHereRepository -PgpgKey=${{ secrets.GPG_PRIVATE_KEY }} -PgpgPassword=${{ secrets.GPG_PASSWORD }}
+        ls -lh build/outputs/aar
+        find build/repository
+
+    - name: Build library without signing
+      shell: bash
+      if: ${{ inputs.sign-publication == '0' }}
+      run: |
+        cd android
+        ./gradlew build publishAllPublicationsToHereRepository -PsignPublication=0
         ls -lh build/outputs/aar
         find build/repository
 

.github/workflows/android.yml

@@ -13,3 +13,5 @@ jobs:
           submodules: true
       - name: Build Android
         uses: ./.github/actions/android
+        with:
+          sign-publication: '0'

.github/workflows/release.yml

@@ -42,9 +42,6 @@ jobs:
           submodules: true
       - name: Build Android
         uses: ./.github/actions/android
-        with:
-          gpg-key: ${{ secrets.GPG_PRIVATE_KEY }}
-          gpg-password: ${{ secrets.GPG_PASSWORD }}
 
   publish_android:
     permissions:

android/build.gradle.kts

@@ -129,14 +129,18 @@ publishing {
 }
 
 signing {
-    val privateKey = System.getenv("GPG_PRIVATE_KEY")
-
-    if (privateKey == null || privateKey == "null") {
-        // Don't sign the publication.
-    } else {
-        var signingKey = String(Base64.getDecoder().decode(System.getenv("GPG_PRIVATE_KEY"))).trim()
-        var signingPassword = System.getenv("GPG_PASSWORD")
-        useInMemoryPgpKeys(signingKey, signingPassword)
+    val sign = providers.gradleProperty("signPublication").getOrElse("1")
+
+    if (sign != "0") {
+        val key = providers.gradleProperty("gpgKey")
+        val password = providers.gradleProperty("gpgPassword")
+
+        if (key.isPresent()) {
+            val signingKey = String(Base64.getDecoder().decode(key.get())).trim()
+            useInMemoryPgpKeys(signingKey, password.get())
+        } else {
+            useGpgCmd()
+        }
 
         sign(publishing.publications)
     }