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/actions/build-ios/action.yaml

@@ -23,7 +23,7 @@ runs:
       run: pod install --project-directory=ios
       shell: bash
 
-    - name: Build iOS Debug App
-      run: cd ios && fastlane ios debug_internal
+    - name: Run Fastlane
+      run: cd ios && fastlane ios release
       shell: bash
 

.github/workflows/MiNe2e.yaml

@@ -106,18 +106,22 @@ 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 }}
+          keystorePath: ./android/keystores/upload.keystore
 
   ios-app:
     runs-on: macOS-15

android/fastlane/Fastfile

@@ -43,21 +43,23 @@ 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
+    #versionCode = google_play_track_version_codes(track: "internal").max() + 1
+    versionCode = 1
+    # 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 +95,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"

ios/fastlane/Fastfile

@@ -1,21 +1,78 @@
+# Constants
+APPLE_STORE_VERSION = sh("node -p -e \"require('../../package.json')['store-versions']['apple-store']\"").chomp
+
+default_platform(:ios)
+
 platform :ios do
-  before_all do
-    UI.message("Installing dependencies")
-    sh("npm", "ci", "--legacy-peer-deps") # Install npm dependencies
-    cocoapods # Install CocoaPods dependencies
-  end
+  desc "Upload a new build to AppStore"
+  lane :release do
+    keychain_name = "MiN_10_keychain"
+    create_keychain(
+      name: keychain_name,
+      default_keychain: true,
+      unlock: true,
+      timeout: 3600,
+      password: ENV["KEYCHAIN_PASSWORD"],
+      lock_when_sleeps: false
+    )
+    sh("npm", "ci", "--legacy-peer-deps")
+    cocoapods
 
-  desc "Builds DeveloperApp for Debug and generates an .ipa file"
-  lane :debug_internal do
-    UI.message("Building DeveloperApp for Debug and generating .ipa")
-    gym(
-      scheme: "DeveloperApp", # Replace with your app's scheme name
-      configuration: "Debug", # Use Debug configuration
-      output_directory: "./build", # Directory where the .ipa will be saved
-      output_name: "DeveloperApp-Debug.ipa", # Name of the .ipa file
-      export_method: "development", # Use development export method for debug builds
-      include_bitcode: false, # Optional: Exclude bitcode for faster builds
-      include_symbols: true, # Include debug symbols for debugging
+    api_key = app_store_connect_api_key(
+      key_id: ENV["APP_STORE_CONNECT_KEY_ID"],
+      issuer_id: ENV["APP_STORE_CONNECT_ISSUER_ID"],
+      key_content: ENV["APP_STORE_CONNECT_KEY_CONTENT"],
+      duration: 1200, # Session Length in seconds (maximum: 1200).
+    )
+
+    UI.message("Disabling automatic signing on Xcode")
+    disable_automatic_code_signing
+    
+    UI.message("Get the certificates and profiles")
+    match(
+      type:"appstore",
+      api_key:api_key,
+      keychain_name:keychain_name,
+      keychain_password: ENV["KEYCHAIN_PASSWORD"],
+      git_basic_authorization:ENV["MATCH_GIT_BASIC_AUTHORIZATION"],
+      readonly: false,
+    )
+
+    UI.message("Set version number")
+    increment_version_number(
+      version_number: APPLE_STORE_VERSION,
+    )
+
+    UI.message("Get the latest build number from AppStore Connect")
+    build_num = app_store_build_number(
+      live: false,
+      initial_build_number: 0,
+      api_key: api_key,
+      version: APPLE_STORE_VERSION,
+    )
+
+    UI.message("Set build number")
+    increment_build_number(
+      xcodeproj: "developerapp.xcodeproj",
+      build_number: build_num + 1,
+    )
+
+
+    UI.message("Replacing Google Maps API key from environment variables")
+    Dir.chdir("../DeveloperApp/Config") do
+        googleMapsApiKey = ENV["GOOGLE_MAPS_API_KEY"] || "GOOGLE_MAPS_API_KEY"
+        sh("sed -i '' 's/{{google-maps-api-key}}/#{googleMapsApiKey}/g' ApiKeys.xcconfig")
+    end
+    
+    build_app(
+      workspace: "DeveloperApp.xcworkspace",
+      scheme: "DeveloperApp",
+      build_path:"./build",
+      output_directory:"./build"
+    )
+    upload_to_testflight(
+      skip_waiting_for_build_processing: true,
     )
   end
+
 end