Skip to content

Commit 31cda2e

Browse files
authored
Merge pull request #81 from essentialdevelopercom/xcode15_3
Update CI to macOS 14 / Xcode 15.3 / iOS 17.4
2 parents 07f0d2d + e340e3a commit 31cda2e

File tree

12 files changed

+24
-20
lines changed

12 files changed

+24
-20
lines changed

.github/workflows/CI-iOS.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
# This workflow contains a single job called "build-and-test"
1313
build-and-test:
1414
# The type of runner that the job will run on
15-
runs-on: macos-13-xlarge
15+
runs-on: macos-14-xlarge
1616

1717
timeout-minutes: 8
1818

@@ -22,10 +22,10 @@ jobs:
2222
- uses: actions/checkout@v4
2323

2424
- name: Select Xcode
25-
run: sudo xcode-select -switch /Applications/Xcode_15.2.app
25+
run: sudo xcode-select -switch /Applications/Xcode_15.3.app
2626

2727
- name: Xcode version
2828
run: /usr/bin/xcodebuild -version
2929

3030
- name: Build and Test
31-
run: xcodebuild clean build test -workspace EssentialApp/EssentialApp.xcworkspace -scheme "CI_iOS" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 15 Pro,OS=17.2" ONLY_ACTIVE_ARCH=YES
31+
run: xcodebuild clean build test -workspace EssentialApp/EssentialApp.xcworkspace -scheme "CI_iOS" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 15 Pro,OS=17.4" ONLY_ACTIVE_ARCH=YES

.github/workflows/CI-macOS.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
# This workflow contains a single job called "build-and-test"
1313
build-and-test:
1414
# The type of runner that the job will run on
15-
runs-on: macos-13
15+
runs-on: macos-14
1616

1717
timeout-minutes: 8
1818

@@ -22,7 +22,7 @@ jobs:
2222
- uses: actions/checkout@v4
2323

2424
- name: Select Xcode
25-
run: sudo xcode-select -switch /Applications/Xcode_15.2.app
25+
run: sudo xcode-select -switch /Applications/Xcode_15.3.app
2626

2727
- name: Xcode version
2828
run: /usr/bin/xcodebuild -version

.github/workflows/Deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
# This workflow contains a single job called "build-and-deploy"
1313
build-and-deploy:
1414
# The type of runner that the job will run on
15-
runs-on: macos-13
15+
runs-on: macos-14
1616

1717
# Steps represent a sequence of tasks that will be executed as part of the job
1818
steps:
@@ -36,7 +36,7 @@ jobs:
3636
security set-key-partition-list -S apple-tool:,apple: -s -k "" ~/Library/Keychains/build.keychain
3737
3838
- name: Select Xcode
39-
run: sudo xcode-select -switch /Applications/Xcode_15.2.app
39+
run: sudo xcode-select -switch /Applications/Xcode_15.3.app
4040

4141
- name: Xcode version
4242
run: /usr/bin/xcodebuild -version

EssentialApp/EssentialApp.xcodeproj/project.pbxproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
attributes = {
249249
BuildIndependentTargetsInParallel = YES;
250250
LastSwiftUpdateCheck = 1120;
251-
LastUpgradeCheck = 1500;
251+
LastUpgradeCheck = 1530;
252252
ORGANIZATIONNAME = "Essential Developer";
253253
TargetAttributes = {
254254
0895DA82234B3B950031BB2D = {
@@ -369,7 +369,8 @@
369369
isa = XCBuildConfiguration;
370370
buildSettings = {
371371
ALWAYS_SEARCH_USER_PATHS = NO;
372-
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
372+
ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS = NO;
373+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = NO;
373374
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
374375
CLANG_ANALYZER_NONNULL = YES;
375376
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -433,7 +434,8 @@
433434
isa = XCBuildConfiguration;
434435
buildSettings = {
435436
ALWAYS_SEARCH_USER_PATHS = NO;
436-
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
437+
ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS = NO;
438+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = NO;
437439
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
438440
CLANG_ANALYZER_NONNULL = YES;
439441
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

EssentialApp/EssentialApp.xcworkspace/xcshareddata/xcschemes/CI_iOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1500"
3+
LastUpgradeVersion = "1530"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

EssentialApp/EssentialApp.xcworkspace/xcshareddata/xcschemes/EssentialApp.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1500"
3+
LastUpgradeVersion = "1530"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

EssentialFeed/EssentialFeed.xcodeproj/project.pbxproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@
10541054
attributes = {
10551055
BuildIndependentTargetsInParallel = YES;
10561056
LastSwiftUpdateCheck = 1020;
1057-
LastUpgradeCheck = 1500;
1057+
LastUpgradeCheck = 1530;
10581058
ORGANIZATIONNAME = "Essential Developer";
10591059
TargetAttributes = {
10601060
080EDEF021B6DA7E00813479 = {
@@ -1384,7 +1384,8 @@
13841384
isa = XCBuildConfiguration;
13851385
buildSettings = {
13861386
ALWAYS_SEARCH_USER_PATHS = NO;
1387-
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
1387+
ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS = NO;
1388+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = NO;
13881389
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
13891390
CLANG_ANALYZER_NONNULL = YES;
13901391
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -1454,7 +1455,8 @@
14541455
isa = XCBuildConfiguration;
14551456
buildSettings = {
14561457
ALWAYS_SEARCH_USER_PATHS = NO;
1457-
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
1458+
ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS = NO;
1459+
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = NO;
14581460
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
14591461
CLANG_ANALYZER_NONNULL = YES;
14601462
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;

EssentialFeed/EssentialFeed.xcodeproj/xcshareddata/xcschemes/CI_macOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1500"
3+
LastUpgradeVersion = "1530"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

EssentialFeed/EssentialFeed.xcodeproj/xcshareddata/xcschemes/EssentialFeed.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1500"
3+
LastUpgradeVersion = "1530"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

EssentialFeed/EssentialFeed.xcodeproj/xcshareddata/xcschemes/EssentialFeedAPIEndToEndTests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1500"
3+
LastUpgradeVersion = "1530"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

EssentialFeed/EssentialFeed.xcodeproj/xcshareddata/xcschemes/EssentialFeedCacheIntegrationTests.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1500"
3+
LastUpgradeVersion = "1530"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

EssentialFeed/EssentialFeed.xcodeproj/xcshareddata/xcschemes/EssentialFeediOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1500"
3+
LastUpgradeVersion = "1530"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)