Add new platform versions for WWDC24

README.md

@@ -20,7 +20,7 @@ For instance, when introspecting a `ScrollView`...
 ScrollView {
     Text("Item 1")
 }
-.introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17)) { scrollView in
+.introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18)) { scrollView in
     // do something with UIScrollView
 }
 ```
@@ -38,7 +38,7 @@ By default, the `.introspect` modifier acts directly on its _receiver_. This mea
 ```swift
 ScrollView {
     Text("Item 1")
-        .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17), scope: .ancestor) { scrollView in
+        .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18), scope: .ancestor) { scrollView in
             // do something with UIScrollView
         }
 }
@@ -157,7 +157,7 @@ List {
     tableView.backgroundView = UIView()
     tableView.backgroundColor = .cyan
 }
-.introspect(.list, on: .iOS(.v16, .v17)) { collectionView in
+.introspect(.list, on: .iOS(.v16, .v17, .v18)) { collectionView in
     collectionView.backgroundView = UIView()
     collectionView.subviews.dropFirst(1).first?.backgroundColor = .cyan
 }
@@ -169,7 +169,7 @@ List {
 ScrollView {
     Text("Item")
 }
-.introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17)) { scrollView in
+.introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18)) { scrollView in
     scrollView.backgroundColor = .red
 }
 ```
@@ -181,7 +181,7 @@ NavigationView {
     Text("Item")
 }
 .navigationViewStyle(.stack)
-.introspect(.navigationView(style: .stack), on: .iOS(.v13, .v14, .v15, .v16, .v17)) { navigationController in
+.introspect(.navigationView(style: .stack), on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18)) { navigationController in
     navigationController.navigationBar.backgroundColor = .cyan
 }
 ```
@@ -190,7 +190,7 @@ NavigationView {
 
 ```swift
 TextField("Text Field", text: <#Binding<String>#>)
-    .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17)) { textField in
+    .introspect(.textField, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18)) { textField in
         textField.backgroundColor = .red
     }
 ```
@@ -286,7 +286,7 @@ struct ContentView: View {
         ScrollView {
             // ...
         }
-        .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17)) { scrollView in
+        .introspect(.scrollView, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18)) { scrollView in
             self.scrollView = scrollView
         }
     }

Sources/PlatformVersion.swift

@@ -108,6 +108,20 @@ extension iOSVersion {
         return nil
         #endif
     }
+
+    public static let v18 = iOSVersion {
+        #if os(iOS)
+        if #available(iOS 19, *) {
+            return .past
+        }
+        if #available(iOS 18, *) {
+            return .current
+        }
+        return .future
+        #else
+        return nil
+        #endif
+    }
 }
 
 public struct tvOSVersion: PlatformVersion {
@@ -176,16 +190,30 @@ extension tvOSVersion {
         return nil
         #endif
     }
-
+    
     public static let v17 = tvOSVersion {
-        #if os(tvOS)
+#if os(tvOS)
         if #available(tvOS 18, *) {
             return .past
         }
         if #available(tvOS 17, *) {
             return .current
         }
         return .future
+#else
+        return nil
+#endif
+    }
+
+    public static let v18 = tvOSVersion {
+        #if os(tvOS)
+        if #available(tvOS 19, *) {
+            return .past
+        }
+        if #available(tvOS 18, *) {
+            return .current
+        }
+        return .future
         #else
         return nil
         #endif
@@ -286,6 +314,20 @@ extension macOSVersion {
         return nil
         #endif
     }
+
+    public static let v15 = macOSVersion {
+        #if os(macOS)
+        if #available(macOS 16, *) {
+            return .past
+        }
+        if #available(macOS 15, *) {
+            return .current
+        }
+        return .future
+        #else
+        return nil
+        #endif
+    }
 }
 
 public struct visionOSVersion: PlatformVersion {
@@ -312,5 +354,19 @@ extension visionOSVersion {
         return nil
         #endif
     }
+
+    public static let v2 = visionOSVersion {
+        #if os(visionOS)
+        if #available(visionOS 3, *) {
+            return .past
+        }
+        if #available(visionOS 2, *) {
+            return .current
+        }
+        return .future
+        #else
+        return nil
+        #endif
+    }
 }
 #endif

Sources/ViewTypes/Button.swift

@@ -17,7 +17,7 @@ import SwiftUI
 /// struct ContentView: View {
 ///     var body: some View {
 ///         Button("Action", action: {})
-///             .introspect(.button, on: .macOS(.v10_15, .v11, .v12, .v13, .v14)) {
+///             .introspect(.button, on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15)) {
 ///                 print(type(of: $0)) // NSButton
 ///             }
 ///     }
