siteline · davdroman · Oct 27, 2023 · Oct 25, 2023 · Oct 26, 2023 · Oct 26, 2023
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -85,6 +85,25 @@ jobs:
             os: macos-13
             xcode: 15.0.1
 
+          - platform: [watchOS, 7]
+            runtime: watchOS 7.4
+            os: macos-13
+            xcode: 14.3.1
+            install: true
+          - platform: [watchOS, 8]
+            runtime: watchOS 8.5
+            os: macos-13
+            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.0
+            os: macos-13
+            xcode: 15.0.1
+
           - platform: [macOS, 12]
             runtime: macOS 12
             os: macos-12
@@ -127,12 +146,18 @@ jobs:
         name: '[Debug] List Available Runtimes, Simulators, and Destinations'
         run: |
           xcrun simctl list
-          xcodebuild -scheme "Showcase" -showdestinations
+          xcodebuild -scheme "SwiftUIIntrospect" -showdestinations
 
-      - name: Build Showcase
+      - if: ${{ matrix.platform[0] != 'watchOS' }}
+        name: Build Showcase
         run: fastlane build platform:${{ matrix.platform[0] }} version:${{ matrix.platform[1] }} scheme:Showcase
 
-      - name: Run Tests
+      - if: ${{ matrix.platform[0] == 'watchOS' }}
+        name: Build Library
+        run: fastlane build platform:${{ matrix.platform[0] }} version:${{ matrix.platform[1] }} scheme:SwiftUIIntrospect
+
+      - if: ${{ matrix.platform[0] != 'watchOS' }}
+        name: Run Tests
         run: fastlane test platform:${{ matrix.platform[0] }} version:${{ matrix.platform[1] }} scheme:SwiftUIIntrospectTests configuration:Debug
 
       - if: ${{ matrix.platform[0] == 'iOS' && matrix.platform[1] <= '16' }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@ Changelog
 
 ## master
 
+- Fixed: SwiftUI previews on watchOS no longer fail to build (#380)
+- Infrastructure: fixed iOS 17 tests failing on CI (#381)
+
 ## [1.1.0]
 
 - Removed: `Toggle` introspection on visionOS (#373)

diff --git a/Sources/Introspect.swift b/Sources/Introspect.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// The scope of introspection i.e. where introspect should look to find
@@ -214,3 +215,4 @@ extension NSWindow: PlatformEntity {
     public typealias Base = NSWindow
 }
 #endif
+#endif
diff --git a/Sources/IntrospectableViewType.swift b/Sources/IntrospectableViewType.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 public protocol IntrospectableViewType {
     /// The scope of introspection for this particular view type, i.e. where introspect
     /// should look to find the desired target view relative to the applied
@@ -15,3 +16,4 @@ public protocol IntrospectableViewType {
 extension IntrospectableViewType {
     public var scope: IntrospectionScope { .receiver }
 }
+#endif
diff --git a/Sources/IntrospectionSelector.swift b/Sources/IntrospectionSelector.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 @_spi(Advanced)
 public struct IntrospectionSelector<Target: PlatformEntity> {
     @_spi(Advanced)
@@ -71,3 +72,4 @@ extension PlatformViewController {
         return nil
     }
 }
+#endif
diff --git a/Sources/IntrospectionView.swift b/Sources/IntrospectionView.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 typealias IntrospectionViewID = UUID
@@ -242,3 +243,4 @@ extension PlatformEntity {
         }
     }
 }
+#endif
diff --git a/Sources/PlatformVersion.swift b/Sources/PlatformVersion.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import Foundation
 
 @_spi(Internals)
@@ -309,3 +310,4 @@ extension visionOSVersion {
         #endif
     }
 }
+#endif
diff --git a/Sources/PlatformView.swift b/Sources/PlatformView.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 #if canImport(UIKit)
@@ -53,3 +54,4 @@ extension PlatformViewControllerRepresentable {
     }
     #endif
 }
+#endif
diff --git a/Sources/PlatformViewVersion.swift b/Sources/PlatformViewVersion.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 public struct PlatformViewVersionPredicate<SwiftUIViewType: IntrospectableViewType, PlatformSpecificEntity: PlatformEntity> {
@@ -121,3 +122,4 @@ extension PlatformViewVersion: Comparable {
         true
     }
 }
+#endif
diff --git a/Sources/ViewTypes/Button.swift b/Sources/ViewTypes/Button.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `Button` type in SwiftUI.
@@ -43,3 +44,4 @@ extension macOSViewVersion<ButtonType, NSButton> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/ColorPicker.swift b/Sources/ViewTypes/ColorPicker.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `ColorPicker` type in SwiftUI.
@@ -84,3 +85,4 @@ extension macOSViewVersion<ColorPickerType, NSColorWell> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/DatePicker.swift b/Sources/ViewTypes/DatePicker.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `DatePicker` type in SwiftUI.
@@ -77,3 +78,4 @@ extension macOSViewVersion<DatePickerType, NSDatePicker> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/DatePickerWithCompactStyle.swift b/Sources/ViewTypes/DatePickerWithCompactStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `DatePicker` type in SwiftUI, with `.compact` style.
@@ -89,3 +90,4 @@ extension macOSViewVersion<DatePickerWithCompactStyleType, NSDatePicker> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/DatePickerWithFieldStyle.swift b/Sources/ViewTypes/DatePickerWithFieldStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `DatePicker` type in SwiftUI, with `.field` style.
@@ -50,3 +51,4 @@ extension macOSViewVersion<DatePickerWithFieldStyleType, NSDatePicker> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/DatePickerWithGraphicalStyle.swift b/Sources/ViewTypes/DatePickerWithGraphicalStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `DatePicker` type in SwiftUI, with `.graphical` style.
@@ -87,3 +88,4 @@ extension macOSViewVersion<DatePickerWithGraphicalStyleType, NSDatePicker> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/DatePickerWithStepperFieldStyle.swift b/Sources/ViewTypes/DatePickerWithStepperFieldStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `DatePicker` type in SwiftUI, with `.stepperField` style.
@@ -50,3 +51,4 @@ extension macOSViewVersion<DatePickerWithStepperFieldStyleType, NSDatePicker> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/DatePickerWithWheelStyle.swift b/Sources/ViewTypes/DatePickerWithWheelStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `DatePicker` type in SwiftUI, with `.wheel` style.
@@ -66,3 +67,4 @@ extension visionOSViewVersion<DatePickerWithWheelStyleType, UIDatePicker> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/Form.swift b/Sources/ViewTypes/Form.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `Form` type in SwiftUI.
@@ -91,3 +92,4 @@ extension visionOSViewVersion<FormType, UICollectionView> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/FormWithGroupedStyle.swift b/Sources/ViewTypes/FormWithGroupedStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `Form` type in SwiftUI, with `.grouped` style.
@@ -124,3 +125,4 @@ extension macOSViewVersion<FormWithGroupedStyleType, NSScrollView> {
     public static let v14 = Self(for: .v14)
 }
 #endif
+#endif
diff --git a/Sources/ViewTypes/FullScreenCover.swift b/Sources/ViewTypes/FullScreenCover.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of `.fullScreenCover` in SwiftUI.
@@ -104,3 +105,4 @@ extension visionOSViewVersion<FullScreenCoverType, UIPresentationController> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/List.swift b/Sources/ViewTypes/List.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `List` type in SwiftUI.
@@ -115,3 +116,4 @@ extension macOSViewVersion<ListType, NSTableView> {
     public static let v14 = Self(for: .v14)
 }
 #endif
+#endif
diff --git a/Sources/ViewTypes/ListCell.swift b/Sources/ViewTypes/ListCell.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of a `List` cell type in SwiftUI.
@@ -112,3 +113,4 @@ extension macOSViewVersion<ListCellType, NSTableCellView> {
     public static let v14 = Self(for: .v14)
 }
 #endif
+#endif
diff --git a/Sources/ViewTypes/ListWithBorderedStyle.swift b/Sources/ViewTypes/ListWithBorderedStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `List` type in SwiftUI, with `.bordered` style.
@@ -54,3 +55,4 @@ extension macOSViewVersion<ListWithBorderedStyleType, NSTableView> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/ListWithGroupedStyle.swift b/Sources/ViewTypes/ListWithGroupedStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `List` type in SwiftUI, with `.grouped` style.
@@ -98,3 +99,4 @@ extension visionOSViewVersion<ListWithGroupedStyleType, UICollectionView> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/ListWithInsetGroupedStyle.swift b/Sources/ViewTypes/ListWithInsetGroupedStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `List` type in SwiftUI, with `.insetGrouped` style.
@@ -77,3 +78,4 @@ extension visionOSViewVersion<ListWithInsetGroupedStyleType, UICollectionView> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/ListWithInsetStyle.swift b/Sources/ViewTypes/ListWithInsetStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `List` type in SwiftUI, with `.inset` style.
@@ -100,3 +101,4 @@ extension macOSViewVersion<ListWithInsetStyleType, NSTableView> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/ListWithSidebarStyle.swift b/Sources/ViewTypes/ListWithSidebarStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `List` type in SwiftUI, with `.sidebar` style.
@@ -99,3 +100,4 @@ extension macOSViewVersion<ListWithSidebarStyleType, NSTableView> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/Map.swift b/Sources/ViewTypes/Map.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `Map` type in SwiftUI.
@@ -101,3 +102,4 @@ extension visionOSViewVersion<MapType, MKMapView> {
     public static let v1 = Self(for: .v1)
 }
 #endif
+#endif
diff --git a/Sources/ViewTypes/NavigationSplitView.swift b/Sources/ViewTypes/NavigationSplitView.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `NavigationSplitView` type in SwiftUI.
@@ -128,3 +129,4 @@ extension macOSViewVersion<NavigationSplitViewType, NSSplitView> {
     public static let v14 = Self(for: .v14)
 }
 #endif
+#endif
diff --git a/Sources/ViewTypes/NavigationStack.swift b/Sources/ViewTypes/NavigationStack.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `NavigationStack` type in SwiftUI.
@@ -97,3 +98,4 @@ extension visionOSViewVersion<NavigationStackType, UINavigationController> {
     }
 }
 #endif
+#endif
diff --git a/Sources/ViewTypes/NavigationViewWithColumnsStyle.swift b/Sources/ViewTypes/NavigationViewWithColumnsStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `NavigationView` type in SwiftUI, with `.columns` style.
@@ -116,3 +117,4 @@ extension macOSViewVersion<NavigationViewWithColumnsStyleType, NSSplitView> {
     public static let v14 = Self(for: .v14)
 }
 #endif
+#endif
diff --git a/Sources/ViewTypes/NavigationViewWithStackStyle.swift b/Sources/ViewTypes/NavigationViewWithStackStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `NavigationView` type in SwiftUI, with `.stack` style.
@@ -96,3 +97,4 @@ extension visionOSViewVersion<NavigationViewWithStackStyleType, UINavigationCont
     }
 }
 #endif
