Update secrets for android

Author: NikolaSimsic

.github/actions/build-android/action.yaml

@@ -20,6 +20,9 @@ inputs:
   keystoreKeyPassword:
     description: 'Key password for the Android keystore'
     required: true
+  playStoreCredentialsBase64:
+    description: 'Base64-encoded Play Store credentials JSON file'
+    required: true
 
 runs:
   using: composite
@@ -53,10 +56,26 @@ runs:
         echo $GOOGLE_SERVICES_JSON | base64 --decode > android/app/google-services.json
       shell: bash
 
+    - name: Decode upload.keystore
+      env:
+        KEYSTORE_BASE64: ${{ inputs.keystoreBase64 }}
+      run: |
+        mkdir -p android/keystores
+        echo $KEYSTORE_BASE64 | base64 --decode > android/keystores/upload.keystore
+      shell: bash
+    
+    - name: Decode Play Store credentials
+      env:
+        PLAY_STORE_CREDENTIALS_BASE64: ${{ inputs.playStoreCredentialsBase64 }}
+      run: |
+        mkdir -p android/fastlane
+        echo $PLAY_STORE_CREDENTIALS_BASE64 | base64 --decode > android/fastlane/play-store-credentials.json
+      shell: bash
+
     - name: Build Android Library with Fastlane
       run: |
         cd android
-        fastlane android local
+        fastlane android internal submit:false
       shell: bash
       env:
         FIREBASE_API_KEY: ${{ inputs.firebaseAPIKey }}

.github/workflows/MiNe2e.yaml

@@ -106,18 +106,21 @@ jobs:
           UPLOAD_KEYSTORE_BASE64: ${{ secrets.UPLOAD_KEYSTORE_BASE64 }}
           PLAY_STORE_CREDENTIALS_BASE64: ${{ secrets.PLAY_STORE_CREDENTIALS_BASE64 }}
         run: |
+          mkdir -p ./android/keystores
           echo $UPLOAD_KEYSTORE_BASE64 | base64 --decode > ./android/keystores/upload.keystore
           echo $PLAY_STORE_CREDENTIALS_BASE64 | base64 --decode > ./android/fastlane/play-store-credentials.json
         shell: bash
 
       - name: Build Android apk
-        uses: ./.github/actions/build_android
+        uses: ./.github/actions/build-android
         with:
+          google_services_json: ${{ secrets.GOOGLE_SERVICES_JSON }}
           firebaseAPIKey: ${{ secrets.FIREBASE_API_KEY }}
-          keystorePath: ${{ env.ANDROID_KEYSTORE_PATH }}
+          keystoreBase64: ${{ secrets.UPLOAD_KEYSTORE_BASE64 }}
           keystoreAlias: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
           keystorePassword: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
           keystoreKeyPassword: ${{ secrets.ANDROID_KEYSTORE_KEY_PASSWORD }}
+          playStoreCredentialsBase64: ${{ secrets.PLAY_STORE_CREDENTIALS_BASE64 }}
 
   ios-app:
     runs-on: macOS-15

android/fastlane/Fastfile

@@ -43,21 +43,22 @@ platform :android do
     UI.message("Building DeveloperApp")
     gradle(task: "assemble", build_type: "Debug", flavor: "Production", flags: "--stacktrace", properties: gradleOptions)
 
-    # UI.message("Installing APK into Android device/simulator")
-    # lane_context[SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS].each do |apk|
-    #   begin
-    #     sh("adb reverse tcp:8080 tcp:8080")
-    #     sh("adb reverse tcp:8083 tcp:8083")
-    #     sh("adb install -r #{apk}")
-    #   end
-    # end
+    UI.message("Installing APK into Android device/simulator")
+    lane_context[SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS].each do |apk|
+      begin
+        sh("adb reverse tcp:8080 tcp:8080")
+        sh("adb reverse tcp:8083 tcp:8083")
+        sh("adb install -r #{apk}")
+      end
+    end
   end
 
   desc "Build new bundle and upload to Internal track"
   lane :internal do |options|
     FileUtils.copy(ORIGINAL_CHANGELOG_PATH, FASTLANE_CHANGELOG_PATH)
     versionCode = google_play_track_version_codes(track: "internal").max() + 1
-    versionName = GOOGLE_PLAY_VERSION + "." + BUILD_NUMBER
+    # versionName = GOOGLE_PLAY_VERSION + "." + BUILD_NUMBER
+    versionName = BUILD_NUMBER
 
     gradleOptions = {
       # Gradle 7.3 removed support for dynamic versioning through android.injected.version.code
@@ -93,6 +94,7 @@ platform :android do
         track: "internal",
         skip_upload_images: true,
         skip_upload_apk: true,
+        json_key: "./fastlane/play-store-credentials.json",
       )
     else
         UI.message "Building APK version #{versionName}(#{versionCode}) for internal tests"