@@ -41,6 +41,7 @@ extension macOSViewVersion<ButtonType, NSButton> {
     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
 #endif

Sources/ViewTypes/ColorPicker.swift

@@ -11,7 +11,7 @@ import SwiftUI
 ///
 ///     var body: some View {
 ///         ColorPicker("Pick a color", selection: $color)
-///             .introspect(.colorPicker, on: .iOS(.v14, .v15, .v16, .v17)) {
+///             .introspect(.colorPicker, on: .iOS(.v14, .v15, .v16, .v17, .v18)) {
 ///                 print(type(of: $0)) // UIColorPicker
 ///             }
 ///     }
@@ -30,7 +30,7 @@ import SwiftUI
 ///
 ///     var body: some View {
 ///         ColorPicker("Pick a color", selection: $color)
-///             .introspect(.colorPicker, on: .macOS(.v11, .v12, .v13, .v14)) {
+///             .introspect(.colorPicker, on: .macOS(.v11, .v12, .v13, .v14, .v15)) {
 ///                 print(type(of: $0)) // NSColorPicker
 ///             }
 ///     }
@@ -67,6 +67,7 @@ extension iOSViewVersion<ColorPickerType, UIColorWell> {
     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)
 }
 
 @available(iOS 14, *)
@@ -82,6 +83,7 @@ extension macOSViewVersion<ColorPickerType, NSColorWell> {
     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
 #endif

Sources/ViewTypes/DatePicker.swift

@@ -11,7 +11,7 @@ import SwiftUI
 ///
 ///     var body: some View {
 ///         DatePicker("Pick a date", selection: $date)
-///             .introspect(.datePicker, on: .iOS(.v13, .v14, .v15, .v16, .v17)) {
+///             .introspect(.datePicker, on: .iOS(.v13, .v14, .v15, .v16, .v17, .v18)) {
 ///                 print(type(of: $0)) // UIDatePicker
 ///             }
 ///     }
@@ -28,7 +28,7 @@ import SwiftUI
 ///
 ///     var body: some View {
 ///         DatePicker("Pick a date", selection: $date)
-///             .introspect(.datePicker, on: .macOS(.v10_15, .v11, .v12, .v13, .v14)) {
+///             .introspect(.datePicker, on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15)) {
 ///                 print(type(of: $0)) // NSDatePicker
 ///             }
 ///     }
@@ -43,7 +43,7 @@ import SwiftUI
 ///
 ///     var body: some View {
 ///         DatePicker("Pick a date", selection: $date)
-///             .introspect(.datePicker, on: .visionOS(.v1)) {
+///             .introspect(.datePicker, on: .visionOS(.v1, .v2)) {
 ///                 print(type(of: $0)) // UIDatePicker
 ///             }
 ///     }
@@ -63,10 +63,12 @@ extension iOSViewVersion<DatePickerType, UIDatePicker> {
     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<DatePickerType, UIDatePicker> {
     public static let v1 = Self(for: .v1)
+    public static let v2 = Self(for: .v2)
 }
 #elseif canImport(AppKit)
 extension macOSViewVersion<DatePickerType, NSDatePicker> {
@@ -75,6 +77,7 @@ extension macOSViewVersion<DatePickerType, NSDatePicker> {
     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
 #endif

Sources/ViewTypes/DatePickerWithCompactStyle.swift

@@ -12,7 +12,7 @@ import SwiftUI
 ///     var body: some View {
 ///         DatePicker("Pick a date", selection: $date)
 ///             .datePickerStyle(.compact)
-///             .introspect(.datePicker(style: .compact), on: .iOS(.v14, .v15, .v16, .v17)) {
+///             .introspect(.datePicker(style: .compact), on: .iOS(.v14, .v15, .v16, .v17, .v18)) {
 ///                 print(type(of: $0)) // UIDatePicker
 ///             }
 ///     }
@@ -32,7 +32,7 @@ import SwiftUI
 ///     var body: some View {
 ///         DatePicker("Pick a date", selection: $date)
 ///             .datePickerStyle(.compact)
-///             .introspect(.datePicker(style: .compact), on: .macOS(.v10_15_4, .v11, .v12, .v13, .v14)) {
+///             .introspect(.datePicker(style: .compact), on: .macOS(.v10_15_4, .v11, .v12, .v13, .v14, .v15)) {
 ///                 print(type(of: $0)) // NSDatePicker
 ///             }
 ///     }
@@ -48,7 +48,7 @@ import SwiftUI
 ///     var body: some View {
 ///         DatePicker("Pick a date", selection: $date)
 ///             .datePickerStyle(.compact)
-///             .introspect(.datePicker(style: .compact), on: .visionOS(.v1)) {
+///             .introspect(.datePicker(style: .compact), on: .visionOS(.v1, .v2)) {
 ///                 print(type(of: $0)) // UIDatePicker
 ///             }
 ///     }
@@ -73,10 +73,12 @@ extension iOSViewVersion<DatePickerWithCompactStyleType, UIDatePicker> {
     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<DatePickerWithCompactStyleType, UIDatePicker> {
     public static let v1 = Self(for: .v1)
+    public static let v1 = Self(for: .v2)
 }
 #elseif canImport(AppKit) && !targetEnvironment(macCatalyst)
 extension macOSViewVersion<DatePickerWithCompactStyleType, NSDatePicker> {
@@ -87,6 +89,7 @@ extension macOSViewVersion<DatePickerWithCompactStyleType, NSDatePicker> {
     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
 #endif

Sources/ViewTypes/DatePickerWithFieldStyle.swift

@@ -20,7 +20,7 @@ import SwiftUI
 ///     var body: some View {
 ///         DatePicker("Pick a date", selection: $date)
 ///             .datePickerStyle(.field)
-///             .introspect(.datePicker(style: .field), on: .macOS(.v10_15, .v11, .v12, .v13, .v14)) {
+///             .introspect(.datePicker(style: .field), on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15)) {
 ///                 print(type(of: $0)) // NSDatePicker
 ///             }
 ///     }
@@ -48,6 +48,7 @@ extension macOSViewVersion<DatePickerWithFieldStyleType, NSDatePicker> {
     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
 #endif

Sources/ViewTypes/DatePickerWithGraphicalStyle.swift

@@ -12,7 +12,7 @@ import SwiftUI
 ///     var body: some View {
 ///         DatePicker("Pick a date", selection: $date)
 ///             .datePickerStyle(.graphical)
-///             .introspect(.datePicker(style: .graphical), on: .iOS(.v14, .v15, .v16, .v17)) {
+///             .introspect(.datePicker(style: .graphical), on: .iOS(.v14, .v15, .v16, .v17, .v18)) {
 ///                 print(type(of: $0)) // UIDatePicker
 ///             }
 ///     }
@@ -32,7 +32,7 @@ import SwiftUI
 ///     var body: some View {
 ///         DatePicker("Pick a date", selection: $date)
 ///             .datePickerStyle(.graphical)
-///             .introspect(.datePicker(style: .graphical), on: .macOS(.v10_15, .v11, .v12, .v13, .v14)) {
+///             .introspect(.datePicker(style: .graphical), on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15)) {
 ///                 print(type(of: $0)) // NSDatePicker
 ///             }
 ///     }
@@ -48,7 +48,7 @@ import SwiftUI
 ///     var body: some View {
 ///         DatePicker("Pick a date", selection: $date)
 ///             .datePickerStyle(.graphical)
-///             .introspect(.datePicker(style: .graphical), on: .visionOS(.v1)) {
+///             .introspect(.datePicker(style: .graphical), on: .visionOS(.v1, .v2)) {
 ///                 print(type(of: $0)) // UIDatePicker
 ///             }
 ///     }
@@ -73,10 +73,12 @@ extension iOSViewVersion<DatePickerWithGraphicalStyleType, UIDatePicker> {
     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<DatePickerWithGraphicalStyleType, UIDatePicker> {
     public static let v1 = Self(for: .v1)
+    public static let v2 = Self(for: .v2)
 }
 #elseif canImport(AppKit) && !targetEnvironment(macCatalyst)
 extension macOSViewVersion<DatePickerWithGraphicalStyleType, NSDatePicker> {
@@ -85,6 +87,7 @@ extension macOSViewVersion<DatePickerWithGraphicalStyleType, NSDatePicker> {
     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
 #endif

Sources/ViewTypes/DatePickerWithStepperFieldStyle.swift

@@ -20,7 +20,7 @@ import SwiftUI
 ///     var body: some View {
 ///         DatePicker("Pick a date", selection: $date)
 ///             .datePickerStyle(.stepperField)
-///             .introspect(.datePicker(style: .stepperField), on: .macOS(.v10_15, .v11, .v12, .v13, .v14)) {
+///             .introspect(.datePicker(style: .stepperField), on: .macOS(.v10_15, .v11, .v12, .v13, .v14, .v15)) {
 ///                 print(type(of: $0)) // NSDatePicker
 ///             }
 ///     }
@@ -48,6 +48,7 @@ extension macOSViewVersion<DatePickerWithStepperFieldStyleType, NSDatePicker> {
     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
 #endif