diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe8ce5f26..5f6c1dd0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: branches: - "**" schedule: - - cron: '3 3 * * 2' # 3:03 AM, every Tuesday + - cron: "3 3 * * 2" # 3:03 AM, every Tuesday concurrency: group: ci-${{ github.ref }} @@ -44,8 +44,8 @@ jobs: install: true - platform: [iOS, 14] runtime: iOS 14.5 - os: macos-13 - xcode: 14.3.1 + os: macos-12 + xcode: 14.2 install: true - platform: [iOS, 15] runtime: iOS 15.5 @@ -57,9 +57,9 @@ jobs: os: macos-13 xcode: 14.3.1 - platform: [iOS, 17] - runtime: iOS 17.0 - os: macos-13 - xcode: 15.0.1 + runtime: iOS 17.5 + os: macos-14 + xcode: 15.4 - platform: [tvOS, 13] runtime: tvOS 13.4 @@ -68,8 +68,8 @@ jobs: install: true - platform: [tvOS, 14] runtime: tvOS 14.5 - os: macos-13 - xcode: 14.3.1 + os: macos-12 + xcode: 14.2 install: true - platform: [tvOS, 15] runtime: tvOS 15.4 @@ -81,15 +81,10 @@ jobs: os: macos-13 xcode: 15.0.1 - platform: [tvOS, 17] - runtime: tvOS 17.0 - os: macos-13 - xcode: 15.0.1 + runtime: tvOS 17.5 + os: macos-14 + xcode: 15.4 - - platform: [watchOS, 7] - runtime: watchOS 7.4 - os: macos-13 - xcode: 14.3.1 - install: true - platform: [watchOS, 8] runtime: watchOS 8.5 os: macos-13 @@ -100,9 +95,9 @@ jobs: os: macos-13 xcode: 14.3.1 - platform: [watchOS, 10] - runtime: watchOS 10.0 - os: macos-13 - xcode: 15.0.1 + runtime: watchOS 10.5 + os: macos-14 + xcode: 15.4 - platform: [macOS, 12] runtime: macOS 12 @@ -112,13 +107,15 @@ jobs: runtime: macOS 13 os: macos-13 xcode: 15.0.1 - - # FIXME: this currently hangs on CI - # - platform: [visionos, 1] - # runtime: visionOS 1.0-beta2 - # os: macos-13 - # xcode: 15.0 - # install: true + # - platform: [macOS, 14] + # runtime: macOS 14 + # os: macos-14 + # xcode: 15.4 + + # - platform: [visionOS, 1] + # runtime: visionOS 1.2 + # os: macos-14 + # xcode: 15.4 steps: - name: Git Checkout uses: actions/checkout@v4 @@ -131,9 +128,18 @@ jobs: - name: Set environment variables run: echo "SKIP_SLOW_FASTLANE_WARNING=1" >> $GITHUB_ENV + - if: ${{ matrix.platform[0] == 'visionOS' }} + run: | + defaults write com.apple.dt.Xcode AllowUnsupportedVisionOSHost -bool YES + defaults write com.apple.CoreSimulator AllowUnsupportedVisionOSHost -bool YES + - name: Select Xcode version run: sudo xcodes select ${{ matrix.xcode }} + - if: ${{ matrix.install }} + name: "[Debug] List Available Installable Runtimes" + run: xcodes runtimes --include-betas + - if: ${{ matrix.install }} name: Install Required Runtime (${{ matrix.runtime }}) uses: nick-fields/retry@v2 @@ -142,8 +148,7 @@ jobs: max_attempts: 3 command: sudo xcodes runtimes install '${{ matrix.runtime }}' - - if: false - name: '[Debug] List Available Runtimes, Simulators, and Destinations' + - name: "[Debug] List Available Runtimes, Simulators, and Destinations" run: | xcrun simctl list xcodebuild -scheme "SwiftUIIntrospect" -showdestinations @@ -160,6 +165,6 @@ jobs: name: Run Tests run: fastlane test platform:${{ matrix.platform[0] }} version:${{ matrix.platform[1] }} scheme:SwiftUIIntrospectTests configuration:Debug - - if: ${{ matrix.platform[0] == 'iOS' && matrix.platform[1] <= '16' }} - name: Run UI Tests - run: fastlane test platform:${{ matrix.platform[0] }} version:${{ matrix.platform[1] }} scheme:SwiftUIIntrospectUITests configuration:Debug + # - if: ${{ matrix.platform[0] == 'iOS' && matrix.platform[1] <= '16' }} + # name: Run UI Tests + # run: fastlane test platform:${{ matrix.platform[0] }} version:${{ matrix.platform[1] }} scheme:SwiftUIIntrospectUITests configuration:Debug diff --git a/SwiftUIIntrospect.xcworkspace/xcshareddata/swiftpm/Package.resolved b/SwiftUIIntrospect.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5d7d67f23..01642cef6 100644 --- a/SwiftUIIntrospect.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/SwiftUIIntrospect.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,14 +1,5 @@ { "pins" : [ - { - "identity" : "simulatorstatusmagic", - "kind" : "remoteSourceControl", - "location" : "https://github.com/shinydevelopment/SimulatorStatusMagic", - "state" : { - "revision" : "76095ec820674457a11dc3cc621d8a5c369eea0e", - "version" : "2.7.0" - } - }, { "identity" : "swift-snapshot-testing", "kind" : "remoteSourceControl", diff --git a/Tests/Tests.xcodeproj/project.pbxproj b/Tests/Tests.xcodeproj/project.pbxproj index 16c817f34..98b3f7fa7 100644 --- a/Tests/Tests.xcodeproj/project.pbxproj +++ b/Tests/Tests.xcodeproj/project.pbxproj @@ -129,7 +129,6 @@ D5C482402AA354B0005FBE0A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D5C4823F2AA354B0005FBE0A /* LaunchScreen.storyboard */; platformFilter = ios; }; D5F0BE4D29C0DBE800AD95AB /* TestsHostApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F0BE4C29C0DBE800AD95AB /* TestsHostApp.swift */; }; D5F0BE6A29C0DC4900AD95AB /* PlatformVersionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F0BE6729C0DC4900AD95AB /* PlatformVersionTests.swift */; }; - D5F210812A66DDCB002B8385 /* SimulatorStatusMagic in Frameworks */ = {isa = PBXBuildFile; productRef = D5F210802A66DDCB002B8385 /* SimulatorStatusMagic */; }; D5F26E022A561130001209E6 /* PageControlTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F26E012A561130001209E6 /* PageControlTests.swift */; }; D5F26E042A56E74B001209E6 /* ViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F26E032A56E74B001209E6 /* ViewControllerTests.swift */; }; D5F8D5ED2A1E7B490054E9AB /* NavigationViewWithStackStyleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F8D5EC2A1E7B490054E9AB /* NavigationViewWithStackStyleTests.swift */; }; @@ -259,7 +258,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D5F210812A66DDCB002B8385 /* SimulatorStatusMagic in Frameworks */, D58D83382A66C01300A203BE /* SnapshotTesting in Frameworks */, D58D833A2A66C04600A203BE /* SwiftUIIntrospect in Frameworks */, ); @@ -526,7 +524,6 @@ packageProductDependencies = ( D58D83372A66C01300A203BE /* SnapshotTesting */, D58D83392A66C04600A203BE /* SwiftUIIntrospect */, - D5F210802A66DDCB002B8385 /* SimulatorStatusMagic */, ); productName = UITests; productReference = D58D832B2A66BDD500A203BE /* UITests.xctest */; @@ -631,7 +628,6 @@ mainGroup = D5F0BE3E29C0DB9700AD95AB; packageReferences = ( D58D83362A66C01300A203BE /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */, - D5F2107D2A66DC85002B8385 /* XCRemoteSwiftPackageReference "SimulatorStatusMagic" */, ); productRefGroup = D5F0BE4A29C0DBE800AD95AB /* Products */; projectDirPath = ""; @@ -2023,14 +2019,6 @@ minimumVersion = 1.11.1; }; }; - D5F2107D2A66DC85002B8385 /* XCRemoteSwiftPackageReference "SimulatorStatusMagic" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/shinydevelopment/SimulatorStatusMagic"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 2.7.0; - }; - }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ @@ -2055,11 +2043,6 @@ isa = XCSwiftPackageProductDependency; productName = SwiftUIIntrospect; }; - D5F210802A66DDCB002B8385 /* SimulatorStatusMagic */ = { - isa = XCSwiftPackageProductDependency; - package = D5F2107D2A66DC85002B8385 /* XCRemoteSwiftPackageReference "SimulatorStatusMagic" */; - productName = SimulatorStatusMagic; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = D5F0BE3F29C0DB9700AD95AB /* Project object */; diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 072487537..1b6032e03 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -6,23 +6,22 @@ devices = { 14 => ["iPhone 12 (14.5)", "iPad Pro (9.7-inch) (14.5)"], 15 => ["iPhone SE (3rd generation) (15.5)", "iPad Air (5th generation) (15.5)",], 16 => ["iPhone 14 (16.4)", "iPad Pro (11-inch) (4th generation) (16.4)"], - 17 => ["iPhone 14 (17.0.1)", "iPad Pro (11-inch) (4th generation) (17.0.1)"], + 17 => ["iPhone 14 (17.5)", "iPad Pro (11-inch) (4th generation) (17.5)"], }, "tvos" => { 13 => ["Apple TV (13.4)"], 14 => ["Apple TV (14.5)"], 15 => ["Apple TV (15.4)"], 16 => ["Apple TV (16.4)"], - 17 => ["Apple TV (17.0)"], + 17 => ["Apple TV (17.5)"], }, "watchos" => { - 7 => ["Apple Watch Series 6 (44mm) (7.4)"], 8 => ["Apple Watch Series 7 (45mm) (8.5)"], 9 => ["Apple Watch Series 8 (45mm) (9.4)"], - 10 => ["Apple Watch Series 9 (45mm) (10.0)"], + 10 => ["Apple Watch Series 9 (45mm) (10.5)"], }, "visionos" => { - 1 => ["Apple Vision Pro (1.0)"], + 1 => ["Apple Vision Pro (1.2)"], }, }