From a0ca11ff22cfa9e7bc78f16c4e07328aca58306e Mon Sep 17 00:00:00 2001
From: Alexey Alter-Pesotskiy <alex@testableapple.com>
Date: Tue, 3 Dec 2024 15:17:30 +0000
Subject: [PATCH] [CI] Bump Xcode version

---
 .github/workflows/cron-checks.yml  | 12 ++++++++++++
 .github/workflows/smoke-checks.yml |  8 +++-----
 fastlane/Fastfile                  |  3 +--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cron-checks.yml b/.github/workflows/cron-checks.yml
index c358d703..54d5321c 100644
--- a/.github/workflows/cron-checks.yml
+++ b/.github/workflows/cron-checks.yml
@@ -41,6 +41,11 @@ jobs:
     strategy:
       matrix:
         include:
+          - ios: 18.1
+            xcode: 16.1
+            os: macos-15
+            device: "iPhone 16 Pro"
+            setup_runtime: false
           - ios: 17.4
             xcode: 15.4
             os: macos-14
@@ -117,8 +122,15 @@ jobs:
     strategy:
       matrix:
         include:
+          - xcode: 16.1
+            os: macos-15
           - xcode: 15.4
             os: macos-14
+          - ios: 18.1
+            xcode: 16.1
+            os: macos-15
+            device: "iPhone 16 Pro"
+            setup_runtime: false
           - xcode: 15.0.1
             os: macos-14
       fail-fast: false
diff --git a/.github/workflows/smoke-checks.yml b/.github/workflows/smoke-checks.yml
index 77278bcb..70f5f41f 100644
--- a/.github/workflows/smoke-checks.yml
+++ b/.github/workflows/smoke-checks.yml
@@ -19,7 +19,7 @@ concurrency:
 
 env:
   HOMEBREW_NO_INSTALL_CLEANUP: 1 # Disable cleanup for homebrew, we don't need it on CI
-  IOS_SIMULATOR_DEVICE: "iPhone 15 Pro (17.4)"
+  IOS_SIMULATOR_DEVICE: "iPhone 16 Pro (18.1)"
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   GITHUB_PR_NUM: ${{ github.event.pull_request.number }}
 
@@ -93,7 +93,7 @@ jobs:
 
   test-ui-debug:
     name: Test SwiftUI (Debug)
-    runs-on: macos-14
+    runs-on: macos-15
     needs: build-test-app-and-frameworks
     steps:
     - uses: actions/checkout@v4.1.1
@@ -164,7 +164,7 @@ jobs:
 
   test-e2e-debug:
     name: Test E2E UI (Debug)
-    runs-on: macos-14
+    runs-on: macos-15
     if: ${{ github.event_name != 'push' && github.event.inputs.snapshots != 'true' }}
     needs:
       - allure_testops_launch
@@ -191,8 +191,6 @@ jobs:
       run: bundle exec fastlane test_e2e_mock device:"${{ env.IOS_SIMULATOR_DEVICE }}" batch:'${{ matrix.batch }}' test_without_building:true
       timeout-minutes: 100
       env:
-        XCODE_VERSION: "15.2" # the most stable pair of Xcode
-        IOS_SIMULATOR_DEVICE: "iPhone 15 Pro (17.2)" # and iOS
         MATRIX_SIZE: ${{ strategy.job-total }}
     - name: Allure TestOps Upload
       if: env.LAUNCH_ID != '' && (success() || failure())
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index e353a6ef..8ac8e228 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -7,7 +7,7 @@ require 'xcodeproj'
 import 'Sonarfile'
 import 'Allurefile'
 
-xcode_version = ENV['XCODE_VERSION'] || '15.4'
+xcode_version = ENV['XCODE_VERSION'] || '16.1'
 xcode_project = 'StreamChatSwiftUI.xcodeproj'
 sdk_names = ['StreamChatSwiftUI']
 github_repo = ENV['GITHUB_REPOSITORY'] || 'GetStream/stream-chat-swiftui'
@@ -116,7 +116,6 @@ lane :publish_release do |options|
   UI.user_error!('Release version cannot be empty') if release_version.to_s.empty?
   ensure_git_branch(branch: 'main')
 
-  xcversion(version: '15.0.1')
   clean_products
   build_xcframeworks
   compress_frameworks