Minor Strict Concurrency fix (#41)

# Minor Strict Concurrency fix

## ♻️ Current situation & Problem
This PR adds a missing Sendable conformance.


## ⚙️ Release Notes 
* Add missing Sendable conformance.
* Allow arbitrary Regex Output types with ValidationRules (e.g., allows
to pass Regex instances built with RegexBuilder).
* Don't require a `ValidationEngine` in the environment with
`VerifiableTextField` for greater flexibility.


## 📚 Documentation
--


## ✅ Testing
--


## 📝 Code of Conduct & Contributing Guidelines 

By submitting creating this pull request, you agree to follow our [Code
of
Conduct](https://github.com/StanfordSpezi/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordSpezi/.github/blob/main/CONTRIBUTING.md):
- [x] I agree to follow the [Code of
Conduct](https://github.com/StanfordSpezi/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordSpezi/.github/blob/main/CONTRIBUTING.md).

.github/workflows/build-and-test.yml

@@ -24,6 +24,16 @@ jobs:
       scheme: SpeziViews-Package
       resultBundle: SpeziViews-iOS.xcresult
       artifactname: SpeziViews-iOS.xcresult
+  buildandtest_ios_latest:
+    name: Build and Test Swift Package iOS Latest
+    uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
+    with:
+      runsonlabels: '["macOS", "self-hosted"]'
+      scheme: SpeziViews-Package
+      xcodeversion: latest
+      swiftVersion: 6
+      resultBundle: SpeziViews-iOS-Latest.xcresult
+      artifactname: SpeziViews-iOS-Latest.xcresult
   buildandtest_watchos:
     name: Build and Test Swift Package watchOS
     uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
@@ -69,14 +79,25 @@ jobs:
       scheme: TestApp
       resultBundle: TestApp-iOS.xcresult
       artifactname: TestApp-iOS.xcresult
+  buildandtestuitests_ios_latest:
+    name: Build and Test UI Tests iOS Latest
+    uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
+    with:
+      runsonlabels: '["macOS", "self-hosted"]'
+      path: Tests/UITests
+      scheme: TestApp
+      xcodeversion: latest
+      swiftVersion: 6
+      resultBundle: TestApp-iOS-Latest.xcresult
+      artifactname: TestApp-iOS-Latest.xcresult
   buildandtestuitests_ipad:
     name: Build and Test UI Tests iPadOS
     uses: StanfordSpezi/.github/.github/workflows/xcodebuild-or-fastlane.yml@v2
     with:
       runsonlabels: '["macOS", "self-hosted"]'
       path: Tests/UITests
       scheme: TestApp
-      destination: 'platform=iOS Simulator,name=iPad Air (5th generation)'
+      destination: 'platform=iOS Simulator,name=iPad Pro 11-inch (M4)'
       resultBundle: TestApp-iPad.xcresult
       artifactname: TestApp-iPad.xcresult
   buildandtestuitests_visionos:

Package.swift

@@ -13,9 +13,9 @@ import PackageDescription
 
 
 #if swift(<6)
-let swiftConcurrency: SwiftSetting = .enableExperimentalFeature("SwiftConcurrency")
+let swiftConcurrency: SwiftSetting = .enableExperimentalFeature("StrictConcurrency")
 #else
-let swiftConcurrency: SwiftSetting = .enableUpcomingFeature("SwiftConcurrency")
+let swiftConcurrency: SwiftSetting = .enableUpcomingFeature("StrictConcurrency")
 #endif
 
 
@@ -37,7 +37,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/StanfordSpezi/Spezi.git", from: "1.3.0"),
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0"),
-        .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.15.3")
+        .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.17.0")
     ] + swiftLintPackage(),
     targets: [
         .target(

Sources/SpeziValidation/Configuration/ValidationEngine+Configuration.swift

@@ -39,6 +39,9 @@ extension ValidationEngine {
 }
 
 
+extension ValidationEngine.Configuration: Sendable {}
+
+
 extension EnvironmentValues {
     /// Access the ``ValidationEngine/Configuration-swift.struct`` of a ValidationEngine through the environment.
     ///

Sources/SpeziValidation/ValidationEngine.swift

@@ -196,6 +196,7 @@ public class ValidationEngine: Identifiable {
         computeValidation(input: input, source: .manual)
     }
 
+    @MainActor
     private func debounce(_ task: @escaping () -> Void) {
         debounceTask = Task {
             try? await Task.sleep(for: debounceDuration)

Sources/SpeziValidation/ValidationRule.swift

@@ -63,11 +63,11 @@ enum CascadingValidationEffect {
 /// - ``minimalPassword``
 /// - ``mediumPassword``
 /// - ``strongPassword``
-public struct ValidationRule: Identifiable, @unchecked Sendable, Equatable {
+public struct ValidationRule: Identifiable, Sendable, Equatable {
     // we guarantee that the closure is only executed on the main thread
     /// A unique identifier for the ``ValidationRule``. Can be used to, e.g., match a ``FailedValidationResult`` to the ValidationRule.
     public let id: UUID
-    private let rule: (String) -> Bool
+    private let rule: @Sendable (String) -> Bool
     /// A localized message that describes a recovery suggestion if the validation rule fails.
     public let message: LocalizedStringResource
     let effect: CascadingValidationEffect
@@ -76,7 +76,7 @@ public struct ValidationRule: Identifiable, @unchecked Sendable, Equatable {
     // swiftlint:disable:next function_default_parameter_at_end
     init(
         id: UUID = UUID(),
-        ruleClosure: @escaping (String) -> Bool,
+        ruleClosure: @escaping @Sendable (String) -> Bool,
         message: LocalizedStringResource,
         effect: CascadingValidationEffect = .continue
     ) {
@@ -92,7 +92,7 @@ public struct ValidationRule: Identifiable, @unchecked Sendable, Equatable {
     /// - Parameters:
     ///   - rule: An escaping closure that validates a `String` and returns a boolean result.
     ///   - message: A `String` message to display if validation fails.
-    public init(rule: @escaping (String) -> Bool, message: LocalizedStringResource) {
+    public init(rule: @escaping @Sendable (String) -> Bool, message: LocalizedStringResource) {
         self.init(ruleClosure: rule, message: message)
     }
 
@@ -102,7 +102,7 @@ public struct ValidationRule: Identifiable, @unchecked Sendable, Equatable {
     ///   - rule: An escaping closure that validates a `String` and returns a boolean result.
     ///   - message: A `String` message to display if validation fails.
     ///   - bundle: The Bundle to localize for.
-    public init(rule: @escaping (String) -> Bool, message: String.LocalizationValue, bundle: Bundle) {
+    public init(rule: @escaping @Sendable (String) -> Bool, message: String.LocalizationValue, bundle: Bundle) {
         self.init(ruleClosure: rule, message: LocalizedStringResource(message, bundle: .atURL(from: bundle)))
     }
 
@@ -111,8 +111,12 @@ public struct ValidationRule: Identifiable, @unchecked Sendable, Equatable {
     /// - Parameters:
     ///   - regex: A `Regex` regular expression to match for validating text. Note, the `wholeMatch` operation is used.
     ///   - message: A `LocalizedStringResource` message to display if validation fails.
-    public init(regex: Regex<AnyRegexOutput>, message: LocalizedStringResource) {
-        self.init(ruleClosure: { (try? regex.wholeMatch(in: $0) != nil) ?? false }, message: message)
+    public init<Output>(regex: Regex<Output>, message: LocalizedStringResource) {
+        // Regex might not be Sendable, depending how it was constructed (e.g., might capture a non-Sendable transform closure).
+        // This is still an issue that is actively discussed https://forums.swift.org/t/should-regex-be-sendable/69529
+        // so we are ignoring it for now.
+        nonisolated(unsafe) let regexTmp = regex
+        self.init(ruleClosure: { ( try? regexTmp.wholeMatch(in: $0) != nil) ?? false }, message: message)
     }
 
     /// Creates a validation rule from a regular expression.
@@ -121,7 +125,7 @@ public struct ValidationRule: Identifiable, @unchecked Sendable, Equatable {
     ///   - regex: A `Regex` regular expression to match for validating text. Note, the `wholeMatch` operation is used.
     ///   - message: A `String` message to display if validation fails.
     ///   - bundle: The Bundle to localize for.
-    public init(regex: Regex<AnyRegexOutput>, message: String.LocalizationValue, bundle: Bundle) {
+    public init<Output>(regex: Regex<Output>, message: String.LocalizationValue, bundle: Bundle) {
         self.init(regex: regex, message: LocalizedStringResource(message, bundle: .atURL(from: bundle)))
     }
 

Sources/SpeziValidation/Views/VerifiableTextField.swift

@@ -30,7 +30,7 @@ public struct VerifiableTextField<FieldLabel: View, FieldFooter: View>: View {
     @Binding private var text: String
 
     @Environment(ValidationEngine.self)
-    var validationEngine
+    var validationEngine: ValidationEngine?
 
     public var body: some View {
         VStack {
@@ -44,9 +44,11 @@ public struct VerifiableTextField<FieldLabel: View, FieldFooter: View>: View {
             }
 
             HStack {
-                ValidationResultsView(results: validationEngine.displayedValidationResults)
+                if let validationEngine {
+                    ValidationResultsView(results: validationEngine.displayedValidationResults)
 
-                Spacer()
+                    Spacer()
+                }
 
                 textFieldFooter
             }

Sources/SpeziViews/Views/Button/AsyncButton.swift

@@ -37,8 +37,8 @@ enum AsyncButtonState {
 @MainActor
 public struct AsyncButton<Label: View>: View {
     private let role: ButtonRole?
-    private let action: () async throws -> Void
-    private let label: () -> Label
+    private let action: @MainActor () async throws -> Void
+    private let label: Label
 
     @Environment(\.defaultErrorDescription)
     var defaultErrorDescription
@@ -58,7 +58,7 @@ public struct AsyncButton<Label: View>: View {
 
     public var body: some View {
         Button(role: role, action: submitAction) {
-            label()
+            label
                 .processingOverlay(isProcessing: buttonState == .disabledAndProcessing || externallyProcessing)
         }
             .disabled(buttonState != .idle || externallyProcessing)
@@ -106,11 +106,11 @@ public struct AsyncButton<Label: View>: View {
     public init(
         role: ButtonRole? = nil,
         action: @escaping () async -> Void,
-        @ViewBuilder label: @escaping () -> Label
+        @ViewBuilder label: () -> Label
     ) {
         self.role = role
         self.action = action
-        self.label = label
+        self.label = label()
         self._viewState = .constant(.idle)
     }
 
@@ -162,12 +162,12 @@ public struct AsyncButton<Label: View>: View {
         role: ButtonRole? = nil,
         state: Binding<ViewState>,
         action: @escaping () async throws -> Void,
-        @ViewBuilder label: @escaping () -> Label
+        @ViewBuilder label: () -> Label
     ) {
         self.role = role
         self._viewState = state
         self.action = action
-        self.label = label
+        self.label = label()
     }
 
 

Sources/SpeziViews/Views/Drawing/CanvasView.swift

@@ -122,7 +122,7 @@ public struct CanvasView: View {
     /// The ``CanvasSizePreferenceKey`` enables outer views to get access to the current canvas size of the ``CanvasView``
     /// using the SwiftUI preference mechanisms.
     public struct CanvasSizePreferenceKey: PreferenceKey, Equatable {
-        public static var defaultValue: CGSize = .zero
+        public static let defaultValue: CGSize = .zero
 
 
         public static func reduce(value: inout CGSize, nextValue: () -> CGSize) {

Sources/SpeziViews/Views/Layout/HorizontalGeometryReader.swift

@@ -12,7 +12,7 @@ import SwiftUI
 /// Enables outer views to get access to the current width calculated by the ``HorizontalGeometryReader``
 /// using the SwiftUI preference mechanisms.
 public struct WidthPreferenceKey: PreferenceKey, Equatable {
-    public static var defaultValue: CGFloat = 0
+    public static let defaultValue: CGFloat = 0
 
 
     public static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) { }

Tests/SpeziViewsTests/SnapshotTests.swift

@@ -13,6 +13,7 @@ import XCTest
 
 
 final class SnapshotTests: XCTestCase {
+    @MainActor
     func testListRow() {
         let row = List {
             ListRow(verbatim: "San Francisco") {
@@ -33,6 +34,7 @@ final class SnapshotTests: XCTestCase {
 #endif
     }
 
+    @MainActor
     func testReverseLabelStyle() {
         let label = SwiftUI.Label("100 %", image: "battery.100")
             .labelStyle(.reverse)
@@ -43,9 +45,11 @@ final class SnapshotTests: XCTestCase {
 #endif
     }
 
+    @MainActor
     func testDismissButton() {
         let dismissButton = DismissButton()
 
+
 #if os(iOS)
         assertSnapshot(of: dismissButton, as: .image(layout: .device(config: .iPhone13Pro)), named: "iphone-regular")
         assertSnapshot(of: dismissButton, as: .image(layout: .device(config: .iPadPro11)), named: "ipad-regular")

Tests/SpeziViewsTests/SpeziValidationTests.swift

@@ -12,7 +12,7 @@ import XCTest
 
 final class SpeziValidationTests: XCTestCase {
     @MainActor
-    func testValidationDebounce() {
+    func testValidationDebounce() async throws {
         let engine = ValidationEngine(rules: .nonEmpty)
 
         engine.submit(input: "Valid")
@@ -23,7 +23,7 @@ final class SpeziValidationTests: XCTestCase {
         XCTAssertTrue(engine.inputValid)
         XCTAssertEqual(engine.validationResults, [])
 
-        sleep(1)
+        try await Task.sleep(for: .seconds(1))
         XCTAssertFalse(engine.inputValid)
         XCTAssertEqual(engine.validationResults.count, 1)
 

Tests/UITests/TestApp/PersonalInfoTests/SpeziPersonalInfoTests.swift

@@ -16,10 +16,12 @@ enum SpeziPersonalInfoTests: String, TestAppTests {
     case userProfile = "User Profile"
 
     @ViewBuilder
+    @MainActor
     private var nameFields: some View {
         NameFieldsTestView()
     }
 
+    @MainActor
     @ViewBuilder
     private var userProfile: some View {
         UserProfileView(

Tests/UITests/TestApp/ViewsTests/OperationStateTestView.swift

@@ -52,7 +52,7 @@ struct OperationStateTestView: View {
         }
             .task {
                 operationState = .someOperationStep
-                try? await Task.sleep(for: .seconds(10))
+                try? await Task.sleep(for: .seconds(2))
                 operationState = .error(
                     AnyLocalizedError(
                         error: testError,

Tests/UITests/TestApp/ViewsTests/SpeziViewsTests.swift

@@ -33,18 +33,21 @@ enum SpeziViewsTests: String, TestAppTests {
 
     #if canImport(PencilKit) && !os(macOS)
     @ViewBuilder
+    @MainActor
     private var canvas: some View {
         CanvasTestView()
     }
     #endif
 
     @ViewBuilder
+    @MainActor
     private var geometryReader: some View {
         GeometryReaderTestView()
     }
 
     #if !os(macOS)
     @ViewBuilder
+    @MainActor
     private var label: some View {
         Label(
             "LABEL_TEXT",
@@ -65,11 +68,13 @@ enum SpeziViewsTests: String, TestAppTests {
     #endif
 
     @ViewBuilder
+    @MainActor
     private var markdownView: some View {
         MarkdownViewTestView()
     }
 
     @ViewBuilder
+    @MainActor
     private var lazyText: some View {
         ScrollView {
             LazyText(
@@ -86,36 +91,43 @@ enum SpeziViewsTests: String, TestAppTests {
     }
 
     @ViewBuilder
+    @MainActor
     private var viewState: some View {
         ViewStateTestView()
     }
 
     @ViewBuilder
+    @MainActor
     private var operationState: some View {
         OperationStateTestView()
     }
 
     @ViewBuilder
+    @MainActor
     private var viewStateMapper: some View {
         ViewStateMapperTestView()
     }
 
     @ViewBuilder
+    @MainActor
     private var conditionalModifier: some View {
         ConditionalModifierTestView()
     }
 
     @ViewBuilder
+    @MainActor
     private var defaultErrorOnly: some View {
         ViewStateTestView(testError: .init(errorDescription: "Some error occurred!"))
     }
 
     @ViewBuilder
+    @MainActor
     private var defaultErrorDescription: some View {
         DefaultErrorDescriptionTestView()
     }
 
     @ViewBuilder
+    @MainActor
     private var asyncButton: some View {
         AsyncButtonTestView()
     }

Tests/UITests/TestApp/ViewsTests/ViewStateMapperView.swift

@@ -57,7 +57,7 @@ struct ViewStateMapperTestView: View {
         }
             .task {
                 operationState = .someOperationStep
-                try? await Task.sleep(for: .seconds(10))
+                try? await Task.sleep(for: .seconds(2))
                 operationState = .error(
                     AnyLocalizedError(
                         error: testError,