From 0c4cdaf83d144894381976afdbb301e9aac1c93c Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Thu, 17 Aug 2023 23:12:47 +0100 Subject: [PATCH 01/36] wip --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0a3efe2..db369afe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,12 +104,11 @@ jobs: os: macos-13 xcode: 15.0 - # 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.0-beta2 + os: macos-13 + xcode: 15.0 + install: true steps: - name: Git Checkout uses: actions/checkout@v3 From f0dd855b089473d00cce1a21145b580c522cf89b Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Thu, 24 Aug 2023 12:25:35 +0100 Subject: [PATCH 02/36] wip --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db369afe..ad03c8e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,7 +108,6 @@ jobs: runtime: visionOS 1.0-beta2 os: macos-13 xcode: 15.0 - install: true steps: - name: Git Checkout uses: actions/checkout@v3 @@ -130,6 +129,10 @@ jobs: max_attempts: 3 command: sudo xcodes runtimes install '${{ matrix.runtime }}' + - if: ${{ matrix.platform[0] == 'visionos' }} + name: Install visionOS Runtime + run: xcodebuild -downloadPlatform visionOS + - if: false name: '[Debug] List Available Runtimes, Simulators, and Destinations' run: | From 2af8d5ae9f0b4949c3557908be8a68c45950f7ef Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Thu, 24 Aug 2023 12:25:40 +0100 Subject: [PATCH 03/36] temp --- .github/workflows/ci.yml | 120 +++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad03c8e2..dec751de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,66 +43,66 @@ 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-13 - xcode: 14.3.1 - install: true - - platform: [ios, 15] - runtime: iOS 15.5 - os: macos-13 - xcode: 15.0 - install: true - - platform: [ios, 16] - runtime: iOS 16.4 - os: macos-13 - xcode: 14.3.1 - - platform: [ios, 17] - runtime: iOS 17.0 - os: macos-13 - xcode: 15.0 - - - platform: [tvos, 13] - runtime: tvOS 13.4 - os: macos-12 - xcode: 14.2 - install: true - - platform: [tvos, 14] - runtime: tvOS 14.5 - os: macos-13 - xcode: 14.3.1 - install: true - - platform: [tvos, 15] - runtime: tvOS 15.4 - os: macos-13 - xcode: 15.0 - install: true - - platform: [tvos, 16] - runtime: tvOS 16.4 - os: macos-13 - xcode: 15.0 - - platform: [tvos, 17] - runtime: tvOS 17.0 - os: macos-13 - xcode: 15.0 - - - platform: [macos, 11] - runtime: macOS 11 - os: macos-11 - xcode: 13.2.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 + # - platform: [ios, 13] + # runtime: iOS 13.7 + # os: macos-12 + # xcode: 14.2 + # install: true + # - platform: [ios, 14] + # runtime: iOS 14.5 + # os: macos-13 + # xcode: 14.3.1 + # install: true + # - platform: [ios, 15] + # runtime: iOS 15.5 + # os: macos-13 + # xcode: 15.0 + # install: true + # - platform: [ios, 16] + # runtime: iOS 16.4 + # os: macos-13 + # xcode: 14.3.1 + # - platform: [ios, 17] + # runtime: iOS 17.0 + # os: macos-13 + # xcode: 15.0 + + # - platform: [tvos, 13] + # runtime: tvOS 13.4 + # os: macos-12 + # xcode: 14.2 + # install: true + # - platform: [tvos, 14] + # runtime: tvOS 14.5 + # os: macos-13 + # xcode: 14.3.1 + # install: true + # - platform: [tvos, 15] + # runtime: tvOS 15.4 + # os: macos-13 + # xcode: 15.0 + # install: true + # - platform: [tvos, 16] + # runtime: tvOS 16.4 + # os: macos-13 + # xcode: 15.0 + # - platform: [tvos, 17] + # runtime: tvOS 17.0 + # os: macos-13 + # xcode: 15.0 + + # - platform: [macos, 11] + # runtime: macOS 11 + # os: macos-11 + # xcode: 13.2.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 - platform: [visionos, 1] runtime: visionOS 1.0-beta2 From 72d8104e2625d7746a7f4f9800096c345ed0150c Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Thu, 24 Aug 2023 15:14:16 +0100 Subject: [PATCH 04/36] wip --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dec751de..6aa03cce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,10 +129,6 @@ jobs: max_attempts: 3 command: sudo xcodes runtimes install '${{ matrix.runtime }}' - - if: ${{ matrix.platform[0] == 'visionos' }} - name: Install visionOS Runtime - run: xcodebuild -downloadPlatform visionOS - - if: false name: '[Debug] List Available Runtimes, Simulators, and Destinations' run: | From 8a3771e408eb9fa8076a36faf0144cfe01cb63df Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Fri, 25 Aug 2023 00:04:28 +0100 Subject: [PATCH 05/36] wip --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6aa03cce..3f04f7fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,6 +108,7 @@ jobs: runtime: visionOS 1.0-beta2 os: macos-13 xcode: 15.0 + install: true steps: - name: Git Checkout uses: actions/checkout@v3 From 4d52b60e8576960232e2b13909f5edf6ddc9c399 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Fri, 25 Aug 2023 01:25:01 +0100 Subject: [PATCH 06/36] Revert "wip" This reverts commit 8a3771e408eb9fa8076a36faf0144cfe01cb63df. --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f04f7fe..6aa03cce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,7 +108,6 @@ jobs: runtime: visionOS 1.0-beta2 os: macos-13 xcode: 15.0 - install: true steps: - name: Git Checkout uses: actions/checkout@v3 From 2a30b8782b278ae2f3e27c8fc9ab080493510b86 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Mon, 28 Aug 2023 18:20:57 +0100 Subject: [PATCH 07/36] temp --- fastlane/Fastfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 57c0058a..03976ab9 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -104,10 +104,10 @@ lane :test do |options| configuration: configuration, scheme: scheme, devices: devices[platform][version], - prelaunch_simulator: true, + # prelaunch_simulator: true, ensure_devices_found: true, - force_quit_simulator: true, - disable_concurrent_testing: true, + # force_quit_simulator: true, + # disable_concurrent_testing: true, result_bundle: true, output_directory: Dir.pwd + "/test_output", ) From be73627e8cb2f2111f39dffa5a773c7ca8e59c97 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Mon, 28 Aug 2023 18:21:05 +0100 Subject: [PATCH 08/36] Revert "Revert "wip"" This reverts commit 4d52b60e8576960232e2b13909f5edf6ddc9c399. --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6aa03cce..3f04f7fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,6 +108,7 @@ jobs: runtime: visionOS 1.0-beta2 os: macos-13 xcode: 15.0 + install: true steps: - name: Git Checkout uses: actions/checkout@v3 From abe6f7470fdf3cd20d41387dd507125bda79a0d7 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Mon, 28 Aug 2023 18:53:19 +0100 Subject: [PATCH 09/36] Revert "temp" This reverts commit 2a30b8782b278ae2f3e27c8fc9ab080493510b86. --- fastlane/Fastfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 03976ab9..57c0058a 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -104,10 +104,10 @@ lane :test do |options| configuration: configuration, scheme: scheme, devices: devices[platform][version], - # prelaunch_simulator: true, + prelaunch_simulator: true, ensure_devices_found: true, - # force_quit_simulator: true, - # disable_concurrent_testing: true, + force_quit_simulator: true, + disable_concurrent_testing: true, result_bundle: true, output_directory: Dir.pwd + "/test_output", ) From b46f7f774b831a8cf8a060f719112624a4c5052f Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Mon, 28 Aug 2023 19:20:27 +0100 Subject: [PATCH 10/36] Revert "temp" This reverts commit 2af8d5ae9f0b4949c3557908be8a68c45950f7ef. --- .github/workflows/ci.yml | 120 +++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f04f7fe..db369afe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,66 +43,66 @@ 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-13 - # xcode: 14.3.1 - # install: true - # - platform: [ios, 15] - # runtime: iOS 15.5 - # os: macos-13 - # xcode: 15.0 - # install: true - # - platform: [ios, 16] - # runtime: iOS 16.4 - # os: macos-13 - # xcode: 14.3.1 - # - platform: [ios, 17] - # runtime: iOS 17.0 - # os: macos-13 - # xcode: 15.0 - - # - platform: [tvos, 13] - # runtime: tvOS 13.4 - # os: macos-12 - # xcode: 14.2 - # install: true - # - platform: [tvos, 14] - # runtime: tvOS 14.5 - # os: macos-13 - # xcode: 14.3.1 - # install: true - # - platform: [tvos, 15] - # runtime: tvOS 15.4 - # os: macos-13 - # xcode: 15.0 - # install: true - # - platform: [tvos, 16] - # runtime: tvOS 16.4 - # os: macos-13 - # xcode: 15.0 - # - platform: [tvos, 17] - # runtime: tvOS 17.0 - # os: macos-13 - # xcode: 15.0 - - # - platform: [macos, 11] - # runtime: macOS 11 - # os: macos-11 - # xcode: 13.2.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 + - platform: [ios, 13] + runtime: iOS 13.7 + os: macos-12 + xcode: 14.2 + install: true + - platform: [ios, 14] + runtime: iOS 14.5 + os: macos-13 + xcode: 14.3.1 + install: true + - platform: [ios, 15] + runtime: iOS 15.5 + os: macos-13 + xcode: 15.0 + install: true + - platform: [ios, 16] + runtime: iOS 16.4 + os: macos-13 + xcode: 14.3.1 + - platform: [ios, 17] + runtime: iOS 17.0 + os: macos-13 + xcode: 15.0 + + - platform: [tvos, 13] + runtime: tvOS 13.4 + os: macos-12 + xcode: 14.2 + install: true + - platform: [tvos, 14] + runtime: tvOS 14.5 + os: macos-13 + xcode: 14.3.1 + install: true + - platform: [tvos, 15] + runtime: tvOS 15.4 + os: macos-13 + xcode: 15.0 + install: true + - platform: [tvos, 16] + runtime: tvOS 16.4 + os: macos-13 + xcode: 15.0 + - platform: [tvos, 17] + runtime: tvOS 17.0 + os: macos-13 + xcode: 15.0 + + - platform: [macos, 11] + runtime: macOS 11 + os: macos-11 + xcode: 13.2.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 - platform: [visionos, 1] runtime: visionOS 1.0-beta2 From 0e7074bfe370c1751177f59ae86fdcdb51e5f11f Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Mon, 28 Aug 2023 19:20:50 +0100 Subject: [PATCH 11/36] temp --- .github/workflows/ci.yml | 61 ---------------------------------------- 1 file changed, 61 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db369afe..2905135d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,67 +43,6 @@ 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-13 - xcode: 14.3.1 - install: true - - platform: [ios, 15] - runtime: iOS 15.5 - os: macos-13 - xcode: 15.0 - install: true - - platform: [ios, 16] - runtime: iOS 16.4 - os: macos-13 - xcode: 14.3.1 - - platform: [ios, 17] - runtime: iOS 17.0 - os: macos-13 - xcode: 15.0 - - - platform: [tvos, 13] - runtime: tvOS 13.4 - os: macos-12 - xcode: 14.2 - install: true - - platform: [tvos, 14] - runtime: tvOS 14.5 - os: macos-13 - xcode: 14.3.1 - install: true - - platform: [tvos, 15] - runtime: tvOS 15.4 - os: macos-13 - xcode: 15.0 - install: true - - platform: [tvos, 16] - runtime: tvOS 16.4 - os: macos-13 - xcode: 15.0 - - platform: [tvos, 17] - runtime: tvOS 17.0 - os: macos-13 - xcode: 15.0 - - - platform: [macos, 11] - runtime: macOS 11 - os: macos-11 - xcode: 13.2.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 - - platform: [visionos, 1] runtime: visionOS 1.0-beta2 os: macos-13 From d7767755100b1c6d118fb73614959a2d0a4b0b56 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sat, 2 Sep 2023 11:46:35 +0100 Subject: [PATCH 12/36] wip --- Tests/Tests/TestUtils.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Tests/TestUtils.swift b/Tests/Tests/TestUtils.swift index 087247f9..716f4ef5 100644 --- a/Tests/Tests/TestUtils.swift +++ b/Tests/Tests/TestUtils.swift @@ -3,7 +3,7 @@ import XCTest #if canImport(UIKit) enum TestUtils { - #if targetEnvironment(macCatalyst) + #if targetEnvironment(macCatalyst) || os(visionOS) static let window = UIWindow(frame: CGRect(x: 0, y: 0, width: 480, height: 300)) #else static let window = UIWindow(frame: UIScreen.main.bounds) From d40a01476619ec5ba7c8bbe3f547df7d1d2857be Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Mon, 4 Sep 2023 14:55:26 +0100 Subject: [PATCH 13/36] 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 d41d6cdb..c724d511 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: matrix: include: - platform: [visionOS, 1] - runtime: visionOS 1.0-beta2 + runtime: visionOS 1.0-beta3 os: macos-13 xcode: 15.0 install: true From 273b5500315d54cd14ebf45e04032eed51589279 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Wed, 4 Oct 2023 18:01:53 +0100 Subject: [PATCH 14/36] 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 f73fc672..8c48fba2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,9 +38,9 @@ jobs: matrix: include: - platform: [visionOS, 1] - runtime: visionOS 1.0-beta3 + runtime: visionOS 1.0-beta4 os: macos-13 - xcode: 15.0 + xcode: 15.1 install: true steps: - name: Git Checkout From 4061ec218417e5206c5a6f3a75eabbb62faa4469 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Fri, 27 Oct 2023 00:47:53 +0100 Subject: [PATCH 15/36] 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 8c48fba2..491b2f55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: - platform: [visionOS, 1] runtime: visionOS 1.0-beta4 os: macos-13 - xcode: 15.1 + xcode: 15.0.1 install: true steps: - name: Git Checkout From 172ee57ef84a601ddc92ebae7694dc8e3f55da29 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Fri, 27 Oct 2023 01:08:37 +0100 Subject: [PATCH 16/36] wip --- .github/workflows/ci.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 491b2f55..d56fd49f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,8 @@ jobs: - platform: [visionOS, 1] runtime: visionOS 1.0-beta4 os: macos-13 - xcode: 15.0.1 + xcode: 15.1 Beta 2 + install_xcode: true install: true steps: - name: Git Checkout @@ -54,7 +55,16 @@ jobs: - name: Set environment variables run: echo "SKIP_SLOW_FASTLANE_WARNING=1" >> $GITHUB_ENV - - name: Select Xcode version + - if: ${{ matrix.install_xcode }} + name: Install Required Xcode + uses: nick-fields/retry@v2 + with: + timeout_minutes: 20 + max_attempts: 2 + command: sudo xcodes install '${{ matrix.xcode }}' + + - if: ${{ !matrix.install_xcode }} + name: Select Xcode version run: sudo xcodes select ${{ matrix.xcode }} - if: ${{ matrix.install }} From a0e616ff76c99e424b44d3e3403b4e877e1dc953 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Fri, 27 Oct 2023 01:08:55 +0100 Subject: [PATCH 17/36] temp --- .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 d56fd49f..607449fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,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 5f1cd4255cedeee5abf844c950787cb1a32e3642 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Fri, 27 Oct 2023 01:21:13 +0100 Subject: [PATCH 18/36] 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 607449fa..3dd617f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,7 +61,7 @@ jobs: with: timeout_minutes: 20 max_attempts: 2 - command: sudo xcodes install '${{ matrix.xcode }}' + command: sudo xcodes install '${{ matrix.xcode }}' --select - if: ${{ !matrix.install_xcode }} name: Select Xcode version From 23ad63eb6e4e4b9c0e7a1c11e7b4bdb80b9243af Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Fri, 27 Oct 2023 01:28:43 +0100 Subject: [PATCH 19/36] 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 3dd617f0..92930daa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: name: Install Required Xcode uses: nick-fields/retry@v2 with: - timeout_minutes: 20 + timeout_minutes: 30 max_attempts: 2 command: sudo xcodes install '${{ matrix.xcode }}' --select From ef6c02414cc2f5396a00a385730c3167b108875a Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Fri, 27 Oct 2023 01:33:02 +0100 Subject: [PATCH 20/36] 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 92930daa..b9e5fd13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: name: Install Required Xcode uses: nick-fields/retry@v2 with: - timeout_minutes: 30 + timeout_minutes: 60 max_attempts: 2 command: sudo xcodes install '${{ matrix.xcode }}' --select From f4f5741243a7b133ae388a4bf915bebbdf0b1ae1 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Fri, 27 Oct 2023 03:04:14 +0100 Subject: [PATCH 21/36] wip --- .github/workflows/ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9e5fd13..bf5036a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,11 +57,7 @@ jobs: - if: ${{ matrix.install_xcode }} name: Install Required Xcode - uses: nick-fields/retry@v2 - with: - timeout_minutes: 60 - max_attempts: 2 - command: sudo xcodes install '${{ matrix.xcode }}' --select + run: sudo xcodes install '${{ matrix.xcode }}' --select - if: ${{ !matrix.install_xcode }} name: Select Xcode version From cdede9c9aa0a78703626166a3c7360caf9d42feb Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Fri, 27 Oct 2023 03:24:37 +0100 Subject: [PATCH 22/36] wip --- .github/workflows/ci.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf5036a1..728209b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,8 +40,7 @@ jobs: - platform: [visionOS, 1] runtime: visionOS 1.0-beta4 os: macos-13 - xcode: 15.1 Beta 2 - install_xcode: true + xcode: 15.1 install: true steps: - name: Git Checkout @@ -55,12 +54,7 @@ jobs: - name: Set environment variables run: echo "SKIP_SLOW_FASTLANE_WARNING=1" >> $GITHUB_ENV - - if: ${{ matrix.install_xcode }} - name: Install Required Xcode - run: sudo xcodes install '${{ matrix.xcode }}' --select - - - if: ${{ !matrix.install_xcode }} - name: Select Xcode version + - name: Select Xcode version run: sudo xcodes select ${{ matrix.xcode }} - if: ${{ matrix.install }} From edbe8ec9f9706b3028f19e9e4559a38977fa4bfe Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Sun, 21 Jan 2024 16:43:50 +0100 Subject: [PATCH 23/36] WIP --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 728209b3..515d28ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,9 +38,9 @@ jobs: matrix: include: - platform: [visionOS, 1] - runtime: visionOS 1.0-beta4 + runtime: visionOS 1.0 os: macos-13 - xcode: 15.1 + xcode: 15.2 install: true steps: - name: Git Checkout @@ -54,6 +54,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 1017b94ebf76cf1d4d006538b0907837152a7148 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Fri, 2 Feb 2024 12:24:39 +0000 Subject: [PATCH 24/36] use macos 14 github runner --- .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 591455fb..620939ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: include: - platform: [visionOS, 1] runtime: visionOS 1.0 - os: macos-13 + os: macos-14 xcode: 15.2 install: true steps: From 902627b4806261b2c51b443ca232928513a96083 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Fri, 2 Feb 2024 12:32:48 +0000 Subject: [PATCH 25/36] do not install visionOS --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 620939ea..89a74373 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,6 @@ jobs: runtime: visionOS 1.0 os: macos-14 xcode: 15.2 - install: true steps: - name: Git Checkout uses: actions/checkout@v4 From b426d32fadd06175d2f0dc1bfb7ea68f65684ec9 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 17:27:27 +0100 Subject: [PATCH 26/36] WIP --- .github/workflows/ci.yml | 140 +++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2bdc638f..125e5349 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,76 +45,76 @@ 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: [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, 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: [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: [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, 14] # runtime: macOS 14 # os: macos-14 From 284aa714f35fc6d6a1659611ea647cc1d2124824 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Tue, 7 May 2024 17:27:33 +0100 Subject: [PATCH 27/36] Revert "WIP" This reverts commit b426d32fadd06175d2f0dc1bfb7ea68f65684ec9. --- .github/workflows/ci.yml | 140 +++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 125e5349..2bdc638f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,76 +45,76 @@ 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: [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, 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: [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: [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, 14] # runtime: macOS 14 # os: macos-14 From 22acf4d247be63bafa429a41e6c90381bd5ecb31 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Wed, 17 Jul 2024 11:42:18 +0100 Subject: [PATCH 28/36] 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 1c43b4d1..30b8bd7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,10 +132,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 cf75e4321fbc63da8abbc50bd9e1f47d971cda00 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Wed, 17 Jul 2024 11:42:23 +0100 Subject: [PATCH 29/36] temp --- .github/workflows/ci.yml | 164 +++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30b8bd7a..03f5666b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,88 +45,88 @@ 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, 18] - runtime: iOS 18.0 - os: macos-14 - xcode: 16.0 - - - 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, 18] - runtime: tvOS 18.0 - os: macos-14 - xcode: 16.0 - - - 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, 11] - runtime: watchOS 11.0 - os: macos-14 - xcode: 16.0 - - - 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: [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, 18] + # runtime: iOS 18.0 + # os: macos-14 + # xcode: 16.0 + + # - 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, 18] + # runtime: tvOS 18.0 + # os: macos-14 + # xcode: 16.0 + + # - 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, 11] + # runtime: watchOS 11.0 + # os: macos-14 + # xcode: 16.0 + + # - 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 0cc4d31d680850f45b5763b01de5af212dfa5b61 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Wed, 17 Jul 2024 11:43:35 +0100 Subject: [PATCH 30/36] WIP --- .github/workflows/ci.yml | 4 ++++ fastlane/Fastfile | 1 + 2 files changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03f5666b..28324f7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -136,6 +136,10 @@ jobs: runtime: visionOS 1.2 os: macos-14 xcode: 15.4 + - platform: [visionOS, 2] + runtime: visionOS 2.0 + os: macos-14 + xcode: 16.0 steps: - name: Git Checkout uses: actions/checkout@v4 diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 776dd8f6..3df919f1 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -25,6 +25,7 @@ devices = { }, "visionos" => { 1 => ["Apple Vision Pro (1.2)"], + 2 => ["Apple Vision Pro (2.0)"], }, } From 3ab9ea02b5ebe300042b0026022dd30400605c74 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Wed, 17 Jul 2024 12:07:49 +0100 Subject: [PATCH 31/36] WIP --- Examples/Showcase/Showcase/AppView.swift | 38 +++++++++---------- README.md | 4 ++ Sources/ViewTypes/ColorPicker.swift | 3 +- Sources/ViewTypes/SignInWithAppleButton.swift | 2 +- Tests/Tests/ViewTypes/ColorPickerTests.swift | 6 +-- Tests/Tests/ViewTypes/DatePickerTests.swift | 6 +-- ...DatePickerWithCompactFieldStyleTests.swift | 6 +-- .../DatePickerWithGraphicalStyleTests.swift | 6 +-- .../DatePickerWithWheelStyleTests.swift | 6 +-- Tests/Tests/ViewTypes/FormTests.swift | 4 +- .../ViewTypes/FormWithGroupedStyleTests.swift | 4 +- .../ViewTypes/FullScreenCoverTests.swift | 2 +- Tests/Tests/ViewTypes/ListCellTests.swift | 4 +- Tests/Tests/ViewTypes/ListTests.swift | 12 +++--- .../ViewTypes/ListWithGroupedStyleTests.swift | 4 +- .../ListWithInsetGroupedStyleTests.swift | 4 +- .../ViewTypes/ListWithInsetStyleTests.swift | 4 +- .../ViewTypes/ListWithPlainStyleTests.swift | 4 +- .../ViewTypes/ListWithSidebarStyleTests.swift | 4 +- Tests/Tests/ViewTypes/MapTests.swift | 6 +-- .../ViewTypes/NavigationSplitViewTests.swift | 4 +- .../ViewTypes/NavigationStackTests.swift | 4 +- .../NavigationViewWithColumnsStyleTests.swift | 4 +- .../NavigationViewWithStackStyleTests.swift | 4 +- Tests/Tests/ViewTypes/PageControlTests.swift | 2 +- .../PickerWithSegmentedStyleTests.swift | 6 +-- .../ViewTypes/PickerWithWheelStyleTests.swift | 6 +-- Tests/Tests/ViewTypes/PopoverTests.swift | 2 +- .../ProgressViewWithCircularStyleTests.swift | 6 +-- .../ProgressViewWithLinearStyleTests.swift | 6 +-- Tests/Tests/ViewTypes/ScrollViewTests.swift | 12 +++--- Tests/Tests/ViewTypes/SearchFieldTests.swift | 8 ++-- Tests/Tests/ViewTypes/SecureFieldTests.swift | 12 +++--- Tests/Tests/ViewTypes/SheetTests.swift | 2 +- .../ViewTypes/TabViewWithPageStyleTests.swift | 4 +- Tests/Tests/ViewTypes/TableTests.swift | 12 +++--- Tests/Tests/ViewTypes/TextEditorTests.swift | 6 +-- Tests/Tests/ViewTypes/TextFieldTests.swift | 12 +++--- .../TextFieldWithVerticalAxisTests.swift | 6 +-- Tests/Tests/ViewTypes/VideoPlayerTests.swift | 6 +-- .../Tests/ViewTypes/ViewControllerTests.swift | 6 +-- Tests/Tests/ViewTypes/ViewTests.swift | 6 +-- Tests/Tests/ViewTypes/WindowTests.swift | 6 +-- 43 files changed, 138 insertions(+), 133 deletions(-) diff --git a/Examples/Showcase/Showcase/AppView.swift b/Examples/Showcase/Showcase/AppView.swift index 7ac408f6..d711fc3b 100644 --- a/Examples/Showcase/Showcase/AppView.swift +++ b/Examples/Showcase/Showcase/AppView.swift @@ -7,7 +7,7 @@ struct AppView: View { #if os(iOS) || os(tvOS) || os(visionOS) .introspect( .window, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { window in window.backgroundColor = .brown } @@ -87,7 +87,7 @@ struct ListShowcase: View { tableView.backgroundView = UIView() tableView.backgroundColor = .cyan } - .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { collectionView in + .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { collectionView in collectionView.backgroundView = UIView() collectionView.subviews.dropFirst(1).first?.backgroundColor = .cyan } @@ -112,7 +112,7 @@ struct ListShowcase: View { tableView.backgroundView = UIView() tableView.backgroundColor = .cyan } - .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1), scope: .ancestor) { collectionView in + .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor) { collectionView in collectionView.backgroundView = UIView() collectionView.subviews.dropFirst(1).first?.backgroundColor = .cyan } @@ -150,7 +150,7 @@ struct ScrollViewShowcase: View { #if os(iOS) || os(tvOS) || os(visionOS) .introspect( .scrollView, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { scrollView in scrollView.layer.backgroundColor = UIColor.cyan.cgColor } @@ -171,7 +171,7 @@ struct ScrollViewShowcase: View { #if os(iOS) || os(tvOS) || os(visionOS) .introspect( .scrollView, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor ) { scrollView in scrollView.layer.backgroundColor = UIColor.cyan.cgColor @@ -207,13 +207,13 @@ struct NavigationShowcase: View { #if os(iOS) || os(tvOS) || os(visionOS) .introspect( .navigationView(style: .stack), - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { navigationController in navigationController.navigationBar.backgroundColor = .cyan } .introspect( .navigationView(style: .columns), - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { splitViewController in #if os(visionOS) splitViewController.preferredDisplayMode = .oneBesideSecondary @@ -226,7 +226,7 @@ struct NavigationShowcase: View { } .introspect( .searchField, - on: .iOS(.v15, .v16, .v17, .v18), .tvOS(.v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v15, .v16, .v17, .v18), .tvOS(.v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { searchBar in searchBar.backgroundColor = .red #if os(iOS) @@ -256,7 +256,7 @@ struct PresentationShowcase: View { presentationController.containerView?.backgroundColor = .red.withAlphaComponent(0.75) } #elseif os(visionOS) - .introspect(.sheet, on: .visionOS(.v1)) { sheetPresentationController in + .introspect(.sheet, on: .visionOS(.v1, .v2)) { sheetPresentationController in sheetPresentationController.containerView?.backgroundColor = .red.withAlphaComponent(0.75) } #endif @@ -269,7 +269,7 @@ struct PresentationShowcase: View { #if os(iOS) || os(tvOS) || os(visionOS) .introspect( .fullScreenCover, - on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { presentationController in presentationController.containerView?.backgroundColor = .red.withAlphaComponent(0.75) } @@ -284,7 +284,7 @@ struct PresentationShowcase: View { .padding() .introspect( .popover, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { presentationController in presentationController.containerView?.backgroundColor = .red.withAlphaComponent(0.75) } @@ -305,7 +305,7 @@ struct GenericViewShowcase: View { #if os(iOS) || os(tvOS) || os(visionOS) .introspect( .view, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { view in view.backgroundColor = .cyan } @@ -320,7 +320,7 @@ struct GenericViewShowcase: View { #if os(iOS) || os(tvOS) || os(visionOS) .introspect( .view, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { view in view.backgroundColor = .lightGray } @@ -334,7 +334,7 @@ struct GenericViewShowcase: View { #if os(iOS) || os(tvOS) || os(visionOS) .introspect( .view, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { view in view.backgroundColor = .blue } @@ -348,7 +348,7 @@ struct GenericViewShowcase: View { #if os(iOS) || os(tvOS) || os(visionOS) .introspect( .view, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { view in view.backgroundColor = .red } @@ -375,7 +375,7 @@ struct SimpleElementsShowcase: View { #if os(iOS) || os(tvOS) || os(visionOS) .introspect( .textField, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { textField in textField.backgroundColor = .red } @@ -390,7 +390,7 @@ struct SimpleElementsShowcase: View { #if os(iOS) || os(tvOS) || os(visionOS) .introspect( .textField, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { textField in textField.backgroundColor = .green } @@ -491,7 +491,7 @@ struct SimpleElementsShowcase: View { Text("DatePicker Red") } #if os(iOS) || os(visionOS) - .introspect(.datePicker, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1)) { datePicker in + .introspect(.datePicker, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2)) { datePicker in datePicker.backgroundColor = .red } #elseif os(macOS) @@ -512,7 +512,7 @@ struct SimpleElementsShowcase: View { #if os(iOS) || os(tvOS) || os(visionOS) .introspect( .picker(style: .segmented), - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1) + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2) ) { datePicker in datePicker.backgroundColor = .red } diff --git a/README.md b/README.md index b9bbb26e..a968c04c 100644 --- a/README.md +++ b/README.md @@ -223,6 +223,7 @@ extension iOSViewVersion { public static let v15 = Self(for: .v15) public static let v16 = Self(for: .v16) public static let v17 = Self(for: .v17) + public static let v18 = Self(for: .v18) } extension tvOSViewVersion { @@ -231,10 +232,12 @@ extension tvOSViewVersion { public static let v15 = Self(for: .v15) public static let v16 = Self(for: .v16) public static let v17 = Self(for: .v17) + public static let v18 = Self(for: .v18) } extension visionOSViewVersion { public static let v1 = Self(for: .v1) + public static let v2 = Self(for: .v2) } #elseif canImport(AppKit) extension macOSViewVersion { @@ -243,6 +246,7 @@ extension macOSViewVersion { public static let v12 = Self(for: .v12) public static let v13 = Self(for: .v13) public static let v14 = Self(for: .v14) + public static let v15 = Self(for: .v15) } #endif ``` diff --git a/Sources/ViewTypes/ColorPicker.swift b/Sources/ViewTypes/ColorPicker.swift index 3aa7f8dd..e8b7ceb9 100644 --- a/Sources/ViewTypes/ColorPicker.swift +++ b/Sources/ViewTypes/ColorPicker.swift @@ -45,7 +45,7 @@ import SwiftUI /// /// var body: some View { /// ColorPicker("Pick a color", selection: $color) -/// .introspect(.colorPicker, on: .visionOS(.v1)) { +/// .introspect(.colorPicker, on: .visionOS(.v1, .v2)) { /// print(type(of: $0)) // UIColorPicker /// } /// } @@ -73,6 +73,7 @@ extension iOSViewVersion { @available(iOS 14, *) extension visionOSViewVersion { public static let v1 = Self(for: .v1) + public static let v2 = Self(for: .v2) } #elseif canImport(AppKit) @available(macOS 11, *) diff --git a/Sources/ViewTypes/SignInWithAppleButton.swift b/Sources/ViewTypes/SignInWithAppleButton.swift index f28d3249..07f2d001 100644 --- a/Sources/ViewTypes/SignInWithAppleButton.swift +++ b/Sources/ViewTypes/SignInWithAppleButton.swift @@ -64,7 +64,7 @@ import SwiftUI /// } onCompletion: { result in /// // do something with result /// } -/// .introspect(.signInWithAppleButton, on: .visionOS(.v1)) { +/// .introspect(.signInWithAppleButton, on: .visionOS(.v1, .v2)) { /// print(type(of: $0)) // ASAuthorizationAppleIDButton /// } /// } diff --git a/Tests/Tests/ViewTypes/ColorPickerTests.swift b/Tests/Tests/ViewTypes/ColorPickerTests.swift index d80b48ac..e3edcab8 100644 --- a/Tests/Tests/ViewTypes/ColorPickerTests.swift +++ b/Tests/Tests/ViewTypes/ColorPickerTests.swift @@ -27,21 +27,21 @@ final class ColorPickerTests: XCTestCase { VStack { ColorPicker("", selection: .constant(PlatformColor.red.cgColor)) #if os(iOS) || os(visionOS) - .introspect(.colorPicker, on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.colorPicker, on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.colorPicker, on: .macOS(.v11, .v12, .v13, .v14), customize: spy0) #endif ColorPicker("", selection: .constant(PlatformColor.green.cgColor)) #if os(iOS) || os(visionOS) - .introspect(.colorPicker, on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.colorPicker, on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.colorPicker, on: .macOS(.v11, .v12, .v13, .v14), customize: spy1) #endif ColorPicker("", selection: .constant(PlatformColor.blue.cgColor)) #if os(iOS) || os(visionOS) - .introspect(.colorPicker, on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.colorPicker, on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.colorPicker, on: .macOS(.v11, .v12, .v13, .v14), customize: spy2) #endif diff --git a/Tests/Tests/ViewTypes/DatePickerTests.swift b/Tests/Tests/ViewTypes/DatePickerTests.swift index 6b7a3147..7a1c3d42 100644 --- a/Tests/Tests/ViewTypes/DatePickerTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerTests.swift @@ -24,7 +24,7 @@ final class DatePickerTests: XCTestCase { VStack { DatePicker("", selection: .constant(date0)) #if os(iOS) || os(visionOS) - .introspect(.datePicker, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.datePicker, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.datePicker, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy0) #endif @@ -32,7 +32,7 @@ final class DatePickerTests: XCTestCase { DatePicker("", selection: .constant(date1)) #if os(iOS) || os(visionOS) - .introspect(.datePicker, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.datePicker, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.datePicker, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy1) #endif @@ -40,7 +40,7 @@ final class DatePickerTests: XCTestCase { DatePicker("", selection: .constant(date2)) #if os(iOS) || os(visionOS) - .introspect(.datePicker, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.datePicker, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.datePicker, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy2) #endif diff --git a/Tests/Tests/ViewTypes/DatePickerWithCompactFieldStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithCompactFieldStyleTests.swift index bf2dd657..21259927 100644 --- a/Tests/Tests/ViewTypes/DatePickerWithCompactFieldStyleTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerWithCompactFieldStyleTests.swift @@ -30,7 +30,7 @@ final class DatePickerWithCompactStyleTests: XCTestCase { DatePicker("", selection: .constant(date0)) .datePickerStyle(.compact) #if os(iOS) || os(visionOS) - .introspect(.datePicker(style: .compact), on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.datePicker(style: .compact), on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.datePicker(style: .compact), on: .macOS(.v10_15_4, .v11, .v12, .v13, .v14), customize: spy0) #endif @@ -39,7 +39,7 @@ final class DatePickerWithCompactStyleTests: XCTestCase { DatePicker("", selection: .constant(date1)) .datePickerStyle(.compact) #if os(iOS) || os(visionOS) - .introspect(.datePicker(style: .compact), on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.datePicker(style: .compact), on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.datePicker(style: .compact), on: .macOS(.v10_15_4, .v11, .v12, .v13, .v14), customize: spy1) #endif @@ -48,7 +48,7 @@ final class DatePickerWithCompactStyleTests: XCTestCase { DatePicker("", selection: .constant(date2)) .datePickerStyle(.compact) #if os(iOS) || os(visionOS) - .introspect(.datePicker(style: .compact), on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.datePicker(style: .compact), on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.datePicker(style: .compact), on: .macOS(.v10_15_4, .v11, .v12, .v13, .v14), customize: spy2) #endif diff --git a/Tests/Tests/ViewTypes/DatePickerWithGraphicalStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithGraphicalStyleTests.swift index 74cc2dc4..e9d32ccc 100644 --- a/Tests/Tests/ViewTypes/DatePickerWithGraphicalStyleTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerWithGraphicalStyleTests.swift @@ -30,7 +30,7 @@ final class DatePickerWithGraphicalStyleTests: XCTestCase { DatePicker("", selection: .constant(date0)) .datePickerStyle(.graphical) #if os(iOS) || os(visionOS) - .introspect(.datePicker(style: .graphical), on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.datePicker(style: .graphical), on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.datePicker(style: .graphical), on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy0) #endif @@ -39,7 +39,7 @@ final class DatePickerWithGraphicalStyleTests: XCTestCase { DatePicker("", selection: .constant(date1)) .datePickerStyle(.graphical) #if os(iOS) || os(visionOS) - .introspect(.datePicker(style: .graphical), on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.datePicker(style: .graphical), on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.datePicker(style: .graphical), on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy1) #endif @@ -48,7 +48,7 @@ final class DatePickerWithGraphicalStyleTests: XCTestCase { DatePicker("", selection: .constant(date2)) .datePickerStyle(.graphical) #if os(iOS) || os(visionOS) - .introspect(.datePicker(style: .graphical), on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.datePicker(style: .graphical), on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.datePicker(style: .graphical), on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy2) #endif diff --git a/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift b/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift index d0a86f5c..6fc8a7be 100644 --- a/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift +++ b/Tests/Tests/ViewTypes/DatePickerWithWheelStyleTests.swift @@ -23,21 +23,21 @@ final class DatePickerWithWheelStyleTests: XCTestCase { DatePicker("", selection: .constant(date0)) .datePickerStyle(.wheel) #if os(iOS) || os(visionOS) - .introspect(.datePicker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.datePicker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #endif .cornerRadius(8) DatePicker("", selection: .constant(date1)) .datePickerStyle(.wheel) #if os(iOS) || os(visionOS) - .introspect(.datePicker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.datePicker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #endif .cornerRadius(8) DatePicker("", selection: .constant(date2)) .datePickerStyle(.wheel) #if os(iOS) || os(visionOS) - .introspect(.datePicker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.datePicker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #endif } } extraAssertions: { diff --git a/Tests/Tests/ViewTypes/FormTests.swift b/Tests/Tests/ViewTypes/FormTests.swift index f4580949..dd99a535 100644 --- a/Tests/Tests/ViewTypes/FormTests.swift +++ b/Tests/Tests/ViewTypes/FormTests.swift @@ -22,14 +22,14 @@ final class FormTests: XCTestCase { } #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.form, on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18)) { spy0($0) } - .introspect(.form, on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { spy0($0) } + .introspect(.form, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { spy0($0) } #endif Form { Text("Item 1") #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.form, on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), scope: .ancestor) { spy1($0) } - .introspect(.form, on: .iOS(.v16, .v17, .v18), .visionOS(.v1), scope: .ancestor) { spy1($0) } + .introspect(.form, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor) { spy1($0) } #endif } } diff --git a/Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift b/Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift index 53c1ec36..f04889fc 100644 --- a/Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift +++ b/Tests/Tests/ViewTypes/FormWithGroupedStyleTests.swift @@ -26,7 +26,7 @@ final class FormWithGroupedStyleTests: XCTestCase { } .formStyle(.grouped) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.form(style: .grouped), on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { spy0($0) } + .introspect(.form(style: .grouped), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { spy0($0) } .introspect(.form(style: .grouped), on: .tvOS(.v16, .v17, .v18)) { spy0($0) } #elseif os(macOS) .introspect(.form(style: .grouped), on: .macOS(.v13, .v14)) { spy0($0) } @@ -35,7 +35,7 @@ final class FormWithGroupedStyleTests: XCTestCase { Form { Text("Item 1") #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.form(style: .grouped), on: .iOS(.v16, .v17, .v18), .visionOS(.v1), scope: .ancestor) { spy1($0) } + .introspect(.form(style: .grouped), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor) { spy1($0) } .introspect(.form(style: .grouped), on: .tvOS(.v16, .v17, .v18), scope: .ancestor) { spy1($0) } #elseif os(macOS) .introspect(.form(style: .grouped), on: .macOS(.v13, .v14), scope: .ancestor) { spy1($0) } diff --git a/Tests/Tests/ViewTypes/FullScreenCoverTests.swift b/Tests/Tests/ViewTypes/FullScreenCoverTests.swift index 92aabcea..b386da0e 100644 --- a/Tests/Tests/ViewTypes/FullScreenCoverTests.swift +++ b/Tests/Tests/ViewTypes/FullScreenCoverTests.swift @@ -20,7 +20,7 @@ final class FullScreenCoverTests: XCTestCase { #if os(iOS) || os(tvOS) || os(visionOS) .introspect( .fullScreenCover, - on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), + on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0 ) #endif diff --git a/Tests/Tests/ViewTypes/ListCellTests.swift b/Tests/Tests/ViewTypes/ListCellTests.swift index d6167827..c546f023 100644 --- a/Tests/Tests/ViewTypes/ListCellTests.swift +++ b/Tests/Tests/ViewTypes/ListCellTests.swift @@ -18,7 +18,7 @@ final class ListCellTests: XCTestCase { Text("Item 1") #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.listCell, on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18)) { spy($0) } - .introspect(.listCell, on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { spy($0) } + .introspect(.listCell, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { spy($0) } #elseif os(macOS) .introspect(.listCell, on: .macOS(.v10_15, .v11, .v12, .v13, .v14)) { spy($0) } #endif @@ -34,7 +34,7 @@ final class ListCellTests: XCTestCase { Text("Item 1") #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.listCell, on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18)) { spy($0) } - .introspect(.listCell, on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { spy($0) } + .introspect(.listCell, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { spy($0) } #elseif os(macOS) .introspect(.listCell, on: .macOS(.v10_15, .v11, .v12, .v13, .v14)) { spy($0) } #endif diff --git a/Tests/Tests/ViewTypes/ListTests.swift b/Tests/Tests/ViewTypes/ListTests.swift index 2867fc57..d3b5e6f2 100644 --- a/Tests/Tests/ViewTypes/ListTests.swift +++ b/Tests/Tests/ViewTypes/ListTests.swift @@ -21,7 +21,7 @@ final class ListTests: XCTestCase { } #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.list, on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18)) { spy0($0) } - .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { spy0($0) } + .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { spy0($0) } #elseif os(macOS) .introspect(.list, on: .macOS(.v10_15, .v11, .v12, .v13, .v14)) { spy0($0) } #endif @@ -30,7 +30,7 @@ final class ListTests: XCTestCase { Text("Item 1") #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.list, on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), scope: .ancestor) { spy1($0) } - .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1), scope: .ancestor) { spy1($0) } + .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor) { spy1($0) } #elseif os(macOS) .introspect(.list, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), scope: .ancestor) { spy1($0) } #endif @@ -55,12 +55,12 @@ final class ListTests: XCTestCase { } #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.list, on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18)) { spy1($0) } - .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { spy1($0) } + .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { spy1($0) } #endif } #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.list, on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18)) { spy0($0) } - .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { spy0($0) } + .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { spy0($0) } #endif } extraAssertions: { XCTAssert($0[safe: 0] !== $0[safe: 1]) @@ -79,7 +79,7 @@ final class ListTests: XCTestCase { } #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.list, on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18)) { spy0($0) } - .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { spy0($0) } + .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { spy0($0) } #elseif os(macOS) .introspect(.list, on: .macOS(.v10_15, .v11, .v12, .v13, .v14)) { spy0($0) } #endif @@ -91,7 +91,7 @@ final class ListTests: XCTestCase { Text("Item 1") #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.list, on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), scope: .ancestor) { spy1($0) } - .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1), scope: .ancestor) { spy1($0) } + .introspect(.list, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor) { spy1($0) } #elseif os(macOS) .introspect(.list, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), scope: .ancestor) { spy1($0) } #endif diff --git a/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift b/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift index 0298705b..a412deb8 100644 --- a/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithGroupedStyleTests.swift @@ -21,14 +21,14 @@ final class ListWithGroupedStyleTests: XCTestCase { .listStyle(.grouped) #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.list(style: .grouped), on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18)) { spy0($0) } - .introspect(.list(style: .grouped), on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { spy0($0) } + .introspect(.list(style: .grouped), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { spy0($0) } #endif List { Text("Item 1") #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.list(style: .grouped), on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), scope: .ancestor) { spy1($0) } - .introspect(.list(style: .grouped), on: .iOS(.v16, .v17, .v18), .visionOS(.v1), scope: .ancestor) { spy1($0) } + .introspect(.list(style: .grouped), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor) { spy1($0) } #endif } .listStyle(.grouped) diff --git a/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift b/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift index e20d6c58..0afebe89 100644 --- a/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithInsetGroupedStyleTests.swift @@ -26,14 +26,14 @@ final class ListWithInsetGroupedStyleTests: XCTestCase { .listStyle(.insetGrouped) #if os(iOS) || os(visionOS) .introspect(.list(style: .insetGrouped), on: .iOS(.v14, .v15)) { spy0($0) } - .introspect(.list(style: .insetGrouped), on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { spy0($0) } + .introspect(.list(style: .insetGrouped), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { spy0($0) } #endif List { Text("Item 1") #if os(iOS) || os(visionOS) .introspect(.list(style: .insetGrouped), on: .iOS(.v14, .v15), scope: .ancestor) { spy1($0) } - .introspect(.list(style: .insetGrouped), on: .iOS(.v16, .v17, .v18), .visionOS(.v1), scope: .ancestor) { spy1($0) } + .introspect(.list(style: .insetGrouped), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor) { spy1($0) } #endif } .listStyle(.insetGrouped) diff --git a/Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift b/Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift index e38193ca..95678193 100644 --- a/Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithInsetStyleTests.swift @@ -28,7 +28,7 @@ final class ListWithInsetStyleTests: XCTestCase { .listStyle(.inset) #if os(iOS) || os(visionOS) .introspect(.list(style: .inset), on: .iOS(.v14, .v15)) { spy0($0) } - .introspect(.list(style: .inset), on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { spy0($0) } + .introspect(.list(style: .inset), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { spy0($0) } #elseif os(macOS) .introspect(.list(style: .inset), on: .macOS(.v11, .v12, .v13, .v14)) { spy0($0) } #endif @@ -37,7 +37,7 @@ final class ListWithInsetStyleTests: XCTestCase { Text("Item 1") #if os(iOS) || os(visionOS) .introspect(.list(style: .inset), on: .iOS(.v14, .v15), scope: .ancestor) { spy1($0) } - .introspect(.list(style: .inset), on: .iOS(.v16, .v17, .v18), .visionOS(.v1), scope: .ancestor) { spy1($0) } + .introspect(.list(style: .inset), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor) { spy1($0) } #elseif os(macOS) .introspect(.list(style: .inset), on: .macOS(.v11, .v12, .v13, .v14), scope: .ancestor) { spy1($0) } #endif diff --git a/Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift b/Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift index b038f96d..6181bce2 100644 --- a/Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithPlainStyleTests.swift @@ -22,7 +22,7 @@ final class ListWithPlainStyleTests: XCTestCase { .listStyle(.plain) #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.list(style: .plain), on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18)) { spy0($0) } - .introspect(.list(style: .plain), on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { spy0($0) } + .introspect(.list(style: .plain), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { spy0($0) } #elseif os(macOS) .introspect(.list(style: .plain), on: .macOS(.v10_15, .v11, .v12, .v13, .v14)) { spy0($0) } #endif @@ -31,7 +31,7 @@ final class ListWithPlainStyleTests: XCTestCase { Text("Item 1") #if os(iOS) || os(tvOS) || os(visionOS) .introspect(.list(style: .plain), on: .iOS(.v13, .v14, .v15), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), scope: .ancestor) { spy1($0) } - .introspect(.list(style: .plain), on: .iOS(.v16, .v17, .v18), .visionOS(.v1), scope: .ancestor) { spy1($0) } + .introspect(.list(style: .plain), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor) { spy1($0) } #elseif os(macOS) .introspect(.list(style: .plain), on: .macOS(.v10_15, .v11, .v12, .v13, .v14), scope: .ancestor) { spy1($0) } #endif diff --git a/Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift b/Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift index 6b34d73d..7ea671c3 100644 --- a/Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift +++ b/Tests/Tests/ViewTypes/ListWithSidebarStyleTests.swift @@ -28,7 +28,7 @@ final class ListWithSidebarStyleTests: XCTestCase { .listStyle(.sidebar) #if os(iOS) || os(visionOS) .introspect(.list(style: .sidebar), on: .iOS(.v14, .v15)) { spy0($0) } - .introspect(.list(style: .sidebar), on: .iOS(.v16, .v17, .v18), .visionOS(.v1)) { spy0($0) } + .introspect(.list(style: .sidebar), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2)) { spy0($0) } #elseif os(macOS) .introspect(.list(style: .sidebar), on: .macOS(.v10_15, .v11, .v12, .v13, .v14)) { spy0($0) } #endif @@ -37,7 +37,7 @@ final class ListWithSidebarStyleTests: XCTestCase { Text("Item 1") #if os(iOS) || os(visionOS) .introspect(.list(style: .sidebar), on: .iOS(.v14, .v15), scope: .ancestor) { spy1($0) } - .introspect(.list(style: .sidebar), on: .iOS(.v16, .v17, .v18), .visionOS(.v1), scope: .ancestor) { spy1($0) } + .introspect(.list(style: .sidebar), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor) { spy1($0) } #elseif os(macOS) .introspect(.list(style: .sidebar), on: .macOS(.v10_15, .v11, .v12, .v13, .v14), scope: .ancestor) { spy1($0) } #endif diff --git a/Tests/Tests/ViewTypes/MapTests.swift b/Tests/Tests/ViewTypes/MapTests.swift index 451e87be..31ecba6f 100644 --- a/Tests/Tests/ViewTypes/MapTests.swift +++ b/Tests/Tests/ViewTypes/MapTests.swift @@ -25,21 +25,21 @@ final class MapTests: XCTestCase { Map(coordinateRegion: region) .introspect( .map, - on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .macOS(.v11, .v12, .v13, .v14), .visionOS(.v1), + on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .macOS(.v11, .v12, .v13, .v14), .visionOS(.v1, .v2), customize: spy0 ) Map(coordinateRegion: region) .introspect( .map, - on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .macOS(.v11, .v12, .v13, .v14), .visionOS(.v1), + on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .macOS(.v11, .v12, .v13, .v14), .visionOS(.v1, .v2), customize: spy1 ) Map(coordinateRegion: region) .introspect( .map, - on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .macOS(.v11, .v12, .v13, .v14), .visionOS(.v1), + on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .macOS(.v11, .v12, .v13, .v14), .visionOS(.v1, .v2), customize: spy2 ) } diff --git a/Tests/Tests/ViewTypes/NavigationSplitViewTests.swift b/Tests/Tests/ViewTypes/NavigationSplitViewTests.swift index 5802f2a8..7328a3e1 100644 --- a/Tests/Tests/ViewTypes/NavigationSplitViewTests.swift +++ b/Tests/Tests/ViewTypes/NavigationSplitViewTests.swift @@ -36,7 +36,7 @@ final class NavigationSplitViewTests: XCTestCase { } } #if os(iOS) || os(visionOS) - .introspect(.navigationSplitView, on: .iOS(.v16, .v17, .v18), .visionOS(.v1), customize: spy) + .introspect(.navigationSplitView, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy) #elseif os(tvOS) .introspect(.navigationSplitView, on: .tvOS(.v16, .v17), customize: spy) #elseif os(macOS) @@ -62,7 +62,7 @@ final class NavigationSplitViewTests: XCTestCase { Color.red Text("Sidebar") #if os(iOS) || os(visionOS) - .introspect(.navigationSplitView, on: .iOS(.v16, .v17, .v18), .visionOS(.v1), scope: .ancestor, customize: spy) + .introspect(.navigationSplitView, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor, customize: spy) #elseif os(tvOS) .introspect(.navigationSplitView, on: .tvOS(.v16, .v17), scope: .ancestor, customize: spy) #elseif os(macOS) diff --git a/Tests/Tests/ViewTypes/NavigationStackTests.swift b/Tests/Tests/ViewTypes/NavigationStackTests.swift index e484a6b7..0180db30 100644 --- a/Tests/Tests/ViewTypes/NavigationStackTests.swift +++ b/Tests/Tests/ViewTypes/NavigationStackTests.swift @@ -25,7 +25,7 @@ final class NavigationStackTests: XCTestCase { } } #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.navigationStack, on: .iOS(.v16, .v17, .v18), .tvOS(.v16, .v17, .v18), .visionOS(.v1), customize: spy) + .introspect(.navigationStack, on: .iOS(.v16, .v17, .v18), .tvOS(.v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy) #endif } } @@ -43,7 +43,7 @@ final class NavigationStackTests: XCTestCase { Color.red Text("Something") #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.navigationStack, on: .iOS(.v16, .v17, .v18), .tvOS(.v16, .v17, .v18), .visionOS(.v1), scope: .ancestor, customize: spy) + .introspect(.navigationStack, on: .iOS(.v16, .v17, .v18), .tvOS(.v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor, customize: spy) #endif } } diff --git a/Tests/Tests/ViewTypes/NavigationViewWithColumnsStyleTests.swift b/Tests/Tests/ViewTypes/NavigationViewWithColumnsStyleTests.swift index b22feeee..a4aba9ce 100644 --- a/Tests/Tests/ViewTypes/NavigationViewWithColumnsStyleTests.swift +++ b/Tests/Tests/ViewTypes/NavigationViewWithColumnsStyleTests.swift @@ -24,7 +24,7 @@ final class NavigationViewWithColumnsStyleTests: XCTestCase { } .navigationViewStyle(DoubleColumnNavigationViewStyle()) #if os(iOS) || os(visionOS) - .introspect(.navigationView(style: .columns), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy) + .introspect(.navigationView(style: .columns), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy) #elseif os(tvOS) .introspect(.navigationView(style: .columns), on: .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), customize: spy) #elseif os(macOS) @@ -42,7 +42,7 @@ final class NavigationViewWithColumnsStyleTests: XCTestCase { Color.red Text("Something") #if os(iOS) || os(visionOS) - .introspect(.navigationView(style: .columns), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), scope: .ancestor, customize: spy) + .introspect(.navigationView(style: .columns), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor, customize: spy) #elseif os(tvOS) .introspect(.navigationView(style: .columns), on: .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), scope: .ancestor, customize: spy) #elseif os(macOS) diff --git a/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift b/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift index d9b975dc..47ebe17c 100644 --- a/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift +++ b/Tests/Tests/ViewTypes/NavigationViewWithStackStyleTests.swift @@ -21,7 +21,7 @@ final class NavigationViewWithStackStyleTests: XCTestCase { } .navigationViewStyle(.stack) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.navigationView(style: .stack), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy) + .introspect(.navigationView(style: .stack), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy) #endif } } @@ -35,7 +35,7 @@ final class NavigationViewWithStackStyleTests: XCTestCase { Color.red Text("Something") #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.navigationView(style: .stack), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), scope: .ancestor, customize: spy) + .introspect(.navigationView(style: .stack), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor, customize: spy) #endif } } diff --git a/Tests/Tests/ViewTypes/PageControlTests.swift b/Tests/Tests/ViewTypes/PageControlTests.swift index 4e40fd52..9f243c88 100644 --- a/Tests/Tests/ViewTypes/PageControlTests.swift +++ b/Tests/Tests/ViewTypes/PageControlTests.swift @@ -24,7 +24,7 @@ final class PageControlTests: XCTestCase { } .tabViewStyle(.page(indexDisplayMode: .always)) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.pageControl, on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy) + .introspect(.pageControl, on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy) #endif } } diff --git a/Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift b/Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift index 681e53c8..ea3e495b 100644 --- a/Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift +++ b/Tests/Tests/ViewTypes/PickerWithSegmentedStyleTests.swift @@ -22,7 +22,7 @@ final class PickerWithSegmentedStyleTests: XCTestCase { } .pickerStyle(.segmented) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.picker(style: .segmented), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.picker(style: .segmented), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.picker(style: .segmented), on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy0) #endif @@ -34,7 +34,7 @@ final class PickerWithSegmentedStyleTests: XCTestCase { } .pickerStyle(.segmented) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.picker(style: .segmented), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.picker(style: .segmented), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.picker(style: .segmented), on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy1) #endif @@ -47,7 +47,7 @@ final class PickerWithSegmentedStyleTests: XCTestCase { } .pickerStyle(.segmented) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.picker(style: .segmented), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.picker(style: .segmented), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.picker(style: .segmented), on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy2) #endif diff --git a/Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift b/Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift index 0fc1caa7..21499c86 100644 --- a/Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift +++ b/Tests/Tests/ViewTypes/PickerWithWheelStyleTests.swift @@ -21,7 +21,7 @@ final class PickerWithWheelStyleTests: XCTestCase { } .pickerStyle(.wheel) #if os(iOS) || os(visionOS) - .introspect(.picker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.picker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #endif .cornerRadius(8) @@ -31,7 +31,7 @@ final class PickerWithWheelStyleTests: XCTestCase { } .pickerStyle(.wheel) #if os(iOS) || os(visionOS) - .introspect(.picker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.picker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #endif .cornerRadius(8) @@ -42,7 +42,7 @@ final class PickerWithWheelStyleTests: XCTestCase { } .pickerStyle(.wheel) #if os(iOS) || os(visionOS) - .introspect(.picker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.picker(style: .wheel), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #endif } } extraAssertions: { diff --git a/Tests/Tests/ViewTypes/PopoverTests.swift b/Tests/Tests/ViewTypes/PopoverTests.swift index 6e9b68cd..b2bd1eb5 100644 --- a/Tests/Tests/ViewTypes/PopoverTests.swift +++ b/Tests/Tests/ViewTypes/PopoverTests.swift @@ -14,7 +14,7 @@ final class PopoverTests: XCTestCase { Text("Popover") .introspect( .popover, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0 ) } diff --git a/Tests/Tests/ViewTypes/ProgressViewWithCircularStyleTests.swift b/Tests/Tests/ViewTypes/ProgressViewWithCircularStyleTests.swift index af3802d1..f192e046 100644 --- a/Tests/Tests/ViewTypes/ProgressViewWithCircularStyleTests.swift +++ b/Tests/Tests/ViewTypes/ProgressViewWithCircularStyleTests.swift @@ -24,7 +24,7 @@ final class ProgressViewWithCircularStyleTests: XCTestCase { ProgressView(value: 0.25) .progressViewStyle(.circular) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.progressView(style: .circular), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.progressView(style: .circular), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.progressView(style: .circular), on: .macOS(.v11, .v12, .v13, .v14), customize: spy0) #endif @@ -32,7 +32,7 @@ final class ProgressViewWithCircularStyleTests: XCTestCase { ProgressView(value: 0.5) .progressViewStyle(.circular) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.progressView(style: .circular), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.progressView(style: .circular), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.progressView(style: .circular), on: .macOS(.v11, .v12, .v13, .v14), customize: spy1) #endif @@ -40,7 +40,7 @@ final class ProgressViewWithCircularStyleTests: XCTestCase { ProgressView(value: 0.75) .progressViewStyle(.circular) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.progressView(style: .circular), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.progressView(style: .circular), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.progressView(style: .circular), on: .macOS(.v11, .v12, .v13, .v14), customize: spy2) #endif diff --git a/Tests/Tests/ViewTypes/ProgressViewWithLinearStyleTests.swift b/Tests/Tests/ViewTypes/ProgressViewWithLinearStyleTests.swift index f833f5c9..c5db6391 100644 --- a/Tests/Tests/ViewTypes/ProgressViewWithLinearStyleTests.swift +++ b/Tests/Tests/ViewTypes/ProgressViewWithLinearStyleTests.swift @@ -24,7 +24,7 @@ final class ProgressViewWithLinearStyleTests: XCTestCase { ProgressView(value: 0.25) .progressViewStyle(.linear) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.progressView(style: .linear), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.progressView(style: .linear), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.progressView(style: .linear), on: .macOS(.v11, .v12, .v13, .v14), customize: spy0) #endif @@ -32,7 +32,7 @@ final class ProgressViewWithLinearStyleTests: XCTestCase { ProgressView(value: 0.5) .progressViewStyle(.linear) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.progressView(style: .linear), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.progressView(style: .linear), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.progressView(style: .linear), on: .macOS(.v11, .v12, .v13, .v14), customize: spy1) #endif @@ -40,7 +40,7 @@ final class ProgressViewWithLinearStyleTests: XCTestCase { ProgressView(value: 0.75) .progressViewStyle(.linear) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.progressView(style: .linear), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.progressView(style: .linear), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.progressView(style: .linear), on: .macOS(.v11, .v12, .v13, .v14), customize: spy2) #endif diff --git a/Tests/Tests/ViewTypes/ScrollViewTests.swift b/Tests/Tests/ViewTypes/ScrollViewTests.swift index 6a973bd2..f41b236a 100644 --- a/Tests/Tests/ViewTypes/ScrollViewTests.swift +++ b/Tests/Tests/ViewTypes/ScrollViewTests.swift @@ -20,7 +20,7 @@ final class ScrollViewTests: XCTestCase { Text("Item 1") } #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.scrollView, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy0) #endif @@ -28,7 +28,7 @@ final class ScrollViewTests: XCTestCase { ScrollView(showsIndicators: true) { Text("Item 1") #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), scope: .ancestor, customize: spy1) + .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor, customize: spy1) #elseif os(macOS) .introspect(.scrollView, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), scope: .ancestor, customize: spy1) #endif @@ -62,13 +62,13 @@ final class ScrollViewTests: XCTestCase { Text("Item 1") } #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.scrollView, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy1) #endif } #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.scrollView, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy0) #endif @@ -98,7 +98,7 @@ final class ScrollViewTests: XCTestCase { Text("Item 1") } #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.scrollView, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy0) #endif @@ -109,7 +109,7 @@ final class ScrollViewTests: XCTestCase { ScrollView(showsIndicators: true) { Text("Item 1") #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), scope: .ancestor, customize: spy1) + .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor, customize: spy1) #elseif os(macOS) .introspect(.scrollView, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), scope: .ancestor, customize: spy1) #endif diff --git a/Tests/Tests/ViewTypes/SearchFieldTests.swift b/Tests/Tests/ViewTypes/SearchFieldTests.swift index 890f75c2..0045e08d 100644 --- a/Tests/Tests/ViewTypes/SearchFieldTests.swift +++ b/Tests/Tests/ViewTypes/SearchFieldTests.swift @@ -24,7 +24,7 @@ final class SearchFieldTests: XCTestCase { } .navigationViewStyle(.stack) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.searchField, on: .iOS(.v15, .v16, .v17, .v18), .tvOS(.v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy) + .introspect(.searchField, on: .iOS(.v15, .v16, .v17, .v18), .tvOS(.v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy) #endif } } @@ -41,7 +41,7 @@ final class SearchFieldTests: XCTestCase { Text("Customized") .searchable(text: .constant("")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.searchField, on: .iOS(.v15, .v16, .v17, .v18), .tvOS(.v15, .v16, .v17, .v18), .visionOS(.v1), scope: .ancestor, customize: spy) + .introspect(.searchField, on: .iOS(.v15, .v16, .v17, .v18), .tvOS(.v15, .v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor, customize: spy) #endif } .navigationViewStyle(.stack) @@ -62,7 +62,7 @@ final class SearchFieldTests: XCTestCase { } .navigationViewStyle(DoubleColumnNavigationViewStyle()) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.searchField, on: .iOS(.v15, .v16, .v17, .v18), .tvOS(.v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy) + .introspect(.searchField, on: .iOS(.v15, .v16, .v17, .v18), .tvOS(.v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy) #endif #if os(iOS) // NB: this is necessary for introspection to work, because on iPad the search field is in the sidebar, which is initially hidden. @@ -85,7 +85,7 @@ final class SearchFieldTests: XCTestCase { Text("Customized") .searchable(text: .constant("")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.searchField, on: .iOS(.v15, .v16, .v17, .v18), .tvOS(.v15, .v16, .v17, .v18), .visionOS(.v1), scope: .ancestor, customize: spy) + .introspect(.searchField, on: .iOS(.v15, .v16, .v17, .v18), .tvOS(.v15, .v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor, customize: spy) #endif } .navigationViewStyle(DoubleColumnNavigationViewStyle()) diff --git a/Tests/Tests/ViewTypes/SecureFieldTests.swift b/Tests/Tests/ViewTypes/SecureFieldTests.swift index 5a6acafc..34f30ca3 100644 --- a/Tests/Tests/ViewTypes/SecureFieldTests.swift +++ b/Tests/Tests/ViewTypes/SecureFieldTests.swift @@ -19,7 +19,7 @@ final class SecureFieldTests: XCTestCase { VStack { SecureField("", text: .constant("Secure Field 0")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.secureField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.secureField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.secureField, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy0) #endif @@ -27,7 +27,7 @@ final class SecureFieldTests: XCTestCase { SecureField("", text: .constant("Secure Field 1")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.secureField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.secureField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.secureField, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy1) #endif @@ -35,7 +35,7 @@ final class SecureFieldTests: XCTestCase { SecureField("", text: .constant("Secure Field 2")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.secureField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.secureField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.secureField, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy2) #endif @@ -62,21 +62,21 @@ final class SecureFieldTests: XCTestCase { List { SecureField("", text: .constant("Secure Field 0")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.secureField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.secureField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.secureField, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy0) #endif SecureField("", text: .constant("Secure Field 1")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.secureField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.secureField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.secureField, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy1) #endif SecureField("", text: .constant("Secure Field 2")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.secureField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.secureField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.secureField, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy2) #endif diff --git a/Tests/Tests/ViewTypes/SheetTests.swift b/Tests/Tests/ViewTypes/SheetTests.swift index b958a27b..7c6ac4f6 100644 --- a/Tests/Tests/ViewTypes/SheetTests.swift +++ b/Tests/Tests/ViewTypes/SheetTests.swift @@ -67,7 +67,7 @@ final class SheetTests: XCTestCase { Text("Sheet") .introspect( .sheet, - on: .visionOS(.v1), + on: .visionOS(.v1, .v2), customize: spy0 ) } diff --git a/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift b/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift index 58e80594..da56ca3f 100644 --- a/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift +++ b/Tests/Tests/ViewTypes/TabViewWithPageStyleTests.swift @@ -24,7 +24,7 @@ final class TabViewWithPageStyleTests: XCTestCase { } .tabViewStyle(.page) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.tabView(style: .page), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy) + .introspect(.tabView(style: .page), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy) #endif } } @@ -40,7 +40,7 @@ final class TabViewWithPageStyleTests: XCTestCase { TabView { Text("Page 1").frame(maxWidth: .infinity, maxHeight: .infinity).background(Color.red) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.tabView(style: .page), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), scope: .ancestor, customize: spy) + .introspect(.tabView(style: .page), on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), scope: .ancestor, customize: spy) #endif Text("Page 2").frame(maxWidth: .infinity, maxHeight: .infinity).background(Color.blue) } diff --git a/Tests/Tests/ViewTypes/TableTests.swift b/Tests/Tests/ViewTypes/TableTests.swift index 84fdebd3..33357a9d 100644 --- a/Tests/Tests/ViewTypes/TableTests.swift +++ b/Tests/Tests/ViewTypes/TableTests.swift @@ -25,21 +25,21 @@ final class TableTests: XCTestCase { VStack { TipTable() #if os(iOS) || os(visionOS) - .introspect(.table, on: .iOS(.v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.table, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.table, on: .macOS(.v12, .v13, .v14), customize: spy0) #endif TipTable() #if os(iOS) || os(visionOS) - .introspect(.table, on: .iOS(.v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.table, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.table, on: .macOS(.v12, .v13, .v14), customize: spy1) #endif TipTable() #if os(iOS) || os(visionOS) - .introspect(.table, on: .iOS(.v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.table, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.table, on: .macOS(.v12, .v13, .v14), customize: spy2) #endif @@ -61,7 +61,7 @@ final class TableTests: XCTestCase { TipTable() .tableStyle(.inset) #if os(iOS) || os(visionOS) - .introspect(.table, on: .iOS(.v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.table, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.table, on: .macOS(.v12, .v13, .v14), customize: spy0) #endif @@ -69,7 +69,7 @@ final class TableTests: XCTestCase { TipTable() .tableStyle(.inset) #if os(iOS) || os(visionOS) - .introspect(.table, on: .iOS(.v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.table, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.table, on: .macOS(.v12, .v13, .v14), customize: spy1) #endif @@ -77,7 +77,7 @@ final class TableTests: XCTestCase { TipTable() .tableStyle(.inset) #if os(iOS) || os(visionOS) - .introspect(.table, on: .iOS(.v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.table, on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.table, on: .macOS(.v12, .v13, .v14), customize: spy2) #endif diff --git a/Tests/Tests/ViewTypes/TextEditorTests.swift b/Tests/Tests/ViewTypes/TextEditorTests.swift index 157c6abc..4c0003c8 100644 --- a/Tests/Tests/ViewTypes/TextEditorTests.swift +++ b/Tests/Tests/ViewTypes/TextEditorTests.swift @@ -25,7 +25,7 @@ final class TextEditorTests: XCTestCase { VStack { TextEditor(text: .constant("Text Field 0")) #if os(iOS) || os(visionOS) - .introspect(.textEditor, on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.textEditor, on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.textEditor, on: .macOS(.v11, .v12, .v13, .v14), customize: spy0) #endif @@ -33,7 +33,7 @@ final class TextEditorTests: XCTestCase { TextEditor(text: .constant("Text Field 1")) #if os(iOS) || os(visionOS) - .introspect(.textEditor, on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.textEditor, on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.textEditor, on: .macOS(.v11, .v12, .v13, .v14), customize: spy1) #endif @@ -41,7 +41,7 @@ final class TextEditorTests: XCTestCase { TextEditor(text: .constant("Text Field 2")) #if os(iOS) || os(visionOS) - .introspect(.textEditor, on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.textEditor, on: .iOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.textEditor, on: .macOS(.v11, .v12, .v13, .v14), customize: spy2) #endif diff --git a/Tests/Tests/ViewTypes/TextFieldTests.swift b/Tests/Tests/ViewTypes/TextFieldTests.swift index 148a2ed2..bb272e32 100644 --- a/Tests/Tests/ViewTypes/TextFieldTests.swift +++ b/Tests/Tests/ViewTypes/TextFieldTests.swift @@ -19,7 +19,7 @@ final class TextFieldTests: XCTestCase { VStack { TextField("", text: .constant("Text Field 0")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.textField, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy0) #endif @@ -27,7 +27,7 @@ final class TextFieldTests: XCTestCase { TextField("", text: .constant("Text Field 1")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.textField, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy1) #endif @@ -35,7 +35,7 @@ final class TextFieldTests: XCTestCase { TextField("", text: .constant("Text Field 2")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.textField, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy2) #endif @@ -62,21 +62,21 @@ final class TextFieldTests: XCTestCase { List { TextField("", text: .constant("Text Field 0")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.textField, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy0) #endif TextField("", text: .constant("Text Field 1")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.textField, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy1) #endif TextField("", text: .constant("Text Field 2")) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.textField, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy2) #endif diff --git a/Tests/Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift b/Tests/Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift index f5964743..fc6cb273 100644 --- a/Tests/Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift +++ b/Tests/Tests/ViewTypes/TextFieldWithVerticalAxisTests.swift @@ -26,7 +26,7 @@ final class TextFieldWithVerticalAxisTests: XCTestCase { VStack { TextField("", text: .constant("Text Field 1"), axis: .vertical) #if os(iOS) || os(visionOS) - .introspect(.textField(axis: .vertical), on: .iOS(.v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.textField(axis: .vertical), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(tvOS) .introspect(.textField(axis: .vertical), on: .tvOS(.v16, .v17, .v18), customize: spy0) #elseif os(macOS) @@ -36,7 +36,7 @@ final class TextFieldWithVerticalAxisTests: XCTestCase { TextField("", text: .constant("Text Field 2"), axis: .vertical) #if os(iOS) || os(visionOS) - .introspect(.textField(axis: .vertical), on: .iOS(.v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.textField(axis: .vertical), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(tvOS) .introspect(.textField(axis: .vertical), on: .tvOS(.v16, .v17, .v18), customize: spy1) #elseif os(macOS) @@ -46,7 +46,7 @@ final class TextFieldWithVerticalAxisTests: XCTestCase { TextField("", text: .constant("Text Field 3"), axis: .vertical) #if os(iOS) || os(visionOS) - .introspect(.textField(axis: .vertical), on: .iOS(.v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.textField(axis: .vertical), on: .iOS(.v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(tvOS) .introspect(.textField(axis: .vertical), on: .tvOS(.v16, .v17, .v18), customize: spy2) #elseif os(macOS) diff --git a/Tests/Tests/ViewTypes/VideoPlayerTests.swift b/Tests/Tests/ViewTypes/VideoPlayerTests.swift index 33f7722f..fc9b9eeb 100644 --- a/Tests/Tests/ViewTypes/VideoPlayerTests.swift +++ b/Tests/Tests/ViewTypes/VideoPlayerTests.swift @@ -30,21 +30,21 @@ final class VideoPlayerTests: XCTestCase { VStack { VideoPlayer(player: AVPlayer(url: videoURL0)) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.videoPlayer, on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.videoPlayer, on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.videoPlayer, on: .macOS(.v11, .v12, .v13, .v14), customize: spy0) #endif VideoPlayer(player: AVPlayer(url: videoURL1)) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.videoPlayer, on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.videoPlayer, on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.videoPlayer, on: .macOS(.v11, .v12, .v13, .v14), customize: spy1) #endif VideoPlayer(player: AVPlayer(url: videoURL2)) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.videoPlayer, on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.videoPlayer, on: .iOS(.v14, .v15, .v16, .v17, .v18), .tvOS(.v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.videoPlayer, on: .macOS(.v11, .v12, .v13, .v14), customize: spy2) #endif diff --git a/Tests/Tests/ViewTypes/ViewControllerTests.swift b/Tests/Tests/ViewTypes/ViewControllerTests.swift index fb1e9960..ffeebe0d 100644 --- a/Tests/Tests/ViewTypes/ViewControllerTests.swift +++ b/Tests/Tests/ViewTypes/ViewControllerTests.swift @@ -16,7 +16,7 @@ final class ViewControllerTests: XCTestCase { Text("Root").frame(maxWidth: .infinity, maxHeight: .infinity).background(Color.red) .introspect( .viewController, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2 ) } @@ -27,13 +27,13 @@ final class ViewControllerTests: XCTestCase { } .introspect( .viewController, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1 ) } .introspect( .viewController, - on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), + on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0 ) } extraAssertions: { diff --git a/Tests/Tests/ViewTypes/ViewTests.swift b/Tests/Tests/ViewTypes/ViewTests.swift index 354b146a..92c41353 100644 --- a/Tests/Tests/ViewTypes/ViewTests.swift +++ b/Tests/Tests/ViewTypes/ViewTests.swift @@ -13,21 +13,21 @@ final class ViewTests: XCTestCase { VStack(spacing: 10) { Image(systemName: "scribble").resizable().frame(height: 30) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.view, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.view, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.view, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy0) #endif Text("Text").frame(height: 40) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.view, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.view, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.view, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy1) #endif } .padding(10) #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.view, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.view, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.view, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy2) #endif diff --git a/Tests/Tests/ViewTypes/WindowTests.swift b/Tests/Tests/ViewTypes/WindowTests.swift index abf1efd6..12813dac 100644 --- a/Tests/Tests/ViewTypes/WindowTests.swift +++ b/Tests/Tests/ViewTypes/WindowTests.swift @@ -19,20 +19,20 @@ final class WindowTests: XCTestCase { VStack { Image(systemName: "scribble") #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.window, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy0) + .introspect(.window, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy0) #elseif os(macOS) .introspect(.window, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy0) #endif Text("Text") #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.window, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy1) + .introspect(.window, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy1) #elseif os(macOS) .introspect(.window, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy1) #endif } #if os(iOS) || os(tvOS) || os(visionOS) - .introspect(.window, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1), customize: spy2) + .introspect(.window, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), .tvOS(.v13, .v14, .v15, .v16, .v17, .v18), .visionOS(.v1, .v2), customize: spy2) #elseif os(macOS) .introspect(.window, on: .macOS(.v10_15, .v11, .v12, .v13, .v14), customize: spy2) #endif From 334bf8bd75b83ad8a4855ceeaafdde2a7317fad7 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Wed, 17 Jul 2024 12:08:13 +0100 Subject: [PATCH 32/36] 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 28324f7a..7b6592df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,10 +132,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 - platform: [visionOS, 2] runtime: visionOS 2.0 os: macos-14 From c4229a6e88e4d5eca1ccb9082f8eb55b73861f6e Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Wed, 17 Jul 2024 12:13:59 +0100 Subject: [PATCH 33/36] WIP --- Sources/ViewTypes/FormWithGroupedStyle.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/ViewTypes/FormWithGroupedStyle.swift b/Sources/ViewTypes/FormWithGroupedStyle.swift index 374d2a02..9e995750 100644 --- a/Sources/ViewTypes/FormWithGroupedStyle.swift +++ b/Sources/ViewTypes/FormWithGroupedStyle.swift @@ -114,6 +114,7 @@ extension tvOSViewVersion { extension visionOSViewVersion { public static let v1 = Self(for: .v1) + public static let v2 = Self(for: .v2) } #elseif canImport(AppKit) extension macOSViewVersion { From 8788751ae43c32cb10f1c201983ffd9693e66578 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Wed, 17 Jul 2024 12:29:04 +0100 Subject: [PATCH 34/36] WIP --- .github/workflows/ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b6592df..7c030c46 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -152,11 +152,6 @@ 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 51356999776e51530ec89daff81cf7a121d21303 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Wed, 17 Jul 2024 13:16:27 +0100 Subject: [PATCH 35/36] 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 7c030c46..20276b49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -132,10 +132,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 - platform: [visionOS, 2] runtime: visionOS 2.0 os: macos-14 From b7234c5d0bf4a0068384bdc54e16ad78266c21e4 Mon Sep 17 00:00:00 2001 From: David Roman <2538074+davdroman@users.noreply.github.com> Date: Wed, 17 Jul 2024 13:16:29 +0100 Subject: [PATCH 36/36] [skip ci] Revert "temp" This reverts commit cf75e4321fbc63da8abbc50bd9e1f47d971cda00. --- .github/workflows/ci.yml | 164 +++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20276b49..a05a9a3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,88 +45,88 @@ 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, 18] - # runtime: iOS 18.0 - # os: macos-14 - # xcode: 16.0 - - # - 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, 18] - # runtime: tvOS 18.0 - # os: macos-14 - # xcode: 16.0 - - # - 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, 11] - # runtime: watchOS 11.0 - # os: macos-14 - # xcode: 16.0 - - # - 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: [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, 18] + runtime: iOS 18.0 + os: macos-14 + xcode: 16.0 + + - 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, 18] + runtime: tvOS 18.0 + os: macos-14 + xcode: 16.0 + + - 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, 11] + runtime: watchOS 11.0 + os: macos-14 + xcode: 16.0 + + - 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