From 405bf74abf4e62283d438bf010794ef79e3d7681 Mon Sep 17 00:00:00 2001 From: Caio Zullo Date: Thu, 4 Apr 2024 14:05:29 +0300 Subject: [PATCH 1/2] Update project to Xcode 15.3 recommended settings --- EssentialApp/EssentialApp.xcodeproj/project.pbxproj | 8 +++++--- .../xcshareddata/xcschemes/CI_iOS.xcscheme | 2 +- .../xcshareddata/xcschemes/EssentialApp.xcscheme | 2 +- EssentialFeed/EssentialFeed.xcodeproj/project.pbxproj | 8 +++++--- .../xcshareddata/xcschemes/CI_macOS.xcscheme | 2 +- .../xcshareddata/xcschemes/EssentialFeed.xcscheme | 2 +- .../xcschemes/EssentialFeedAPIEndToEndTests.xcscheme | 2 +- .../xcschemes/EssentialFeedCacheIntegrationTests.xcscheme | 2 +- .../xcshareddata/xcschemes/EssentialFeediOS.xcscheme | 2 +- 9 files changed, 17 insertions(+), 13 deletions(-) diff --git a/EssentialApp/EssentialApp.xcodeproj/project.pbxproj b/EssentialApp/EssentialApp.xcodeproj/project.pbxproj index b781d606..42e5f291 100644 --- a/EssentialApp/EssentialApp.xcodeproj/project.pbxproj +++ b/EssentialApp/EssentialApp.xcodeproj/project.pbxproj @@ -248,7 +248,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1120; - LastUpgradeCheck = 1500; + LastUpgradeCheck = 1530; ORGANIZATIONNAME = "Essential Developer"; TargetAttributes = { 0895DA82234B3B950031BB2D = { @@ -369,7 +369,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -433,7 +434,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; diff --git a/EssentialApp/EssentialApp.xcworkspace/xcshareddata/xcschemes/CI_iOS.xcscheme b/EssentialApp/EssentialApp.xcworkspace/xcshareddata/xcschemes/CI_iOS.xcscheme index 37505d43..104900c5 100644 --- a/EssentialApp/EssentialApp.xcworkspace/xcshareddata/xcschemes/CI_iOS.xcscheme +++ b/EssentialApp/EssentialApp.xcworkspace/xcshareddata/xcschemes/CI_iOS.xcscheme @@ -1,6 +1,6 @@ Date: Thu, 4 Apr 2024 14:09:42 +0300 Subject: [PATCH 2/2] Update CI to run with macOS 14, iOS 17.4, and Xcode 15.3 --- .github/workflows/CI-iOS.yml | 6 +++--- .github/workflows/CI-macOS.yml | 4 ++-- .github/workflows/Deploy.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI-iOS.yml b/.github/workflows/CI-iOS.yml index 5daef25b..bb880c0d 100644 --- a/.github/workflows/CI-iOS.yml +++ b/.github/workflows/CI-iOS.yml @@ -12,7 +12,7 @@ jobs: # This workflow contains a single job called "build-and-test" build-and-test: # The type of runner that the job will run on - runs-on: macos-13-xlarge + runs-on: macos-14-xlarge timeout-minutes: 8 @@ -22,10 +22,10 @@ jobs: - uses: actions/checkout@v4 - name: Select Xcode - run: sudo xcode-select -switch /Applications/Xcode_15.2.app + run: sudo xcode-select -switch /Applications/Xcode_15.3.app - name: Xcode version run: /usr/bin/xcodebuild -version - name: Build and Test - 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 + 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 diff --git a/.github/workflows/CI-macOS.yml b/.github/workflows/CI-macOS.yml index d1fe95ea..3deace48 100644 --- a/.github/workflows/CI-macOS.yml +++ b/.github/workflows/CI-macOS.yml @@ -12,7 +12,7 @@ jobs: # This workflow contains a single job called "build-and-test" build-and-test: # The type of runner that the job will run on - runs-on: macos-13 + runs-on: macos-14 timeout-minutes: 8 @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v4 - name: Select Xcode - run: sudo xcode-select -switch /Applications/Xcode_15.2.app + run: sudo xcode-select -switch /Applications/Xcode_15.3.app - name: Xcode version run: /usr/bin/xcodebuild -version diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml index e8a05bd2..7ec6601d 100644 --- a/.github/workflows/Deploy.yml +++ b/.github/workflows/Deploy.yml @@ -12,7 +12,7 @@ jobs: # This workflow contains a single job called "build-and-deploy" build-and-deploy: # The type of runner that the job will run on - runs-on: macos-13 + runs-on: macos-14 # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -36,7 +36,7 @@ jobs: security set-key-partition-list -S apple-tool:,apple: -s -k "" ~/Library/Keychains/build.keychain - name: Select Xcode - run: sudo xcode-select -switch /Applications/Xcode_15.2.app + run: sudo xcode-select -switch /Applications/Xcode_15.3.app - name: Xcode version run: /usr/bin/xcodebuild -version