workflow patch #2

Author: aubynsamuel

.github/workflows/android-build.yml

@@ -64,77 +64,40 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v2
 
-      # Now builds for both releases and test branches will be signed
-      - name: Build benchmark release APK
+      # Decode the Base64 keystore into a file for Gradle to use
+      - name: Setup keystore file
         run: |
-          echo "Building benchmark release APK..."
+          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > keystore.jks
+          echo "Keystore file created at keystore.jks"
+
+      - name: Build signed benchmark release APK
+        run: |
+          echo "Building signed benchmark release APK with Gradle..."
+          # This task will now automatically apply the signingConfig defined in build.gradle.kts
           ./gradlew :app:assembleBenchmarkRelease
-        env:
+        env: # Pass secrets as environment variables to Gradle
+          KEYSTORE_FILE_PATH: keystore.jks # Path to the decoded keystore file
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-          KEYSTORE_FILE: ${{ secrets.KEYSTORE_FILE }}
-
-      - name: Setup keystore for signing
-        run: |
-          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > keystore.jks
-          echo "Keystore file created"
-
-      - name: Sign APK
-        run: |
-          # Find the APK file
-          APK_FILE=$(find app/build/outputs/apk/benchmarkRelease -name "*.apk" | head -1)
-          if [ -z "$APK_FILE" ]; then
-            echo "Error: No APK file found"
-            exit 1
-          fi
-          
-          echo "Found APK: $APK_FILE"
-          
-          # Find the correct build-tools version
-          BUILD_TOOLS_VERSION=$(ls $ANDROID_HOME/build-tools/ | sort -V | tail -1)
-          APKSIGNER_PATH="$ANDROID_HOME/build-tools/$BUILD_TOOLS_VERSION/apksigner"
-          
-          echo "Using build-tools version: $BUILD_TOOLS_VERSION"
-          echo "APK signer path: $APKSIGNER_PATH"
-          
-          # Check if apksigner exists
-          if [ ! -f "$APKSIGNER_PATH" ]; then
-            echo "Error: apksigner not found at $APKSIGNER_PATH"
-            echo "Available build-tools versions:"
-            ls -la $ANDROID_HOME/build-tools/
-            exit 1
-          fi
-          
-          # Sign the APK
-          "$APKSIGNER_PATH" sign --ks keystore.jks --ks-type PKCS12 --ks-key-alias "${{ secrets.KEY_ALIAS }}" --ks-pass pass:"${{ secrets.KEYSTORE_PASSWORD }}" --key-pass pass:"${{ secrets.KEY_PASSWORD }}" --out "${APK_FILE%.apk}-signed.apk" "$APK_FILE"
-          
-          # Verify the signature
-          "$APKSIGNER_PATH" verify "${APK_FILE%.apk}-signed.apk"
-          
-          echo "APK signed and verified successfully"
-          
-          # Replace unsigned APK with signed one
-          mv "${APK_FILE%.apk}-signed.apk" "$APK_FILE"
 
       - name: Rename APK with version
+        id: rename-apk
         run: |
           APK_FILE=$(find app/build/outputs/apk/benchmarkRelease -name "*.apk" | head -1)
           if [ -z "$APK_FILE" ]; then
-            echo "Error: No APK file found"
+            echo "Error: No APK file found after Gradle build."
             exit 1
           fi
           
           APK_DIR=$(dirname "$APK_FILE")
-          APK_NAME=$(basename "$APK_FILE" .apk)
           VERSION="${{ steps.get-version.outputs.version }}"
           
           NEW_NAME="ClipSync-Android-${VERSION}-signed.apk"
           
           mv "$APK_FILE" "$APK_DIR/$NEW_NAME"
           echo "APK renamed to: $NEW_NAME"
           echo "apk-path=$APK_DIR/$NEW_NAME" >> $GITHUB_OUTPUT
-        id: rename-apk
 
       - name: Get APK info
         run: |

app/build.gradle.kts

@@ -25,6 +25,15 @@ android {
         unitTests.isIncludeAndroidResources = true
     }
 
+    signingConfigs {
+        create("productionRelease") {
+            storeFile = file(System.getenv("KEYSTORE_FILE_PATH") ?: "keystore.jks")
+            storePassword = System.getenv("KEYSTORE_PASSWORD")
+            keyAlias = System.getenv("KEY_ALIAS")
+            keyPassword = System.getenv("KEY_PASSWORD")
+        }
+    }
+
     buildTypes {
         release {
             val boolean = false
@@ -34,6 +43,13 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+
+            signingConfig = signingConfigs.getByName("productionRelease")
+        }
+
+        create("benchmarkRelease") {
+            initWith(buildTypes.getByName("release"))
+            signingConfig = signingConfigs.getByName("productionRelease")
         }
     }
     compileOptions {