Skip to content

Commit c23e9c0

Browse files
authored
Merge pull request #7104 from StoDevX/drew/xcode-15
Upgrade Xcode, macOS, iOS targets
2 parents 0e63272 + 33cc0f3 commit c23e9c0

File tree

48 files changed

+2185
-3274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2185
-3274
lines changed

.eslintrc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ plugins:
1515
- '@tanstack/eslint-plugin-query'
1616

1717
extends:
18+
- '@react-native'
1819
- 'eslint:recommended'
1920
- 'plugin:react/recommended'
2021
- 'plugin:@typescript-eslint/recommended'

.github/workflows/build-and-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575

7676
ios:
7777
name: Build for iOS
78-
runs-on: macos-12
78+
runs-on: macos-14
7979
steps:
8080
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
8181
- uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
@@ -86,7 +86,7 @@ jobs:
8686
with:
8787
ruby-version: '3.0'
8888
bundler-cache: true
89-
- run: sudo xcode-select -s /Applications/Xcode_14.2.app
89+
- run: sudo xcode-select -s /Applications/Xcode_15.2.app
9090
- run: git fetch --prune --unshallow
9191
- run: npm ci
9292
env:

.github/workflows/check.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ concurrency:
1111

1212
env:
1313
ruby_version: '3.0'
14-
xcode_version: 'Xcode_14.2'
14+
xcode_version: 'Xcode_15.2'
1515
java_version: '11'
1616
java_distribution: temurin
1717

@@ -50,7 +50,7 @@ jobs:
5050

5151
cache-npm-macos:
5252
name: Cache npm for macOS
53-
runs-on: macos-12
53+
runs-on: macos-14
5454
outputs:
5555
cache-key: ${{ steps.node-cache.outputs.cache-primary-key }}
5656
steps:
@@ -82,7 +82,7 @@ jobs:
8282

8383
cache-bundler-macos:
8484
name: Cache bundler for macOS
85-
runs-on: macos-12
85+
runs-on: macos-14
8686
steps:
8787
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
8888

@@ -94,7 +94,7 @@ jobs:
9494
cache-cocoapods:
9595
name: iOS Cocoapods
9696
needs: [cache-npm-macos, cache-bundler-macos]
97-
runs-on: macos-12
97+
runs-on: macos-14
9898
outputs:
9999
cache-key: ${{ steps.cocoapods-cache.outputs.cache-primary-key }}
100100
steps:
@@ -271,7 +271,7 @@ jobs:
271271
ios-bundle:
272272
name: iOS Bundle
273273
needs: [cache-npm-macos]
274-
runs-on: macos-12
274+
runs-on: macos-14
275275
outputs:
276276
cache-key: ${{ steps.jsbundle-cache.outputs.cache-primary-key }}
277277
steps:
@@ -430,7 +430,7 @@ jobs:
430430
ios-build:
431431
name: Build for iOS
432432
needs: [jest, eslint, cache-cocoapods, cache-npm-macos, cache-bundler-macos]
433-
runs-on: macos-12
433+
runs-on: macos-14
434434
outputs:
435435
cache-key: ${{ steps.app-cache.outputs.cache-primary-key }}
436436
steps:
@@ -493,7 +493,7 @@ jobs:
493493
upload_buildcache_log: 'true'
494494

495495
- name: Build the iOS app
496-
if: steps.app-cache.outputs.cache-hit != 'true'
496+
if: ${{ steps.app-cache.outputs.cache-hit != 'true' && !contains(github.event.pull_request.labels.*.name, 'ci/skip-detox') }}
497497
env:
498498
SKIP_BUNDLING: 'true'
499499
run: npx detox build e2e --configuration ios.sim.release
@@ -512,7 +512,8 @@ jobs:
512512
ios-detox:
513513
name: Detox E2E for iOS
514514
needs: [cache-npm-macos, ios-build, ios-bundle]
515-
runs-on: macos-12
515+
runs-on: macos-14
516+
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci/skip-detox') }}
516517
steps:
517518
- run: sudo xcode-select -s /Applications/${{ env.xcode_version }}.app
518519

.github/workflows/cocoapods.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
ios-podfile-update:
1616
# Adapted from https://gist.github.com/A-Tokyo/0d811e818513fc4d3272335d2847d748
1717
name: iOS Update Cocoapods
18-
runs-on: macos-12
18+
runs-on: macos-14
1919
timeout-minutes: 15
2020
if: github.actor == 'renovate[bot]'
2121
steps:
@@ -33,7 +33,7 @@ jobs:
3333
ruby-version: '3.0'
3434
bundler-cache: true
3535

36-
- run: sudo xcode-select -s /Applications/Xcode_14.2.app
36+
- run: sudo xcode-select -s /Applications/Xcode_15.2.app
3737

3838
- run: npm ci
3939

Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
source 'https://rubygems.org'
22

3-
gem 'fastlane', '2.214.0'
3+
gem 'fastlane', '2.216.0'
44
gem 'netrc', '0.11.0'
55
gem 'json', '2.6.3'
6-
gem 'xcodeproj', '1.22.0'
7-
gem 'cocoapods', '1.12.1'
6+
gem 'xcodeproj', '1.24.0'
7+
gem 'cocoapods', '1.15.2'
88

99
# fastlane plugins
1010

0 commit comments

Comments
 (0)