Make the rest actually work in Swift 6

GeorgeElsham · GeorgeElsham · commit da67233fa97f · 2024-06-28T22:29:46.000+01:00
diff --git a/Sources/Introspect.swift b/Sources/Introspect.swift
@@ -4,7 +4,7 @@ import SwiftUI
 /// The scope of introspection i.e. where introspect should look to find
 /// the desired target view relative to the applied `.introspect(...)`
 /// modifier.
-public struct IntrospectionScope: OptionSet {
+public struct IntrospectionScope: OptionSet, Sendable {
     /// Look within the `receiver` of the `.introspect(...)` modifier.
     public static let receiver = Self(rawValue: 1 << 0)
     /// Look for an `ancestor` relative to the `.introspect(...)` modifier.
@@ -96,6 +96,7 @@ struct IntrospectModifier<SwiftUIViewType: IntrospectableViewType, PlatformSpeci
     }
 }
 
+@MainActor
 public protocol PlatformEntity: AnyObject {
     associatedtype Base: PlatformEntity
 
diff --git a/Sources/IntrospectionSelector.swift b/Sources/IntrospectionSelector.swift
@@ -5,7 +5,7 @@ public struct IntrospectionSelector<Target: PlatformEntity>: Sendable {
     public static var `default`: Self { .from(Target.self, selector: { $0 }) }
 
     @_spi(Advanced)
-    public static func from<Entry: PlatformEntity>(_ entryType: Entry.Type, selector: @escaping (Entry) -> Target?) -> Self {
+    public static func from<Entry: PlatformEntity>(_ entryType: Entry.Type, selector: @MainActor @Sendable @escaping (Entry) -> Target?) -> Self {
         .init(
             receiverSelector: { controller in
                 controller.as(Entry.Base.self)?.receiver(ofType: Entry.self).flatMap(selector)
diff --git a/Sources/IntrospectionView.swift b/Sources/IntrospectionView.swift
@@ -4,7 +4,7 @@ import SwiftUI
 typealias IntrospectionViewID = UUID
 
 fileprivate enum IntrospectionStore {
-    static var shared: [IntrospectionViewID: Pair] = [:]
+    @MainActor static var shared: [IntrospectionViewID: Pair] = [:]
 
     struct Pair {
         weak var controller: IntrospectionPlatformViewController?
@@ -13,7 +13,7 @@ fileprivate enum IntrospectionStore {
 }
 
 extension PlatformEntity {
-    var introspectionAnchorEntity: Base? {
+    @MainActor var introspectionAnchorEntity: Base? {
         if let introspectionController = self as? IntrospectionPlatformViewController {
             return IntrospectionStore.shared[introspectionController.id]?.anchor~
         }
diff --git a/Sources/PlatformView.swift b/Sources/PlatformView.swift
@@ -19,6 +19,7 @@ typealias _PlatformViewControllerRepresentable = UIViewControllerRepresentable
 typealias _PlatformViewControllerRepresentable = NSViewControllerRepresentable
 #endif
 
+@MainActor
 protocol PlatformViewControllerRepresentable: _PlatformViewControllerRepresentable {
     #if canImport(UIKit)
     typealias ViewController = UIViewControllerType
diff --git a/Sources/RuntimeWarnings.swift b/Sources/RuntimeWarnings.swift
@@ -56,7 +56,7 @@ func runtimeWarn(
     //
     // Feedback filed: https://gist.github.com/stephencelis/a8d06383ed6ccde3e5ef5d1b3ad52bbc
     @usableFromInline
-    let dso = { () -> UnsafeMutableRawPointer in
+    nonisolated(unsafe) let dso = { () -> UnsafeMutableRawPointer in
       let count = _dyld_image_count()
       for i in 0..<count {
         if let name = _dyld_get_image_name(i) {
diff --git a/Sources/ViewTypes/FullScreenCover.swift b/Sources/ViewTypes/FullScreenCover.swift
@@ -80,7 +80,7 @@ extension iOSViewVersion<FullScreenCoverType, UIPresentationController> {
     public static let v18 = Self(for: .v18, selector: selector)
 
     private static var selector: IntrospectionSelector<UIPresentationController> {
-        .from(UIViewController.self, selector: \.presentationController)
+        .from(UIViewController.self, selector: { $0.presentationController })
     }
 }
 
@@ -94,7 +94,7 @@ extension tvOSViewVersion<FullScreenCoverType, UIPresentationController> {
     public static let v18 = Self(for: .v18, selector: selector)
 
     private static var selector: IntrospectionSelector<UIPresentationController> {
-        .from(UIViewController.self, selector: \.presentationController)
+        .from(UIViewController.self, selector: { $0.presentationController })
     }
 }
 
@@ -103,7 +103,7 @@ extension visionOSViewVersion<FullScreenCoverType, UIPresentationController> {
     public static let v2 = Self(for: .v2, selector: selector)
 
     private static var selector: IntrospectionSelector<UIPresentationController> {
-        .from(UIViewController.self, selector: \.presentationController)
+        .from(UIViewController.self, selector: { $0.presentationController })
     }
 }
 #endif
diff --git a/Sources/ViewTypes/Popover.swift b/Sources/ViewTypes/Popover.swift
@@ -65,7 +65,7 @@ extension iOSViewVersion<PopoverType, UIPopoverPresentationController> {
     public static let v18 = Self(for: .v18, selector: selector)
 
     private static var selector: IntrospectionSelector<UIPopoverPresentationController> {
-        .from(UIViewController.self, selector: \.popoverPresentationController)
+        .from(UIViewController.self, selector: { $0.popoverPresentationController })
     }
 }
 
@@ -74,7 +74,7 @@ extension visionOSViewVersion<PopoverType, UIPopoverPresentationController> {
     public static let v2 = Self(for: .v2, selector: selector)
 
     private static var selector: IntrospectionSelector<UIPopoverPresentationController> {
-        .from(UIViewController.self, selector: \.popoverPresentationController)
+        .from(UIViewController.self, selector: { $0.popoverPresentationController })
     }
 }
 #endif
diff --git a/Sources/ViewTypes/Sheet.swift b/Sources/ViewTypes/Sheet.swift
@@ -79,7 +79,7 @@ extension iOSViewVersion<SheetType, UIPresentationController> {
     public static let v18 = Self(for: .v18, selector: selector)
 
     private static var selector: IntrospectionSelector<UIPresentationController> {
-        .from(UIViewController.self, selector: \.presentationController)
+        .from(UIViewController.self, selector: { $0.presentationController })
     }
 }
 
@@ -96,7 +96,7 @@ extension iOSViewVersion<SheetType, UISheetPresentationController> {
     public static let v18 = Self(for: .v18, selector: selector)
 
     private static var selector: IntrospectionSelector<UISheetPresentationController> {
-        .from(UIViewController.self, selector: \.sheetPresentationController)
+        .from(UIViewController.self, selector: { $0.sheetPresentationController })
     }
 }
 
@@ -106,7 +106,7 @@ extension visionOSViewVersion<SheetType, UISheetPresentationController> {
     public static let v2 = Self(for: .v2, selector: selector)
 
     private static var selector: IntrospectionSelector<UISheetPresentationController> {
-        .from(UIViewController.self, selector: \.sheetPresentationController)
+        .from(UIViewController.self, selector: { $0.sheetPresentationController })
     }
 }
 #endif
@@ -120,7 +120,7 @@ extension tvOSViewVersion<SheetType, UIPresentationController> {
     public static let v18 = Self(for: .v18, selector: selector)
 
     private static var selector: IntrospectionSelector<UIPresentationController> {
-        .from(UIViewController.self, selector: \.presentationController)
+        .from(UIViewController.self, selector: { $0.presentationController })
     }
 }
 #endif
diff --git a/Sources/ViewTypes/Window.swift b/Sources/ViewTypes/Window.swift
@@ -70,7 +70,7 @@ extension iOSViewVersion<WindowType, UIWindow> {
     public static let v18 = Self(for: .v18, selector: selector)
 
     private static var selector: IntrospectionSelector<UIWindow> {
-        .from(UIView.self, selector: \.window)
+        .from(UIView.self, selector: { $0.window })
     }
 }
 
@@ -83,7 +83,7 @@ extension tvOSViewVersion<WindowType, UIWindow> {
     public static let v18 = Self(for: .v18, selector: selector)
 
     private static var selector: IntrospectionSelector<UIWindow> {
-        .from(UIView.self, selector: \.window)
+        .from(UIView.self, selector: { $0.window })
     }
 }
 
@@ -92,7 +92,7 @@ extension visionOSViewVersion<WindowType, UIWindow> {
     public static let v2 = Self(for: .v2, selector: selector)
 
     private static var selector: IntrospectionSelector<UIWindow> {
-        .from(UIView.self, selector: \.window)
+        .from(UIView.self, selector: { $0.window })
     }
 }
 #elseif canImport(AppKit)
@@ -105,7 +105,7 @@ extension macOSViewVersion<WindowType, NSWindow> {
     public static let v15 = Self(for: .v15, selector: selector)
 
     private static var selector: IntrospectionSelector<NSWindow> {
-        .from(NSView.self, selector: \.window)
+        .from(NSView.self, selector: { $0.window })
     }
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import SwiftUI`
`4`	`4`	`/// The scope of introspection i.e. where introspect should look to find`
`5`	`5`	/// the desired target view relative to the applied `.introspect(...)`
`6`	`6`	`/// modifier.`
`7`		`-public struct IntrospectionScope: OptionSet {`
	`7`	`+public struct IntrospectionScope: OptionSet, Sendable {`
`8`	`8`	/// Look within the `receiver` of the `.introspect(...)` modifier.
`9`	`9`	`public static let receiver = Self(rawValue: 1 << 0)`
`10`	`10`	/// Look for an `ancestor` relative to the `.introspect(...)` modifier.
`@@ -96,6 +96,7 @@ struct IntrospectModifier<SwiftUIViewType: IntrospectableViewType, PlatformSpeci`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
	`99`	`+@MainActor`
`99`	`100`	`public protocol PlatformEntity: AnyObject {`
`100`	`101`	`associatedtype Base: PlatformEntity`
`101`	`102`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import SwiftUI`
`4`	`4`	`typealias IntrospectionViewID = UUID`
`5`	`5`
`6`	`6`	`fileprivate enum IntrospectionStore {`
`7`		`- static var shared: [IntrospectionViewID: Pair] = [:]`
	`7`	`+ @MainActor static var shared: [IntrospectionViewID: Pair] = [:]`
`8`	`8`
`9`	`9`	`struct Pair {`
`10`	`10`	`weak var controller: IntrospectionPlatformViewController?`
`@@ -13,7 +13,7 @@ fileprivate enum IntrospectionStore {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`extension PlatformEntity {`
`16`		`- var introspectionAnchorEntity: Base? {`
	`16`	`+ @MainActor var introspectionAnchorEntity: Base? {`
`17`	`17`	`if let introspectionController = self as? IntrospectionPlatformViewController {`
`18`	`18`	`return IntrospectionStore.shared[introspectionController.id]?.anchor~`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ extension iOSViewVersion<FullScreenCoverType, UIPresentationController> {`
`80`	`80`	`public static let v18 = Self(for: .v18, selector: selector)`
`81`	`81`
`82`	`82`	`private static var selector: IntrospectionSelector<UIPresentationController> {`
`83`		`- .from(UIViewController.self, selector: \.presentationController)`
	`83`	`+ .from(UIViewController.self, selector: { $0.presentationController })`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`@@ -94,7 +94,7 @@ extension tvOSViewVersion<FullScreenCoverType, UIPresentationController> {`
`94`	`94`	`public static let v18 = Self(for: .v18, selector: selector)`
`95`	`95`
`96`	`96`	`private static var selector: IntrospectionSelector<UIPresentationController> {`
`97`		`- .from(UIViewController.self, selector: \.presentationController)`
	`97`	`+ .from(UIViewController.self, selector: { $0.presentationController })`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`@@ -103,7 +103,7 @@ extension visionOSViewVersion<FullScreenCoverType, UIPresentationController> {`
`103`	`103`	`public static let v2 = Self(for: .v2, selector: selector)`
`104`	`104`
`105`	`105`	`private static var selector: IntrospectionSelector<UIPresentationController> {`
`106`		`- .from(UIViewController.self, selector: \.presentationController)`
	`106`	`+ .from(UIViewController.self, selector: { $0.presentationController })`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ extension iOSViewVersion<PopoverType, UIPopoverPresentationController> {`
`65`	`65`	`public static let v18 = Self(for: .v18, selector: selector)`
`66`	`66`
`67`	`67`	`private static var selector: IntrospectionSelector<UIPopoverPresentationController> {`
`68`		`- .from(UIViewController.self, selector: \.popoverPresentationController)`
	`68`	`+ .from(UIViewController.self, selector: { $0.popoverPresentationController })`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`@@ -74,7 +74,7 @@ extension visionOSViewVersion<PopoverType, UIPopoverPresentationController> {`
`74`	`74`	`public static let v2 = Self(for: .v2, selector: selector)`
`75`	`75`
`76`	`76`	`private static var selector: IntrospectionSelector<UIPopoverPresentationController> {`
`77`		`- .from(UIViewController.self, selector: \.popoverPresentationController)`
	`77`	`+ .from(UIViewController.self, selector: { $0.popoverPresentationController })`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ extension iOSViewVersion<SheetType, UIPresentationController> {`
`79`	`79`	`public static let v18 = Self(for: .v18, selector: selector)`
`80`	`80`
`81`	`81`	`private static var selector: IntrospectionSelector<UIPresentationController> {`
`82`		`- .from(UIViewController.self, selector: \.presentationController)`
	`82`	`+ .from(UIViewController.self, selector: { $0.presentationController })`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`@@ -96,7 +96,7 @@ extension iOSViewVersion<SheetType, UISheetPresentationController> {`
`96`	`96`	`public static let v18 = Self(for: .v18, selector: selector)`
`97`	`97`
`98`	`98`	`private static var selector: IntrospectionSelector<UISheetPresentationController> {`
`99`		`- .from(UIViewController.self, selector: \.sheetPresentationController)`
	`99`	`+ .from(UIViewController.self, selector: { $0.sheetPresentationController })`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`@@ -106,7 +106,7 @@ extension visionOSViewVersion<SheetType, UISheetPresentationController> {`
`106`	`106`	`public static let v2 = Self(for: .v2, selector: selector)`
`107`	`107`
`108`	`108`	`private static var selector: IntrospectionSelector<UISheetPresentationController> {`
`109`		`- .from(UIViewController.self, selector: \.sheetPresentationController)`
	`109`	`+ .from(UIViewController.self, selector: { $0.sheetPresentationController })`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`#endif`
`@@ -120,7 +120,7 @@ extension tvOSViewVersion<SheetType, UIPresentationController> {`
`120`	`120`	`public static let v18 = Self(for: .v18, selector: selector)`
`121`	`121`
`122`	`122`	`private static var selector: IntrospectionSelector<UIPresentationController> {`
`123`		`- .from(UIViewController.self, selector: \.presentationController)`
	`123`	`+ .from(UIViewController.self, selector: { $0.presentationController })`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ extension iOSViewVersion<WindowType, UIWindow> {`
`70`	`70`	`public static let v18 = Self(for: .v18, selector: selector)`
`71`	`71`
`72`	`72`	`private static var selector: IntrospectionSelector<UIWindow> {`
`73`		`- .from(UIView.self, selector: \.window)`
	`73`	`+ .from(UIView.self, selector: { $0.window })`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`@@ -83,7 +83,7 @@ extension tvOSViewVersion<WindowType, UIWindow> {`
`83`	`83`	`public static let v18 = Self(for: .v18, selector: selector)`
`84`	`84`
`85`	`85`	`private static var selector: IntrospectionSelector<UIWindow> {`
`86`		`- .from(UIView.self, selector: \.window)`
	`86`	`+ .from(UIView.self, selector: { $0.window })`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`@@ -92,7 +92,7 @@ extension visionOSViewVersion<WindowType, UIWindow> {`
`92`	`92`	`public static let v2 = Self(for: .v2, selector: selector)`
`93`	`93`
`94`	`94`	`private static var selector: IntrospectionSelector<UIWindow> {`
`95`		`- .from(UIView.self, selector: \.window)`
	`95`	`+ .from(UIView.self, selector: { $0.window })`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`#elseif canImport(AppKit)`
`@@ -105,7 +105,7 @@ extension macOSViewVersion<WindowType, NSWindow> {`
`105`	`105`	`public static let v15 = Self(for: .v15, selector: selector)`
`106`	`106`
`107`	`107`	`private static var selector: IntrospectionSelector<NSWindow> {`
`108`		`- .from(NSView.self, selector: \.window)`
	`108`	`+ .from(NSView.self, selector: { $0.window })`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`#endif`