diff --git a/.github/workflows/CI-iOS.yml b/.github/workflows/CI-iOS.yml index 832ebf76..7aa055f7 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-14-xlarge + runs-on: macos-15-xlarge timeout-minutes: 8 @@ -22,10 +22,10 @@ jobs: - uses: actions/checkout@v4 - name: Select Xcode - run: sudo xcode-select -switch /Applications/Xcode_15.4.app + run: sudo xcode-select -switch /Applications/Xcode_16.2.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.5" 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 16 Pro,OS=18.2" ONLY_ACTIVE_ARCH=YES diff --git a/.github/workflows/CI-macOS.yml b/.github/workflows/CI-macOS.yml index eec2dc34..eaa4a21c 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-14 + runs-on: macos-15 timeout-minutes: 8 @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v4 - name: Select Xcode - run: sudo xcode-select -switch /Applications/Xcode_15.4.app + run: sudo xcode-select -switch /Applications/Xcode_16.2.app - name: Xcode version run: /usr/bin/xcodebuild -version diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml index d8a47700..825edb0a 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-14 + runs-on: macos-15 # 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.4.app + run: sudo xcode-select -switch /Applications/Xcode_16.2.app - name: Xcode version run: /usr/bin/xcodebuild -version diff --git a/EssentialApp/EssentialApp.xcodeproj/project.pbxproj b/EssentialApp/EssentialApp.xcodeproj/project.pbxproj index 42e5f291..432b7726 100644 --- a/EssentialApp/EssentialApp.xcodeproj/project.pbxproj +++ b/EssentialApp/EssentialApp.xcodeproj/project.pbxproj @@ -248,7 +248,7 @@ attributes = { BuildIndependentTargetsInParallel = YES; LastSwiftUpdateCheck = 1120; - LastUpgradeCheck = 1530; + LastUpgradeCheck = 1620; ORGANIZATIONNAME = "Essential Developer"; TargetAttributes = { 0895DA82234B3B950031BB2D = { @@ -540,7 +540,6 @@ 0895DAA6234B3B980031BB2D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; @@ -567,7 +566,6 @@ 0895DAA7234B3B980031BB2D /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; diff --git a/EssentialApp/EssentialApp.xcworkspace/xcshareddata/xcschemes/CI_iOS.xcscheme b/EssentialApp/EssentialApp.xcworkspace/xcshareddata/xcschemes/CI_iOS.xcscheme index 104900c5..99bad1cf 100644 --- a/EssentialApp/EssentialApp.xcworkspace/xcshareddata/xcschemes/CI_iOS.xcscheme +++ b/EssentialApp/EssentialApp.xcworkspace/xcshareddata/xcschemes/CI_iOS.xcscheme @@ -1,6 +1,6 @@