From ffe12b7301878987c32c4320f1dc83ff02d8c39d Mon Sep 17 00:00:00 2001 From: Jorge Osorio Date: Thu, 6 Feb 2025 10:19:31 +0100 Subject: [PATCH 1/8] chore: update fastlane --- Gemfile.lock | 115 +++++++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 55 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 13bc9b3c97..51c6885671 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,33 +5,33 @@ GEM base64 nkf rexml - activesupport (7.0.8.1) + activesupport (7.0.8.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) - artifactory (3.0.15) + artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.895.0) - aws-sdk-core (3.191.3) + aws-partitions (1.1046.0) + aws-sdk-core (3.217.1) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.77.0) - aws-sdk-core (~> 3, >= 3.191.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.143.0) - aws-sdk-core (~> 3, >= 3.191.0) + aws-sdk-kms (1.97.0) + aws-sdk-core (~> 3, >= 3.216.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.179.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.8) - aws-sigv4 (1.8.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) @@ -77,11 +77,11 @@ GEM colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.5) configure_extensions (1.0.0) xcodeproj (~> 1.2) declarative (0.0.20) - digest-crc (0.6.5) + digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20240107) dotenv (2.8.1) @@ -89,8 +89,8 @@ GEM escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - excon (0.109.0) - faraday (1.10.3) + excon (0.112.0) + faraday (1.10.4) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -109,24 +109,24 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) + faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) faraday-retry (1.0.3) - faraday_middleware (1.2.0) + faraday_middleware (1.2.1) faraday (~> 1.0) - fastimage (2.3.0) - fastlane (2.219.0) + fastimage (2.4.0) + fastlane (2.226.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) - colored + colored (~> 1.2) commander (~> 4.6) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) @@ -135,6 +135,7 @@ GEM faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) @@ -147,10 +148,10 @@ GEM mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) - optparse (>= 0.1.1) + optparse (>= 0.1.1, < 1.0.0) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) + security (= 0.1.5) simctl (~> 1.6.3) terminal-notifier (>= 2.0.0, < 3.0.0) terminal-table (~> 3) @@ -158,12 +159,15 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) - fastlane-plugin-firebase_app_distribution (0.9.0) + xcpretty (~> 0.4.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-plugin-firebase_app_distribution (0.10.0) google-apis-firebaseappdistribution_v1 (~> 0.3.0) google-apis-firebaseappdistribution_v1alpha (~> 0.2.0) - ffi (1.16.3) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) + ffi (1.17.1) + ffi (1.17.1-arm64-darwin) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) @@ -187,12 +191,12 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.31.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.1) + google-cloud-core (1.7.1) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.1) + google-cloud-errors (1.4.0) google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -208,42 +212,42 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.5) + http-cookie (1.0.8) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.1) + i18n (1.14.7) concurrent-ruby (~> 1.0) jmespath (1.6.2) - json (2.7.1) - jwt (2.8.1) + json (2.9.1) + jwt (2.10.1) base64 - mini_magick (4.12.0) + mini_magick (4.13.2) mini_mime (1.1.5) - minitest (5.22.2) + minitest (5.25.4) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.4.0) - nanaimo (0.3.0) + multipart-post (2.4.1) + nanaimo (0.4.0) nap (1.1.0) naturally (2.2.1) netrc (0.11.0) nkf (0.2.0) - optparse (0.4.0) + optparse (0.6.0) os (1.1.4) - plist (3.7.1) + plist (3.7.2) public_suffix (4.0.7) - rake (13.1.0) + rake (13.2.1) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.6) - rouge (2.0.7) + rexml (3.4.0) + rouge (3.28.0) ruby-macho (2.5.1) ruby2_keywords (0.0.5) - rubyzip (2.3.2) - security (0.1.3) + rubyzip (2.4.1) + security (0.1.5) signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) @@ -252,6 +256,7 @@ GEM simctl (1.6.10) CFPropertyList naturally + sysrandom (1.0.5) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -265,17 +270,17 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) word_wrap (1.0.0) - xcodeproj (1.24.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (~> 3.2.4) - xcpretty (0.3.0) - rouge (~> 2.0.7) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.4.0) + rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) From 58230baea19d2b8fc9cdb4516eed45a8e26f4544 Mon Sep 17 00:00:00 2001 From: Jorge Osorio Date: Thu, 6 Feb 2025 12:49:20 +0100 Subject: [PATCH 2/8] Update replace-bundle.sh --- scripts/android/replace-bundle.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/android/replace-bundle.sh b/scripts/android/replace-bundle.sh index ba7c5670f4..cf484cbe77 100644 --- a/scripts/android/replace-bundle.sh +++ b/scripts/android/replace-bundle.sh @@ -51,6 +51,10 @@ else echo "Set version code to build id: $BUILD_ID" yq e ".versionInfo.versionCode = env(BUILD_ID)" -i decompiled-apk/apktool.yml + echo "Add timestamp file" + TIMESTAMP_FILE="decompiled-apk/assets/checksum.txt" + date +%s > $TIMESTAMP_FILE + echo "Re-compile Android APK" apktool b decompiled-apk -o temp-$APK_FILE_NAME From 2a8582fd46a22395043e6578ccece8d3646430d0 Mon Sep 17 00:00:00 2001 From: Jorge Osorio Date: Thu, 6 Feb 2025 13:04:59 +0100 Subject: [PATCH 3/8] Update replace-bundle.sh --- scripts/android/replace-bundle.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/android/replace-bundle.sh b/scripts/android/replace-bundle.sh index cf484cbe77..b01d990096 100644 --- a/scripts/android/replace-bundle.sh +++ b/scripts/android/replace-bundle.sh @@ -51,9 +51,8 @@ else echo "Set version code to build id: $BUILD_ID" yq e ".versionInfo.versionCode = env(BUILD_ID)" -i decompiled-apk/apktool.yml - echo "Add timestamp file" - TIMESTAMP_FILE="decompiled-apk/assets/checksum.txt" - date +%s > $TIMESTAMP_FILE + echo "Modify AndroidManifest.xml to change checksum" + yq e '.manifest.application."meta-data"+=[{"@android:name":"build.timestamp","@android:value": env(BUILD_ID)}]' -i decompiled-apk/AndroidManifest.xml echo "Re-compile Android APK" apktool b decompiled-apk -o temp-$APK_FILE_NAME From cbb634938e25147756f631a7a5e05cc876466feb Mon Sep 17 00:00:00 2001 From: Jorge Osorio Date: Thu, 6 Feb 2025 13:16:09 +0100 Subject: [PATCH 4/8] Update replace-bundle.sh --- scripts/android/replace-bundle.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/android/replace-bundle.sh b/scripts/android/replace-bundle.sh index b01d990096..712805ffee 100644 --- a/scripts/android/replace-bundle.sh +++ b/scripts/android/replace-bundle.sh @@ -51,8 +51,8 @@ else echo "Set version code to build id: $BUILD_ID" yq e ".versionInfo.versionCode = env(BUILD_ID)" -i decompiled-apk/apktool.yml - echo "Modify AndroidManifest.xml to change checksum" - yq e '.manifest.application."meta-data"+=[{"@android:name":"build.timestamp","@android:value": env(BUILD_ID)}]' -i decompiled-apk/AndroidManifest.xml + echo "Set build id to the bundle" + printf "\n// Build ID: %s\n" "$BUILD_ID" >> decompiled-apk/assets/index.android.bundle echo "Re-compile Android APK" apktool b decompiled-apk -o temp-$APK_FILE_NAME From 83b0547d0445d2390ab6bdb850edbbabcfa8a747 Mon Sep 17 00:00:00 2001 From: Jorge Osorio Date: Thu, 6 Feb 2025 13:34:25 +0100 Subject: [PATCH 5/8] Update replace-bundle.sh --- scripts/android/replace-bundle.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/android/replace-bundle.sh b/scripts/android/replace-bundle.sh index 712805ffee..dfbb34e91a 100644 --- a/scripts/android/replace-bundle.sh +++ b/scripts/android/replace-bundle.sh @@ -51,8 +51,10 @@ else echo "Set version code to build id: $BUILD_ID" yq e ".versionInfo.versionCode = env(BUILD_ID)" -i decompiled-apk/apktool.yml - echo "Set build id to the bundle" - printf "\n// Build ID: %s\n" "$BUILD_ID" >> decompiled-apk/assets/index.android.bundle + echo "Modify smali code to alter checksum" + SMALI_FILE=$(find decompiled-apk/smali*/ -name "*.smali" | head -n 1) + printf "\n const-string v0, \"build_%s\"\n" "$BUILD_ID" >> "$SMALI_FILE" + echo "Modified fallback smali file: $SMALI_FILE" echo "Re-compile Android APK" apktool b decompiled-apk -o temp-$APK_FILE_NAME From 3403f6d390204d70a2234cf2a18a39bb90998d40 Mon Sep 17 00:00:00 2001 From: Jorge Osorio Date: Fri, 7 Feb 2025 09:32:19 +0100 Subject: [PATCH 6/8] Update replace-bundle.sh --- scripts/android/replace-bundle.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/android/replace-bundle.sh b/scripts/android/replace-bundle.sh index dfbb34e91a..da74a804b0 100644 --- a/scripts/android/replace-bundle.sh +++ b/scripts/android/replace-bundle.sh @@ -51,10 +51,13 @@ else echo "Set version code to build id: $BUILD_ID" yq e ".versionInfo.versionCode = env(BUILD_ID)" -i decompiled-apk/apktool.yml - echo "Modify smali code to alter checksum" - SMALI_FILE=$(find decompiled-apk/smali*/ -name "*.smali" | head -n 1) - printf "\n const-string v0, \"build_%s\"\n" "$BUILD_ID" >> "$SMALI_FILE" - echo "Modified fallback smali file: $SMALI_FILE" + # Add a timestamp file + TIMESTAMP=$(date +%s) + echo $TIMESTAMP > decompiled-apk/assets/timestamp.txt + yq e '.doNotCompress += ["assets/timestamp.txt"]' -i decompiled-apk/apktool.yml + + # Verify the file is included + unzip -l temp-$APK_FILE_NAME | grep "timestamp.txt" echo "Re-compile Android APK" apktool b decompiled-apk -o temp-$APK_FILE_NAME From 90f91d9f2790cb1eb3b2e2116b4262f3932cc019 Mon Sep 17 00:00:00 2001 From: Jorge Osorio Date: Fri, 7 Feb 2025 09:43:08 +0100 Subject: [PATCH 7/8] Update replace-bundle.sh --- scripts/android/replace-bundle.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/android/replace-bundle.sh b/scripts/android/replace-bundle.sh index da74a804b0..c8c3f5c11a 100644 --- a/scripts/android/replace-bundle.sh +++ b/scripts/android/replace-bundle.sh @@ -56,12 +56,12 @@ else echo $TIMESTAMP > decompiled-apk/assets/timestamp.txt yq e '.doNotCompress += ["assets/timestamp.txt"]' -i decompiled-apk/apktool.yml - # Verify the file is included - unzip -l temp-$APK_FILE_NAME | grep "timestamp.txt" - echo "Re-compile Android APK" apktool b decompiled-apk -o temp-$APK_FILE_NAME + # Verify the file is included + unzip -l temp-$APK_FILE_NAME | grep "timestamp.txt" + echo "The APK must be aligned to 4 byte boundaries to work on Android" /usr/local/lib/android/sdk/build-tools/34.0.0/zipalign -p -f 4 temp-$APK_FILE_NAME $APK_FILE_NAME From dc9847e23669183922dafb4bb3a6f37145ec1e99 Mon Sep 17 00:00:00 2001 From: Jorge Osorio Date: Fri, 7 Feb 2025 10:47:49 +0100 Subject: [PATCH 8/8] Update replace-bundle.sh --- scripts/android/replace-bundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/android/replace-bundle.sh b/scripts/android/replace-bundle.sh index c8c3f5c11a..e5a599934c 100644 --- a/scripts/android/replace-bundle.sh +++ b/scripts/android/replace-bundle.sh @@ -57,7 +57,7 @@ else yq e '.doNotCompress += ["assets/timestamp.txt"]' -i decompiled-apk/apktool.yml echo "Re-compile Android APK" - apktool b decompiled-apk -o temp-$APK_FILE_NAME + apktool b --force-all decompiled-apk -o temp-$APK_FILE_NAME # Verify the file is included unzip -l temp-$APK_FILE_NAME | grep "timestamp.txt"