From 47d23d62593a53478ec5698f1df51189d4df3941 Mon Sep 17 00:00:00 2001 From: Vova Ignatov Date: Tue, 25 Nov 2025 16:42:31 +0000 Subject: [PATCH 1/2] IOS-5517 bump xcode --- .github/WORKFLOWS_REFERENCE.md | 4 ++-- .github/workflows/branch_build.yaml | 2 +- .github/workflows/dev_build.yaml | 2 +- .github/workflows/ipa.yaml | 2 +- .github/workflows/license-checks.yml | 2 +- .github/workflows/pr-review-automation.md | 2 +- .github/workflows/pr_tests.yml | 2 +- .github/workflows/release_build.yaml | 2 +- .github/workflows/test_fastlane_build.yaml | 2 +- .github/workflows/update_cache.yaml | 2 +- .github/workflows/update_middleware.yaml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/WORKFLOWS_REFERENCE.md b/.github/WORKFLOWS_REFERENCE.md index f5322281f1..5134c842c5 100644 --- a/.github/WORKFLOWS_REFERENCE.md +++ b/.github/WORKFLOWS_REFERENCE.md @@ -290,7 +290,7 @@ The repository uses a **centralized auto-merge system** via the `automerge.yaml` | Runner | Xcode Version | Use Case | |--------|--------------|----------| | `macos-15` | Xcode 15.x (e.g., 15.4) | Legacy builds, older Xcode requirements | -| `macos-26` | Xcode 26.0 | **Current standard** - All modern builds | +| `macos-26` | Xcode 26.1 | **Current standard** - All modern builds | | `ubuntu-latest` | N/A | Utility jobs, scripts, API calls | ### Runner-Xcode Version Mapping @@ -306,7 +306,7 @@ jobs: - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: '26.0' + xcode-version: '26.1' ``` ### Reference Documentation diff --git a/.github/workflows/branch_build.yaml b/.github/workflows/branch_build.yaml index 46b6122856..89da4bc9e1 100644 --- a/.github/workflows/branch_build.yaml +++ b/.github/workflows/branch_build.yaml @@ -36,7 +36,7 @@ jobs: - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: '26.0' + xcode-version: '26.1' - name: Download Middleware run: make setup-middle-ci diff --git a/.github/workflows/dev_build.yaml b/.github/workflows/dev_build.yaml index 9bc7b1abc3..8d6650a922 100644 --- a/.github/workflows/dev_build.yaml +++ b/.github/workflows/dev_build.yaml @@ -37,7 +37,7 @@ jobs: - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: '26.0' + xcode-version: '26.1' - name: Download Middleware run: make setup-middle-ci diff --git a/.github/workflows/ipa.yaml b/.github/workflows/ipa.yaml index f45b635719..e2a250a168 100644 --- a/.github/workflows/ipa.yaml +++ b/.github/workflows/ipa.yaml @@ -30,7 +30,7 @@ jobs: - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: '26.0' + xcode-version: '26.1' - name: Download Middleware run: make setup-middle-ci diff --git a/.github/workflows/license-checks.yml b/.github/workflows/license-checks.yml index dc45d980f5..35ec334b72 100644 --- a/.github/workflows/license-checks.yml +++ b/.github/workflows/license-checks.yml @@ -29,7 +29,7 @@ jobs: - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: '26.0' + xcode-version: '26.1' - name: Download Middleware run: make setup-middle-ci diff --git a/.github/workflows/pr-review-automation.md b/.github/workflows/pr-review-automation.md index 993ae4fd73..8530cddb3c 100644 --- a/.github/workflows/pr-review-automation.md +++ b/.github/workflows/pr-review-automation.md @@ -29,7 +29,7 @@ https://github.com/actions/runner-images/tree/main/images/macos ### macOS Runner to Xcode Version Mapping - `macos-15`: Xcode 15.x (e.g., '15.4') - See https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md -- `macos-26`: Xcode 26.0 (at /Applications/Xcode_26.0.app) - See https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md +- `macos-26`: Xcode 26.1 (at /Applications/Xcode_26.1.app) - See https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md **VALIDATION RULE**: When reviewing xcode-version in workflows, verify it matches the runs-on runner version using the mapping above. diff --git a/.github/workflows/pr_tests.yml b/.github/workflows/pr_tests.yml index 64710fd02a..dd464c4fce 100644 --- a/.github/workflows/pr_tests.yml +++ b/.github/workflows/pr_tests.yml @@ -32,7 +32,7 @@ jobs: - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: '26.0' + xcode-version: '26.1' - name: Download Middleware run: make setup-middle-ci diff --git a/.github/workflows/release_build.yaml b/.github/workflows/release_build.yaml index 63044f53e9..c2274e1ca2 100644 --- a/.github/workflows/release_build.yaml +++ b/.github/workflows/release_build.yaml @@ -35,7 +35,7 @@ jobs: - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: '26.0' + xcode-version: '26.1' - name: Download Middleware run: make setup-middle-ci diff --git a/.github/workflows/test_fastlane_build.yaml b/.github/workflows/test_fastlane_build.yaml index 6e5cce8130..d9a7e4182f 100644 --- a/.github/workflows/test_fastlane_build.yaml +++ b/.github/workflows/test_fastlane_build.yaml @@ -28,7 +28,7 @@ jobs: - uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: '26.0' + xcode-version: '26.1' - name: Download Middleware run: make setup-middle-ci diff --git a/.github/workflows/update_cache.yaml b/.github/workflows/update_cache.yaml index fd9522fb27..f21b4d1e75 100644 --- a/.github/workflows/update_cache.yaml +++ b/.github/workflows/update_cache.yaml @@ -28,7 +28,7 @@ jobs: - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: '26.0' + xcode-version: '26.1' - name: Download Middleware run: make setup-middle-ci diff --git a/.github/workflows/update_middleware.yaml b/.github/workflows/update_middleware.yaml index 888fafbc87..ddafc2d8d2 100644 --- a/.github/workflows/update_middleware.yaml +++ b/.github/workflows/update_middleware.yaml @@ -106,7 +106,7 @@ jobs: - name: Setup Xcode uses: maxim-lobanov/setup-xcode@v1.6.0 with: - xcode-version: '26.0' + xcode-version: '26.1' # Install required development tools (e.g., SwiftGen, Sourcery) - name: Setup tools From b70509b1299e720bfac8d858dda0509df909db1e Mon Sep 17 00:00:00 2001 From: Vova Ignatov Date: Tue, 25 Nov 2025 16:44:09 +0000 Subject: [PATCH 2/2] IOS-5517 Update fastlane --- Gemfile | 2 +- Gemfile.lock | 91 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 54 insertions(+), 39 deletions(-) diff --git a/Gemfile b/Gemfile index 5f0f58bdee..a41a86c820 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ ruby '2.7.2' source 'https://rubygems.org' -gem 'fastlane', '~> 2.224.0' +gem 'fastlane', '~> 2.229.0' gem 'fastlane-plugin-sentry', '1.15.0' gem 'license_finder' # https://github.com/CocoaPods/Xcodeproj/pull/942 diff --git a/Gemfile.lock b/Gemfile.lock index 65597f01f6..2532324c99 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,29 +14,30 @@ GIT GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.7) - base64 - nkf - rexml - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + CFPropertyList (3.0.9) + abbrev (0.1.2) + addressable (2.8.8) + public_suffix (>= 2.0.2, < 8.0) artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.3.0) - aws-partitions (1.985.0) - aws-sdk-core (3.209.1) + aws-eventstream (1.4.0) + aws-partitions (1.1187.0) + aws-sdk-core (3.239.1) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) + base64 + bigdecimal jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.94.0) - aws-sdk-core (~> 3, >= 3.207.0) + logger + aws-sdk-kms (1.118.0) + aws-sdk-core (~> 3, >= 3.239.1) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.167.0) - aws-sdk-core (~> 3, >= 3.207.0) + aws-sdk-s3 (1.205.0) + aws-sdk-core (~> 3, >= 3.234.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.10.0) + aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) badge (0.13.0) @@ -44,13 +45,15 @@ GEM fastlane (>= 2.0) mini_magick (>= 4.9.4, < 5.0.0) base64 (0.2.0) + bigdecimal (3.3.1) claide (1.1.0) colored (1.2) colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) + csv (3.3.5) 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) @@ -68,15 +71,15 @@ GEM faraday-rack (~> 1.0) faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) - faraday-cookie_jar (0.0.7) + faraday-cookie_jar (0.0.8) faraday (>= 0.8.0) - http-cookie (~> 1.0.0) + http-cookie (>= 1.0.0) faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) + faraday-em_synchrony (1.0.1) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.1) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -84,16 +87,19 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.1) faraday (~> 1.0) - fastimage (2.3.1) - fastlane (2.224.0) + fastimage (2.4.0) + fastlane (2.229.1) CFPropertyList (>= 2.3, < 4.0.0) + abbrev (~> 0.1.2) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) + base64 (~> 0.2.0) bundler (>= 1.12.0, < 3.0.0) colored (~> 1.2) commander (~> 4.6) + csv (~> 3.3) dotenv (>= 2.1.1, < 3.0.0) emoji_regex (>= 0.1, < 4.0) excon (>= 0.71.0, < 1.0.0) @@ -101,6 +107,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) @@ -112,7 +119,9 @@ GEM jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) + mutex_m (~> 0.3.0) naturally (~> 2.2) + nkf (~> 0.2.0) optparse (>= 0.1.1, < 1.0.0) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) @@ -124,13 +133,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 (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-plugin-badge (1.5.0) badge (~> 0.13.0) fastlane-plugin-sentry (1.15.0) os (~> 1.1, >= 1.1.4) fastlane-plugin-versioning (0.6.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) @@ -169,12 +180,13 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) - httpclient (2.8.3) + httpclient (2.9.0) + mutex_m jmespath (1.6.2) - json (2.7.2) - jwt (2.9.3) + json (2.16.0) + jwt (2.10.2) base64 license_finder (7.1.0) bundler @@ -183,27 +195,29 @@ GEM tomlrb (>= 1.3, < 2.1) with_env (= 1.1.0) xml-simple (~> 1.1.9) + logger (1.7.0) mini_magick (4.13.2) mini_mime (1.1.5) multi_json (1.15.0) multipart-post (2.4.1) + mutex_m (0.3.0) nanaimo (0.3.0) - naturally (2.2.1) + naturally (2.3.0) nkf (0.2.0) - optparse (0.5.0) + optparse (0.8.0) os (1.1.4) - plist (3.7.1) + plist (3.7.2) public_suffix (5.1.1) - rake (13.2.1) + rake (13.3.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.3.8) - rouge (2.0.7) + rexml (3.4.4) + rouge (3.28.0) ruby2_keywords (0.0.5) - rubyzip (2.3.2) + rubyzip (2.4.1) security (0.1.5) signet (0.19.0) addressable (~> 2.8) @@ -213,6 +227,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) @@ -227,8 +242,8 @@ GEM unicode-display_width (2.6.0) with_env (1.1.0) word_wrap (1.0.0) - xcpretty (0.3.0) - rouge (~> 2.0.7) + xcpretty (0.4.1) + rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) xml-simple (1.1.9) @@ -240,7 +255,7 @@ PLATFORMS x86_64-darwin-19 DEPENDENCIES - fastlane (~> 2.224.0) + fastlane (~> 2.229.0) fastlane-plugin-badge fastlane-plugin-sentry (= 1.15.0) fastlane-plugin-versioning