Merge released v1.31.0 back into dev

Author: github-actions[bot]

.github/workflows/android-deploy.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up ruby env
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.6
+          ruby-version: '3.3'
           bundler-cache: true
 
       - name: Setup Properties

.github/workflows/create-release.yml

@@ -28,7 +28,7 @@ jobs:
           fetch-depth: 0
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.6
+          ruby-version: '3.3'
           bundler-cache: true
       - name: Verify exact master commit
         env:
@@ -61,6 +61,8 @@ jobs:
           EXPECTED_SHA: ${{ inputs.commit_sha }}
         run: |
           test -z "$(git tag --list "$TAG")"
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git tag -a "$TAG" "$EXPECTED_SHA" -m "Release $TAG"
           git push origin "refs/tags/$TAG"
 
@@ -70,4 +72,3 @@ jobs:
     with:
       tag: ${{ needs.create-tag.outputs.tag }}
     secrets: inherit
-

.github/workflows/promote-production.yml

@@ -26,7 +26,7 @@ jobs:
           fetch-depth: 0
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.6
+          ruby-version: '3.3'
           bundler-cache: true
       - name: Verify tag, commit, and versionCode
         env:
@@ -51,4 +51,3 @@ jobs:
           bundle exec fastlane android promote_release
           version_code:${{ inputs.version_code }}
           json_key:${{ github.workspace }}/service-account.json
-

.github/workflows/sync-master-to-dev.yml

@@ -25,7 +25,8 @@ jobs:
           TAG: ${{ inputs.tag }}
         run: |
           git fetch origin master dev --tags
-          test "$(git rev-list -n 1 "$TAG")" = "$(git rev-parse origin/master)"
+          test "$(git cat-file -t "$TAG")" = "tag"
+          git merge-base --is-ancestor "$TAG^{}" origin/master
           git config user.name github-actions[bot]
           git config user.email 41898282+github-actions[bot]@users.noreply.github.com
           git merge --no-ff origin/master -m "Merge released $TAG back into dev"

.github/workflows/tagged-release.yml

@@ -3,6 +3,12 @@ name: Publish Tagged Android Release
 on:
   push:
     tags: ['v*']
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: Existing immutable release tag to publish
+        required: true
+        type: string
   workflow_call:
     inputs:
       tag:
@@ -22,9 +28,8 @@ jobs:
         env:
           INPUT_TAG: ${{ inputs.tag }}
           REF_TAG: ${{ github.ref_name }}
-          EVENT_NAME: ${{ github.event_name }}
         run: |
-          if [ "$EVENT_NAME" = "workflow_call" ]; then TAG="$INPUT_TAG"; else TAG="$REF_TAG"; fi
+          if [ -n "$INPUT_TAG" ]; then TAG="$INPUT_TAG"; else TAG="$REF_TAG"; fi
           case "$TAG" in v[0-9]*.[0-9]*.[0-9]*) ;; *) exit 2 ;; esac
           echo "tag=$TAG" >> "$GITHUB_OUTPUT"
       - uses: actions/checkout@v6
@@ -38,7 +43,7 @@ jobs:
           cache: gradle
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.6
+          ruby-version: '3.3'
           bundler-cache: true
       - name: Verify tag and release identity
         env:
@@ -95,7 +100,12 @@ jobs:
         env:
           SERVICE_ACCOUNT_BASE64: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT }}
         run: printf '%s' "$SERVICE_ACCOUNT_BASE64" | base64 --decode > service-account.json
-      - name: Upload the published AAB to Play internal
+      - name: Use current delivery lane for manual recovery
+        if: github.event_name == 'workflow_dispatch'
+        run: |
+          git fetch origin master
+          git show origin/master:fastlane/Fastfile > fastlane/Fastfile
+      - name: Upload the published APK to Play internal
         env:
           TAG: ${{ steps.requested.outputs.tag }}
         run: |

Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
-gem "fastlane"
+gem "fastlane", "2.235.0"
+gem "multi_json", "~> 1.15"