diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4a968a82..2fbb08ed 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,7 +17,7 @@ jobs: swiftformat: name: SwiftFormat & SwiftLint - runs-on: macos-15 + runs-on: macos-26 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - run: | @@ -26,14 +26,14 @@ jobs: check-license-headers: name: License Headers - runs-on: macos-latest + runs-on: macos-26 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - run: ./Scripts/ensure_license lint-podspec: name: CocoaPods - runs-on: macos-15 + runs-on: macos-26 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - uses: ruby/setup-ruby@dffb23f65a78bba8db45d387d5ea1bbd6be3ef18 # v1.293.0 diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml index 82372061..72227fcc 100644 --- a/.github/workflows/test-workflow.yml +++ b/.github/workflows/test-workflow.yml @@ -7,16 +7,16 @@ on: jobs: test: - runs-on: macos-15 + runs-on: macos-26 timeout-minutes: 20 steps: - name: Checkout Repository uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - - name: Switch to Xcode 16.4 + - name: Switch to Xcode 26.2 run: | - sudo xcode-select --switch /Applications/Xcode_16.4.app + sudo xcode-select --switch /Applications/Xcode_26.2.app echo "" - name: Display Current Xcode Path @@ -52,7 +52,7 @@ jobs: - name: Create Test Simulator run: | echo "🔧 Creating new test simulator..." - CURRENT_SIMULATOR_UUID=$(xcrun simctl create TestDevice "iPhone 16") + CURRENT_SIMULATOR_UUID=$(xcrun simctl create TestDevice "iPhone 17 Pro") echo "✅ Created simulator with UUID: $CURRENT_SIMULATOR_UUID" echo "CURRENT_SIMULATOR_UUID=$CURRENT_SIMULATOR_UUID" >> $GITHUB_ENV echo "" diff --git a/Samples/MobileBuyIntegration/MobileBuyIntegration/Generated/Schema/SchemaMetadata.graphql.swift b/Samples/MobileBuyIntegration/MobileBuyIntegration/Generated/Schema/SchemaMetadata.graphql.swift index d1aba0b1..122f34ef 100644 --- a/Samples/MobileBuyIntegration/MobileBuyIntegration/Generated/Schema/SchemaMetadata.graphql.swift +++ b/Samples/MobileBuyIntegration/MobileBuyIntegration/Generated/Schema/SchemaMetadata.graphql.swift @@ -25,7 +25,9 @@ extension Storefront { typealias MutableInlineFragment = Storefront_MutableInlineFragment enum SchemaMetadata: ApolloAPI.SchemaMetadata { - static let configuration: any ApolloAPI.SchemaConfiguration.Type = SchemaConfiguration.self + /// nonisolated(unsafe) is applied manually whilst we're on Apollo v1 + /// Apollo provides Swift 6 support in v2 - this workaround will be removed then + nonisolated(unsafe) static let configuration: any ApolloAPI.SchemaConfiguration.Type = SchemaConfiguration.self static func objectType(forTypename typename: String) -> ApolloAPI.Object? { switch typename { diff --git a/dev.yml b/dev.yml index 919bfa19..cd370406 100644 --- a/dev.yml +++ b/dev.yml @@ -11,10 +11,11 @@ up: - jq - ruby - xcode: - version: "26.0" + version: "26.2" runtimes: ios: - - "26.0" + - version: 23C54 # 26.2 + architecture_variant: arm64 - custom: name: Ensure Storefront.xcconfig file met?: |