From 1048df0ee90b731c829f44770a1dade8cb994b33 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 13:03:38 +0100 Subject: [PATCH 01/13] WIP --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe8ce5f2..81ae212e 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 }} @@ -143,7 +143,7 @@ jobs: 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 From 8ff0bededb26f7db12ae132baba16f4fbbd1e7bc Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 13:06:54 +0100 Subject: [PATCH 02/13] WIP --- .../xcshareddata/swiftpm/Package.resolved | 9 --------- Tests/Tests.xcodeproj/project.pbxproj | 17 ----------------- 2 files changed, 26 deletions(-) diff --git a/SwiftUIIntrospect.xcworkspace/xcshareddata/swiftpm/Package.resolved b/SwiftUIIntrospect.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5d7d67f2..01642cef 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 16c817f3..98b3f7fa 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 */; From 6c2c27400303ce36f26feae1ac4d3e2ed25754a5 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 13:08:01 +0100 Subject: [PATCH 03/13] WIP --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81ae212e..a37405b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -160,6 +160,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 From 2a6dd8fd1e7072953dae245cee621cdb78818e9d Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 13:18:51 +0100 Subject: [PATCH 04/13] WIP --- .github/workflows/ci.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a37405b4..f579321b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -81,9 +81,9 @@ 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 @@ -100,9 +100,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,6 +112,10 @@ jobs: runtime: macOS 13 os: macos-13 xcode: 15.0.1 + - platform: [macOS, 14] + runtime: macOS 14 + os: macos-14 + xcode: 15.4 # FIXME: this currently hangs on CI # - platform: [visionos, 1] From 38385622021c9b21a1116a9393b5fc9ab9f293f3 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 13:21:30 +0100 Subject: [PATCH 05/13] WIP --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f579321b..34ba05c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,7 +146,7 @@ jobs: max_attempts: 3 command: sudo xcodes runtimes install '${{ matrix.runtime }}' - - if: false + - if: true name: "[Debug] List Available Runtimes, Simulators, and Destinations" run: | xcrun simctl list From 39486f1fb024e1820f8d382267568ceaadebad81 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 13:40:37 +0100 Subject: [PATCH 06/13] WIP --- .github/workflows/ci.yml | 16 ++++++++-------- fastlane/Fastfile | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34ba05c9..55d2940c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -112,10 +112,10 @@ jobs: runtime: macOS 13 os: macos-13 xcode: 15.0.1 - - platform: [macOS, 14] - runtime: macOS 14 - os: macos-14 - xcode: 15.4 + # - platform: [macOS, 14] + # runtime: macOS 14 + # os: macos-14 + # xcode: 15.4 # FIXME: this currently hangs on CI # - platform: [visionos, 1] diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 07248753..9d922194 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -6,23 +6,23 @@ 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)"], }, } From 7481c282d8993c6bfdf45d506f95483c3375d7ca Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 14:12:12 +0100 Subject: [PATCH 07/13] WIP [skip ci] --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55d2940c..d13b0d7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,8 +87,8 @@ jobs: - platform: [watchOS, 7] runtime: watchOS 7.4 - os: macos-13 - xcode: 14.3.1 + os: macos-12 + xcode: 14.2 install: true - platform: [watchOS, 8] runtime: watchOS 8.5 From efda16fbf7126d91bba1066c80b0c026c5e0dcb3 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 14:13:13 +0100 Subject: [PATCH 08/13] maybe? --- .github/workflows/ci.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d13b0d7f..684fa8a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,12 +117,10 @@ jobs: # os: macos-14 # xcode: 15.4 - # FIXME: this currently hangs on CI - # - platform: [visionos, 1] - # runtime: visionOS 1.0-beta2 - # os: macos-13 - # xcode: 15.0 - # install: true + - platform: [visionOS, 1] + runtime: visionOS 1.2 + os: macos-14 + xcode: 15.4 steps: - name: Git Checkout uses: actions/checkout@v4 @@ -135,6 +133,11 @@ 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 }} From cfac1a211ab36dc919977d22d43ce9dbe5804a02 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 16:18:57 +0100 Subject: [PATCH 09/13] WIP --- .github/workflows/ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 684fa8a1..529768aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,6 +141,10 @@ jobs: - 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 @@ -149,8 +153,7 @@ jobs: max_attempts: 3 command: sudo xcodes runtimes install '${{ matrix.runtime }}' - - if: true - name: "[Debug] List Available Runtimes, Simulators, and Destinations" + - name: "[Debug] List Available Runtimes, Simulators, and Destinations" run: | xcrun simctl list xcodebuild -scheme "SwiftUIIntrospect" -showdestinations From 5c0f83301cd1595b62de33bcdeec5473709b8c28 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 16:24:38 +0100 Subject: [PATCH 10/13] temp --- .github/workflows/ci.yml | 134 +++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 529768aa..138607de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,81 +37,81 @@ jobs: fail-fast: false matrix: include: - - platform: [iOS, 13] - runtime: iOS 13.7 - os: macos-12 - xcode: 14.2 - install: true - - platform: [iOS, 14] - runtime: iOS 14.5 - os: macos-12 - xcode: 14.2 - install: true - - platform: [iOS, 15] - runtime: iOS 15.5 - os: macos-13 - xcode: 15.0.1 - install: true - - platform: [iOS, 16] - runtime: iOS 16.4 - os: macos-13 - xcode: 14.3.1 - - platform: [iOS, 17] - runtime: iOS 17.5 - os: macos-14 - xcode: 15.4 + # - platform: [iOS, 13] + # runtime: iOS 13.7 + # os: macos-12 + # xcode: 14.2 + # install: true + # - platform: [iOS, 14] + # runtime: iOS 14.5 + # os: macos-12 + # xcode: 14.2 + # install: true + # - platform: [iOS, 15] + # runtime: iOS 15.5 + # os: macos-13 + # xcode: 15.0.1 + # install: true + # - platform: [iOS, 16] + # runtime: iOS 16.4 + # os: macos-13 + # xcode: 14.3.1 + # - platform: [iOS, 17] + # runtime: iOS 17.5 + # os: macos-14 + # xcode: 15.4 - - platform: [tvOS, 13] - runtime: tvOS 13.4 - os: macos-12 - xcode: 14.2 - install: true - - platform: [tvOS, 14] - runtime: tvOS 14.5 - os: macos-12 - xcode: 14.2 - install: true - - platform: [tvOS, 15] - runtime: tvOS 15.4 - os: macos-13 - xcode: 15.0.1 - install: true - - platform: [tvOS, 16] - runtime: tvOS 16.4 - os: macos-13 - xcode: 15.0.1 - - platform: [tvOS, 17] - runtime: tvOS 17.5 - os: macos-14 - xcode: 15.4 + # - platform: [tvOS, 13] + # runtime: tvOS 13.4 + # os: macos-12 + # xcode: 14.2 + # install: true + # - platform: [tvOS, 14] + # runtime: tvOS 14.5 + # os: macos-12 + # xcode: 14.2 + # install: true + # - platform: [tvOS, 15] + # runtime: tvOS 15.4 + # os: macos-13 + # xcode: 15.0.1 + # install: true + # - platform: [tvOS, 16] + # runtime: tvOS 16.4 + # os: macos-13 + # xcode: 15.0.1 + # - platform: [tvOS, 17] + # runtime: tvOS 17.5 + # os: macos-14 + # xcode: 15.4 - platform: [watchOS, 7] runtime: watchOS 7.4 os: macos-12 xcode: 14.2 install: true - - platform: [watchOS, 8] - runtime: watchOS 8.5 - os: macos-13 - xcode: 15.0.1 - install: true - - platform: [watchOS, 9] - runtime: watchOS 9.4 - os: macos-13 - xcode: 14.3.1 - - platform: [watchOS, 10] - runtime: watchOS 10.5 - os: macos-14 - xcode: 15.4 + # - platform: [watchOS, 8] + # runtime: watchOS 8.5 + # os: macos-13 + # xcode: 15.0.1 + # install: true + # - platform: [watchOS, 9] + # runtime: watchOS 9.4 + # os: macos-13 + # xcode: 14.3.1 + # - platform: [watchOS, 10] + # runtime: watchOS 10.5 + # os: macos-14 + # xcode: 15.4 - - platform: [macOS, 12] - runtime: macOS 12 - os: macos-12 - xcode: 14.2 - - platform: [macOS, 13] - runtime: macOS 13 - os: macos-13 - xcode: 15.0.1 + # - platform: [macOS, 12] + # runtime: macOS 12 + # os: macos-12 + # xcode: 14.2 + # - platform: [macOS, 13] + # runtime: macOS 13 + # os: macos-13 + # xcode: 15.0.1 # - platform: [macOS, 14] # runtime: macOS 14 # os: macos-14 From acc16825763dc482fce3af4d2677946d0ad052c0 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 16:30:32 +0100 Subject: [PATCH 11/13] Revert "temp" This reverts commit 5c0f83301cd1595b62de33bcdeec5473709b8c28. --- .github/workflows/ci.yml | 134 +++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 138607de..529768aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,81 +37,81 @@ jobs: fail-fast: false matrix: include: - # - platform: [iOS, 13] - # runtime: iOS 13.7 - # os: macos-12 - # xcode: 14.2 - # install: true - # - platform: [iOS, 14] - # runtime: iOS 14.5 - # os: macos-12 - # xcode: 14.2 - # install: true - # - platform: [iOS, 15] - # runtime: iOS 15.5 - # os: macos-13 - # xcode: 15.0.1 - # install: true - # - platform: [iOS, 16] - # runtime: iOS 16.4 - # os: macos-13 - # xcode: 14.3.1 - # - platform: [iOS, 17] - # runtime: iOS 17.5 - # os: macos-14 - # xcode: 15.4 + - platform: [iOS, 13] + runtime: iOS 13.7 + os: macos-12 + xcode: 14.2 + install: true + - platform: [iOS, 14] + runtime: iOS 14.5 + os: macos-12 + xcode: 14.2 + install: true + - platform: [iOS, 15] + runtime: iOS 15.5 + os: macos-13 + xcode: 15.0.1 + install: true + - platform: [iOS, 16] + runtime: iOS 16.4 + os: macos-13 + xcode: 14.3.1 + - platform: [iOS, 17] + runtime: iOS 17.5 + os: macos-14 + xcode: 15.4 - # - platform: [tvOS, 13] - # runtime: tvOS 13.4 - # os: macos-12 - # xcode: 14.2 - # install: true - # - platform: [tvOS, 14] - # runtime: tvOS 14.5 - # os: macos-12 - # xcode: 14.2 - # install: true - # - platform: [tvOS, 15] - # runtime: tvOS 15.4 - # os: macos-13 - # xcode: 15.0.1 - # install: true - # - platform: [tvOS, 16] - # runtime: tvOS 16.4 - # os: macos-13 - # xcode: 15.0.1 - # - platform: [tvOS, 17] - # runtime: tvOS 17.5 - # os: macos-14 - # xcode: 15.4 + - platform: [tvOS, 13] + runtime: tvOS 13.4 + os: macos-12 + xcode: 14.2 + install: true + - platform: [tvOS, 14] + runtime: tvOS 14.5 + os: macos-12 + xcode: 14.2 + install: true + - platform: [tvOS, 15] + runtime: tvOS 15.4 + os: macos-13 + xcode: 15.0.1 + install: true + - platform: [tvOS, 16] + runtime: tvOS 16.4 + os: macos-13 + xcode: 15.0.1 + - platform: [tvOS, 17] + runtime: tvOS 17.5 + os: macos-14 + xcode: 15.4 - platform: [watchOS, 7] runtime: watchOS 7.4 os: macos-12 xcode: 14.2 install: true - # - platform: [watchOS, 8] - # runtime: watchOS 8.5 - # os: macos-13 - # xcode: 15.0.1 - # install: true - # - platform: [watchOS, 9] - # runtime: watchOS 9.4 - # os: macos-13 - # xcode: 14.3.1 - # - platform: [watchOS, 10] - # runtime: watchOS 10.5 - # os: macos-14 - # xcode: 15.4 + - platform: [watchOS, 8] + runtime: watchOS 8.5 + os: macos-13 + xcode: 15.0.1 + install: true + - platform: [watchOS, 9] + runtime: watchOS 9.4 + os: macos-13 + xcode: 14.3.1 + - platform: [watchOS, 10] + runtime: watchOS 10.5 + os: macos-14 + xcode: 15.4 - # - platform: [macOS, 12] - # runtime: macOS 12 - # os: macos-12 - # xcode: 14.2 - # - platform: [macOS, 13] - # runtime: macOS 13 - # os: macos-13 - # xcode: 15.0.1 + - platform: [macOS, 12] + runtime: macOS 12 + os: macos-12 + xcode: 14.2 + - platform: [macOS, 13] + runtime: macOS 13 + os: macos-13 + xcode: 15.0.1 # - platform: [macOS, 14] # runtime: macOS 14 # os: macos-14 From 0f8da6b89d83ba9d7d13592ffc2b1e2816ec3ff9 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 16:34:11 +0100 Subject: [PATCH 12/13] WIP --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 529768aa..2833b531 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,10 +117,10 @@ jobs: # os: macos-14 # xcode: 15.4 - - platform: [visionOS, 1] - runtime: visionOS 1.2 - 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 From d13792602402ceac1b6508b32a0f323358deee68 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 16:46:31 +0100 Subject: [PATCH 13/13] WIP --- .github/workflows/ci.yml | 5 ----- fastlane/Fastfile | 1 - 2 files changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2833b531..5f6c1dd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,11 +85,6 @@ jobs: os: macos-14 xcode: 15.4 - - platform: [watchOS, 7] - runtime: watchOS 7.4 - os: macos-12 - xcode: 14.2 - install: true - platform: [watchOS, 8] runtime: watchOS 8.5 os: macos-13 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 9d922194..1b6032e0 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -16,7 +16,6 @@ devices = { 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.5)"],