+#endif
diff --git a/Sources/ViewTypes/PageControl.swift b/Sources/ViewTypes/PageControl.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the page control type in SwiftUI.
@@ -85,3 +86,4 @@ extension visionOSViewVersion<PageControlType, UIPageControl> {
     public static let v1 = Self(for: .v1)
 }
 #endif
+#endif
diff --git a/Sources/ViewTypes/PickerWithMenuStyle.swift b/Sources/ViewTypes/PickerWithMenuStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `Picker` type in SwiftUI, with `.menu` style.
@@ -55,3 +56,4 @@ extension macOSViewVersion<PickerWithMenuStyleType, NSPopUpButton> {
 }
 #endif
 #endif
+#endif
diff --git a/Sources/ViewTypes/PickerWithSegmentedStyle.swift b/Sources/ViewTypes/PickerWithSegmentedStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `Picker` type in SwiftUI, with `.segmented` style.
@@ -120,3 +121,4 @@ extension macOSViewVersion<PickerWithSegmentedStyleType, NSSegmentedControl> {
     public static let v14 = Self(for: .v14)
 }
 #endif
+#endif
diff --git a/Sources/ViewTypes/PickerWithWheelStyle.swift b/Sources/ViewTypes/PickerWithWheelStyle.swift
@@ -1,3 +1,4 @@
+#if !os(watchOS)
 import SwiftUI
 
 /// An abstract representation of the `Picker` type in SwiftUI, with `.wheel` style.
@@ -74,3 +75,4 @@ extension visionOSViewVersion<PickerWithWheelStyleType, UIPickerView> {
 }
 #endif
 #endif
+#endif