Skip to content

Commit fbcbde3

Browse files
authored
Merge pull request #6982 from StoDevX/drew/xcode-14
Upgrade to Xcode 14 (take two)
2 parents 44f38f0 + bdc1ed0 commit fbcbde3

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

.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-11
78+
runs-on: macos-12
7979
steps:
8080
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
8181
- uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
@@ -86,7 +86,7 @@ jobs:
8686
with:
8787
ruby-version: '2.6'
8888
bundler-cache: true
89-
- run: sudo xcode-select -s /Applications/Xcode_13.1.app
89+
- run: sudo xcode-select -s /Applications/Xcode_14.2.app
9090
- run: git fetch --prune --unshallow
9191
- run: npm ci
9292
env:

.github/workflows/check.yml

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

1212
env:
1313
ruby_version: '2.6'
14-
xcode_version: 'Xcode_13.1'
14+
xcode_version: 'Xcode_14.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-11
53+
runs-on: macos-12
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-11
85+
runs-on: macos-12
8686
steps:
8787
- uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.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-11
97+
runs-on: macos-12
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-11
274+
runs-on: macos-12
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-11
433+
runs-on: macos-12
434434
outputs:
435435
cache-key: ${{ steps.app-cache.outputs.cache-primary-key }}
436436
steps:
@@ -512,7 +512,7 @@ jobs:
512512
ios-detox:
513513
name: Detox E2E for iOS
514514
needs: [cache-npm-macos, ios-build, ios-bundle]
515-
runs-on: macos-11
515+
runs-on: macos-12
516516
steps:
517517
- run: sudo xcode-select -s /Applications/${{ env.xcode_version }}.app
518518

.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-11
18+
runs-on: macos-12
1919
timeout-minutes: 15
2020
if: github.actor == 'renovate[bot]'
2121
steps:
@@ -33,7 +33,7 @@ jobs:
3333
ruby-version: '2.6'
3434
bundler-cache: true
3535

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

3838
- run: npm ci
3939

ios/AllAboutOlaf.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,7 +1422,7 @@
14221422
GCC_WARN_UNUSED_FUNCTION = YES;
14231423
GCC_WARN_UNUSED_VARIABLE = YES;
14241424
HEADER_SEARCH_PATHS = "$(inherited)";
1425-
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
1425+
IPHONEOS_DEPLOYMENT_TARGET = 16.2;
14261426
MTL_ENABLE_DEBUG_INFO = YES;
14271427
ONLY_ACTIVE_ARCH = YES;
14281428
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
@@ -1477,7 +1477,7 @@
14771477
GCC_WARN_UNUSED_FUNCTION = YES;
14781478
GCC_WARN_UNUSED_VARIABLE = YES;
14791479
HEADER_SEARCH_PATHS = "$(inherited)";
1480-
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
1480+
IPHONEOS_DEPLOYMENT_TARGET = 16.2;
14811481
MTL_ENABLE_DEBUG_INFO = NO;
14821482
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
14831483
SDKROOT = iphoneos;

0 commit comments

Comments
 (0)