Support Xcode 16.2 onPreferenceChange SDK change (#48)

StanfordSpezi · Dec 12, 2024 · 2997114 · 2997114
1 parent f875144
commit 2997114
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 17 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -30,7 +30,7 @@ jobs:
     with:
       runsonlabels: '["macOS", "self-hosted"]'
       scheme: SpeziViews-Package
-      destination: 'platform=watchOS Simulator,name=Apple Watch Series 9 (45mm)'
+      destination: 'platform=watchOS Simulator,name=Apple Watch Series 10 (46mm)'
       resultBundle: SpeziViews-watchOS.xcresult
       artifactname: SpeziViews-watchOS.xcresult
   buildandtest_visionos:

diff --git a/Sources/SpeziValidation/ValidationRule.swift b/Sources/SpeziValidation/ValidationRule.swift
@@ -73,9 +73,8 @@ public struct ValidationRule: Identifiable, Sendable, Equatable {
     let effect: CascadingValidationEffect
 
 
-    // swiftlint:disable:next function_default_parameter_at_end
     init(
-        id: UUID = UUID(),
+        id: UUID = UUID(),  // swiftlint:disable:this function_default_parameter_at_end
         ruleClosure: @escaping @Sendable (String) -> Bool,
         message: LocalizedStringResource,
         effect: CascadingValidationEffect = .continue

diff --git a/Sources/SpeziViews/Views/Button/AsyncButton.swift b/Sources/SpeziViews/Views/Button/AsyncButton.swift
@@ -122,9 +122,9 @@ public struct AsyncButton<Label: View>: View {
     ///         It may also be used to externally control or observe the button's processing state.
     ///   - action: An asynchronous button action.
     @_disfavoredOverload
-    public init<Title: StringProtocol>( // swiftlint:disable:this function_default_parameter_at_end
+    public init<Title: StringProtocol>(
         _ title: Title,
-        role: ButtonRole? = nil,
+        role: ButtonRole? = nil,   // swiftlint:disable:this function_default_parameter_at_end
         state: Binding<ViewState>,
         action: @MainActor @escaping () async throws -> Void
     ) where Label == Text {
@@ -140,9 +140,9 @@ public struct AsyncButton<Label: View>: View {
     ///   - state: A ``ViewState`` binding that it used to propagate any error caught in the button action.
     ///         It may also be used to externally control or observe the button's processing state.
     ///   - action: An asynchronous button action.
-    public init( // swiftlint:disable:this function_default_parameter_at_end
+    public init(
         _ title: LocalizedStringResource,
-        role: ButtonRole? = nil,
+        role: ButtonRole? = nil,  // swiftlint:disable:this function_default_parameter_at_end
         state: Binding<ViewState>,
         action: @MainActor @escaping () async throws -> Void
     ) where Label == Text {
@@ -158,8 +158,8 @@ public struct AsyncButton<Label: View>: View {
     ///         It may also be used to externally control or observe the button's processing state.
     ///   - action: An asynchronous button action.
     ///   - label: The Button label.
-    public init( // swiftlint:disable:this function_default_parameter_at_end
-        role: ButtonRole? = nil,
+    public init(
+        role: ButtonRole? = nil,  // swiftlint:disable:this function_default_parameter_at_end
         state: Binding<ViewState>,
         action: @MainActor @escaping () async throws -> Void,
         @ViewBuilder label: () -> Label

diff --git a/Sources/SpeziViews/Views/Layout/HorizontalGeometryReader.swift b/Sources/SpeziViews/Views/Layout/HorizontalGeometryReader.swift
@@ -39,7 +39,19 @@ public struct HorizontalGeometryReader<Content: View>: View {
                 }
             )
             .onPreferenceChange(WidthPreferenceKey.self) { width in
-                self.width = width
+                // The `onPreferenceChange` view modfier now takes a `@Sendable` closure, therefore we cannot capture `@MainActor` isolated properties
+                // on the `View` directly anymore: https://developer.apple.com/documentation/swiftui/view/onpreferencechange(_:perform:)?changes=latest_minor
+                // However, as the `@Sendable` closure is still run on the MainActor (at least in my testing on 18.2 RC SDKs), we can use `MainActor.assumeIsolated`
+                // to avoid scheduling a `MainActor` `Task`, which could delay execution and cause unexpected UI behavior.
+                if Thread.isMainThread {
+                    MainActor.assumeIsolated {
+                        self.width = width
+                    }
+                } else {
+                    Task { @MainActor in
+                        self.width = width
+                    }
+                }
             }
     }
 

diff --git a/Tests/SpeziViewsTests/__Snapshots__/SnapshotTests/testListRow.ipad-XA3.png b/Tests/SpeziViewsTests/__Snapshots__/SnapshotTests/testListRow.ipad-XA3.png
diff --git a/Tests/SpeziViewsTests/__Snapshots__/SnapshotTests/testListRow.iphone-XA3.png b/Tests/SpeziViewsTests/__Snapshots__/SnapshotTests/testListRow.iphone-XA3.png
diff --git a/Tests/SpeziViewsTests/__Snapshots__/SnapshotTests/testListRow.iphone-regular.png b/Tests/SpeziViewsTests/__Snapshots__/SnapshotTests/testListRow.iphone-regular.png
diff --git a/Tests/UITests/TestApp/ViewsTests/CanvasTestView.swift b/Tests/UITests/TestApp/ViewsTests/CanvasTestView.swift
@@ -47,7 +47,16 @@ struct CanvasTestView: View {
             }
             .navigationBarTitleDisplayMode(.inline)
             .onPreferenceChange(CanvasView.CanvasSizePreferenceKey.self) { size in
-                self.receivedSize = size
+                // See `HorizontalGeometryReader.swift`
+                if Thread.isMainThread {
+                    MainActor.assumeIsolated {
+                        self.receivedSize = size
+                    }
+                } else {
+                    Task { @MainActor in
+                        self.receivedSize = size
+                    }
+                }
             }
     }
 }

diff --git a/Tests/UITests/UITests.xcodeproj/project.pbxproj b/Tests/UITests/UITests.xcodeproj/project.pbxproj
@@ -572,7 +572,7 @@
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_STRICT_CONCURRENCY = complete;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,7";
 			};
 			name = Debug;
@@ -606,7 +606,7 @@
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_STRICT_CONCURRENCY = complete;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,7";
 			};
 			name = Release;
@@ -629,7 +629,7 @@
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,7";
 				TEST_TARGET_NAME = TestApp;
 			};
@@ -652,7 +652,7 @@
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = NO;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,7";
 				TEST_TARGET_NAME = TestApp;
 			};
@@ -753,7 +753,7 @@
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_STRICT_CONCURRENCY = complete;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,7";
 			};
 			name = Test;
@@ -776,7 +776,7 @@
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2,7";
 				TEST_TARGET_NAME = TestApp;
 			};