Update to Swift 6

philptr · philptr · commit 359951c7729a · 2024-12-15T17:01:10.000-08:00
diff --git a/Example/PredicateViewExample.xcodeproj/project.pbxproj b/Example/PredicateViewExample.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		4A7236902CA8A677003DD1EC /* CustomExpressionDemoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A72368F2CA8A677003DD1EC /* CustomExpressionDemoView.swift */; };
 		4A7236922CA8A877003DD1EC /* PredicateDecodingDemoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A7236912CA8A877003DD1EC /* PredicateDecodingDemoView.swift */; };
 		4A7236942CA8A9B3003DD1EC /* ReadOnlyDemoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A7236932CA8A9B3003DD1EC /* ReadOnlyDemoView.swift */; };
+		4A7D7B472D0E8B5D0027A305 /* PredicateView in Frameworks */ = {isa = PBXBuildFile; productRef = 4A7D7B462D0E8B5D0027A305 /* PredicateView */; };
 		4ACACCED2C9F5C65003FA734 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4ACACCE82C9F5C65003FA734 /* ContentView.swift */; };
 		4ACACCEE2C9F5C65003FA734 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4ACACCE92C9F5C65003FA734 /* Item.swift */; };
 		4ACACCEF2C9F5C65003FA734 /* PredicateViewExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4ACACCEB2C9F5C65003FA734 /* PredicateViewExampleApp.swift */; };
@@ -42,6 +43,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4ACACCFE2C9F5E26003FA734 /* PredicateView in Frameworks */,
+				4A7D7B472D0E8B5D0027A305 /* PredicateView in Frameworks */,
 				4ACACCF72C9F5C9B003FA734 /* PredicateView in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -110,6 +112,7 @@
 			packageProductDependencies = (
 				4ACACCF32C9F5C78003FA734 /* PredicateView */,
 				4ACACCF62C9F5C9B003FA734 /* PredicateView */,
+				4A7D7B462D0E8B5D0027A305 /* PredicateView */,
 			);
 			productName = PredicateViewExample;
 			productReference = 4ACACCD12C9F5C56003FA734 /* PredicateViewExample.app */;
@@ -140,7 +143,7 @@
 			mainGroup = 4ACACCC82C9F5C56003FA734;
 			minimizedProjectReferenceProxies = 1;
 			packageReferences = (
-				4ACACCF52C9F5C9B003FA734 /* XCLocalSwiftPackageReference "../../PredicateView" */,
+				4A7D7B452D0E8B5D0027A305 /* XCLocalSwiftPackageReference "../../PredicateView" */,
 			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = 4ACACCD22C9F5C56003FA734 /* Products */;
@@ -395,13 +398,17 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		4ACACCF52C9F5C9B003FA734 /* XCLocalSwiftPackageReference "../../PredicateView" */ = {
+		4A7D7B452D0E8B5D0027A305 /* XCLocalSwiftPackageReference "../../PredicateView" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = ../../PredicateView;
 		};
 /* End XCLocalSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
+		4A7D7B462D0E8B5D0027A305 /* PredicateView */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = PredicateView;
+		};
 		4ACACCF32C9F5C78003FA734 /* PredicateView */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = PredicateView;
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.10
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -19,8 +19,11 @@ let package = Package(
         .package(url: "https://github.com/NoahKamara/CompoundPredicate", from: "0.1.0"),
     ],
     targets: [
-        .target(name: "PredicateView", dependencies: [
-            .product(name: "CompoundPredicate", package: "CompoundPredicate"),
-        ]),
+        .target(
+            name: "PredicateView",
+            dependencies: [
+                .product(name: "CompoundPredicate", package: "CompoundPredicate"),
+            ]
+        ),
     ]
 )
diff --git a/Sources/PredicateView/Attributes/ExpressionAttribute.swift b/Sources/PredicateView/Attributes/ExpressionAttribute.swift
@@ -17,7 +17,7 @@ public struct StandardAttribute<Expr>: ExpressionAttribute where Expr: Predicate
     public var value: Expr.AttributeValue
 }
 
-public struct MetadataAttribute<Expr, Metadata>: ExpressionAttribute where Expr: PredicateExpressionConvertible {
+public struct MetadataAttribute<Expr, Metadata>: ExpressionAttribute where Expr: PredicateExpressionConvertible, Metadata: Sendable {
     public var `operator`: Expr.Operator
     public var value: Expr.AttributeValue
     public var metadata: Metadata
diff --git a/Sources/PredicateView/Attributes/OperatorContainer.swift b/Sources/PredicateView/Attributes/OperatorContainer.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public protocol OperatorContainer: Equatable {
+public protocol OperatorContainer: Equatable, Sendable {
     associatedtype Expr: ExpressionProtocol
     var `operator`: Expr.Operator { get set }
 }
diff --git a/Sources/PredicateView/Expressions/Abstract/AnyExpression.swift b/Sources/PredicateView/Expressions/Abstract/AnyExpression.swift
@@ -7,12 +7,12 @@
 
 import Foundation
 
-public typealias ExpressionCompatible = Codable & Hashable
+public typealias ExpressionCompatible = Codable & Hashable & Sendable
 
 /// A generic struct that wraps any type conforming to the ``TitledExpression`` protocol.
 /// It provides type erasure for expressions, allowing different types of expressions
 /// to be used interchangeably as long as they share the same ``Root`` type.
-public struct AnyExpression<Root>: Identifiable {
+public struct AnyExpression<Root>: Identifiable, Sendable {
     /// The underlying expression that conforms to the ``TitledExpression`` protocol.
     public var wrappedValue: any TitledExpression<Root>
     
diff --git a/Sources/PredicateView/Expressions/Abstract/ContentExpression.swift b/Sources/PredicateView/Expressions/Abstract/ContentExpression.swift
@@ -13,7 +13,7 @@ public protocol ContentExpression<Root>: PredicateExpressionConvertible & Titled
     associatedtype ExprView = ContentExpressionView<Root, Self>
     associatedtype Result: View
     
-    @ViewBuilder
+    @ViewBuilder @MainActor
     static func makeContentView(_ value: Binding<AttributeValue>) -> Result
 }
 
@@ -25,7 +25,7 @@ public struct ContentExpressionView<Root, Expr: ContentExpression<Root>>: Expres
         self.expression = expression
     }
     
-    @ViewBuilder
+    @MainActor
     public var body: some View {
         @Binding(projectedValue: self.expression) var expression: Expr
         
diff --git a/Sources/PredicateView/Expressions/Abstract/ExpressionProtocol+ViewFactory.swift b/Sources/PredicateView/Expressions/Abstract/ExpressionProtocol+ViewFactory.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 extension ExpressionProtocol {
-    @ViewBuilder
+    @ViewBuilder @MainActor
     public static func makeOperatorMenu<T: Hashable>(
         using operation: Binding<T>
     ) -> some View {
@@ -18,7 +18,7 @@ extension ExpressionProtocol {
         }
     }
     
-    @ViewBuilder
+    @ViewBuilder @MainActor
     public static func makeOperatorMenu<T: Hashable>(
         using operation: Binding<T>,
         @ViewBuilder itemProvider: @escaping (Operator) -> some View
@@ -33,10 +33,12 @@ extension ExpressionProtocol {
         .labelsHidden()
     }
     
+    @MainActor
     public static func makeView(for expression: Binding<Self>) -> some ExpressionView {
         makeView(for: expression, parent: nil)
     }
     
+    @MainActor
     public static func makeView(for expression: Binding<Self>, parent: Binding<LogicalExpression<Root>>?) -> some ExpressionView {
         ExprView(expression: expression, parent: parent)
     }
diff --git a/Sources/PredicateView/Expressions/Abstract/ExpressionProtocol.swift b/Sources/PredicateView/Expressions/Abstract/ExpressionProtocol.swift
@@ -10,7 +10,7 @@ import Foundation
 // MARK: - Expression
 
 /// Defines the core requirements for an expression in the predicate builder system.
-public protocol ExpressionProtocol<Root>: Identifiable {
+public protocol ExpressionProtocol<Root>: Identifiable, Sendable {
     /// The root type that this expression operates on.
     associatedtype Root
     
@@ -36,4 +36,4 @@ public protocol ExpressionProtocol<Root>: Identifiable {
     ) -> (any StandardPredicateExpression<Bool>)?
 }
 
-public protocol ExpressionOperator: CaseIterable, Hashable, RawRepresentable where RawValue == String, AllCases: RandomAccessCollection, AllCases.Index == Int { }
+public protocol ExpressionOperator: CaseIterable, Hashable, RawRepresentable, Sendable where RawValue == String, AllCases: RandomAccessCollection, AllCases.Index == Int { }
diff --git a/Sources/PredicateView/Expressions/Abstract/KeyPathExpression.swift b/Sources/PredicateView/Expressions/Abstract/KeyPathExpression.swift
@@ -22,3 +22,5 @@ extension KeyPathExpression {
     typealias KeyPathPredicateExpression = PredicateExpressions.KeyPath<PredicateExpressions.Variable<Root>, Value>
     typealias ValuePredicateExpression = PredicateExpressions.Value<Value>
 }
+
+extension KeyPath: @retroactive @unchecked Sendable { }
diff --git a/Sources/PredicateView/Expressions/Abstract/PredicateExpressionConvertible.swift b/Sources/PredicateView/Expressions/Abstract/PredicateExpressionConvertible.swift
@@ -14,7 +14,7 @@ public protocol PredicateExpressionConvertible<Root>: LeafPredicateExpressionDec
     associatedtype Attribute: ExpressionAttribute<Self>
     
     /// The type of the value associated with the attribute.
-    associatedtype AttributeValue: Hashable
+    associatedtype AttributeValue: Hashable & Sendable
     
     /// The default attribute for this expression type.
     static var defaultAttribute: Attribute { get }
diff --git a/Sources/PredicateView/Expressions/CustomExpression.swift b/Sources/PredicateView/Expressions/CustomExpression.swift
@@ -9,14 +9,14 @@ import CompoundPredicate
 import SwiftUI
 
 extension AnyExpression {
-    public init<CustomView>(_ view: CustomView.Type = CustomView.self) where CustomView: CustomExpressionView, Root == CustomView.Root {
+    public init<CustomView>(_ view: CustomView.Type = CustomView.self) where CustomView: CustomExpressionView, Root == CustomView.Root, CustomView.Value: Sendable {
         self.init(wrappedValue: CustomExpression<Root, CustomView>())
     }
 }
 
 // MARK: - CustomExpression
 
-struct CustomExpression<Root, Content>: ContentExpression, KeyPathExpression where Content: CustomExpressionView, Root == Content.Root {
+struct CustomExpression<Root, Content>: ContentExpression, KeyPathExpression where Content: CustomExpressionView, Root == Content.Root, Content.Value: Sendable {
     typealias AttributeValue = Content.Value
     typealias Operator = Content.Operator
     
diff --git a/Sources/PredicateView/Expressions/DateExpression.swift b/Sources/PredicateView/Expressions/DateExpression.swift
@@ -120,8 +120,6 @@ struct DateExpression<Root>: ContentExpression, WrappablePredicateExpression {
                 ifKeyPathMatches: expression.lhs,
                 attribute: .init(operator: .init(expression.op) ?? .before, value: expression.rhs.value)
             )
-        case let expression as PredicateExpressions.Conjunction<Comparison, Comparison>:
-            nil
         default:
             nil
         }
diff --git a/Sources/PredicateView/Expressions/EnumExpression.swift b/Sources/PredicateView/Expressions/EnumExpression.swift
@@ -10,16 +10,16 @@ import SwiftUI
 public typealias EnumExpressionCompatible = CaseIterable & CustomStringConvertible & Identifiable & ExpressionCompatible
 
 extension AnyExpression {
-    public init<T>(keyPath: KeyPath<Root, T>, title: String) where T: EnumExpressionCompatible, T.AllCases: RandomAccessCollection {
+    public init<T>(keyPath: KeyPath<Root, T>, title: String) where T: EnumExpressionCompatible & Sendable, T.AllCases: RandomAccessCollection {
         self.init(wrappedValue: EnumExpression(keyPath: keyPath, title: title))
     }
     
-    public init<T>(keyPath: KeyPath<Root, T?>, title: String) where T: EnumExpressionCompatible, T.AllCases: RandomAccessCollection {
+    public init<T>(keyPath: KeyPath<Root, T?>, title: String) where T: EnumExpressionCompatible & Sendable, T.AllCases: RandomAccessCollection {
         self.init(wrappedValue: OptionalExpression<Root, EnumExpression>(keyPath: keyPath, title: title))
     }
 }
 
-struct EnumExpression<Root, EnumType>: ContentExpression, WrappablePredicateExpression where EnumType: EnumExpressionCompatible, EnumType.AllCases: RandomAccessCollection {
+struct EnumExpression<Root, EnumType>: ContentExpression, WrappablePredicateExpression where EnumType: EnumExpressionCompatible & Sendable, EnumType.AllCases: RandomAccessCollection {
     typealias AttributeValue = EnumType
     
     enum Operator: String, ExpressionOperator {
diff --git a/Sources/PredicateView/Expressions/Foundation/SequencePredicate.swift b/Sources/PredicateView/Expressions/Foundation/SequencePredicate.swift
@@ -16,7 +16,7 @@ extension PredicateExpressions {
     struct SequencePredicate<
         LHS: PredicateExpression,
         RHS: PredicateExpression
-    >: PredicateExpression where LHS.Output: Sequence, RHS.Output == Bool {
+    >: PredicateExpression where LHS.Output: Sequence, RHS.Output == Bool, LHS: Sendable, RHS: Sendable {
         typealias Element = LHS.Output.Element
         typealias Output = Bool
         
@@ -45,6 +45,7 @@ extension PredicateExpressions {
     }
 }
 
+extension PredicateExpressions.SequencePredicate: Sendable where LHS: Sendable, RHS: Sendable { }
 extension PredicateExpressions.SequencePredicate: StandardPredicateExpression where LHS: StandardPredicateExpression, RHS: StandardPredicateExpression { }
 
 extension PredicateExpressions.SequencePredicate: Codable where LHS: Codable, RHS: Codable {
diff --git a/Sources/PredicateView/Expressions/NumericExpression.swift b/Sources/PredicateView/Expressions/NumericExpression.swift
@@ -109,6 +109,7 @@ struct NumericExpression<Root, Number>: ContentExpression, WrappablePredicateExp
         }
     }
     
+    @MainActor
     static func makeContentView(_ value: Binding<Number>) -> some View {
         StepperField(title: "Value", value: value)
     }
diff --git a/Sources/PredicateView/Expressions/OptionalExpression.swift b/Sources/PredicateView/Expressions/OptionalExpression.swift
@@ -70,8 +70,10 @@ struct OptionalExpression<Root, WrappedExpression>: ExpressionWrapper where Wrap
 struct OptionalExpressionView<Root, WrappedExpression>: ExpressionView where WrappedExpression: ContentExpression<Root> & WrappablePredicateExpression {
     typealias Expression = OptionalExpression<Root, WrappedExpression>
     
+    @MainActor
     var expression: Binding<Expression>
     
+    @MainActor
     var body: some View {
         @Binding(projectedValue: expression) var expression
         
diff --git a/Sources/PredicateView/Views/CustomExpressionView.swift b/Sources/PredicateView/Views/CustomExpressionView.swift
@@ -9,31 +9,30 @@ import SwiftUI
 
 /// Describes a custom expression view component that can be used to provide a user-visible template row.
 /// Before implementing a custom expression view, see if any of the built-in expression types will serve your needs.
-public protocol CustomExpressionView<Root, Value, Operator>: BindableView {
+public protocol CustomExpressionView<Root, Value, Operator>: BindableView where Value: Hashable {
     associatedtype Root
-    associatedtype Value: Hashable
     associatedtype Operator: ExpressionOperator
     
     /// The user-visible title of the expression.
-    static var title: String { get }
+    nonisolated static var title: String { get }
     
     /// The key path of the value in the source type.
     /// This is used by the underlying matching and predicate decoding logic.
-    static var keyPath: KeyPath<Root, Value> { get }
+    nonisolated static var keyPath: KeyPath<Root, Value> { get }
     
     /// The default value of the expression.
     /// This value will be used by the control after the user inserts it into their predicate.
     /// Optional whenver ``Value`` conforms to ``DefaultExpressionValueConvertible``.
-    static var defaultValue: Value { get }
+    nonisolated static var defaultValue: Value { get }
     
     /// Given the value and the operator the user has picked, constructs a predicate that applies the expression to the ``Root`` type.
     /// This method is called whenever the user updates the part of the control corresponding to this expression, therefore operations performed within it should be relatively inexpensive.
-    static func predicate(for value: Value, operator: Operator) -> Predicate<Root>
+    nonisolated static func predicate(for value: Value, operator: Operator) -> Predicate<Root>
     
     /// Implement this method to allow decoding this expression from a provided ``PredicateExpression``.
     /// Implementing this method is not required, but without it, a predicate supplied externally (such as via the ``Binding``) will not be able to populate the predicate control view for this expression.
     /// This methos is effectively the inverse of `predicate(for:operator:)`.
-    static func decode<PredicateExpressionType: PredicateExpression<Bool>>(
+    nonisolated static func decode<PredicateExpressionType: PredicateExpression<Bool>>(
         _ expression: PredicateExpressionType
     ) -> DecodedKeyPathExpression<Self>?
     
diff --git a/Sources/PredicateView/Views/Model/BindableView.swift b/Sources/PredicateView/Views/Model/BindableView.swift
@@ -11,5 +11,5 @@ import SwiftUI
 public protocol BindableView<Value>: View {
     associatedtype Value
     
-    init(value binding: Binding<Value>)
+    nonisolated init(value binding: Binding<Value>)
 }
diff --git a/Sources/PredicateView/Views/PredicateView.swift b/Sources/PredicateView/Views/PredicateView.swift
@@ -48,7 +48,7 @@ public struct PredicateView<Root>: View {
         LogicalExpression<Root>.makeView(for: $rootExpression)
             .environment(configuration)
             .onPreferenceChange(PredicateAttributePreferenceKey.self) { _ in
-                Task { buildPredicate() }
+                Task { await buildPredicate() }
             }
             .onAppear {
                 updateExpression()

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public struct StandardAttribute<Expr>: ExpressionAttribute where Expr: Predicate`
`17`	`17`	`public var value: Expr.AttributeValue`
`18`	`18`	`}`
`19`	`19`
`20`		`-public struct MetadataAttribute<Expr, Metadata>: ExpressionAttribute where Expr: PredicateExpressionConvertible {`
	`20`	`+public struct MetadataAttribute<Expr, Metadata>: ExpressionAttribute where Expr: PredicateExpressionConvertible, Metadata: Sendable {`
`21`	`21`	public var `operator`: Expr.Operator
`22`	`22`	`public var value: Expr.AttributeValue`
`23`	`23`	`public var metadata: Metadata`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`import Foundation`
`9`	`9`
`10`		`-public protocol OperatorContainer: Equatable {`
	`10`	`+public protocol OperatorContainer: Equatable, Sendable {`
`11`	`11`	`associatedtype Expr: ExpressionProtocol`
`12`	`12`	var `operator`: Expr.Operator { get set }
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public protocol ContentExpression<Root>: PredicateExpressionConvertible & Titled`
`13`	`13`	`associatedtype ExprView = ContentExpressionView<Root, Self>`
`14`	`14`	`associatedtype Result: View`
`15`	`15`
`16`		`- @ViewBuilder`
	`16`	`+ @ViewBuilder @MainActor`
`17`	`17`	`static func makeContentView(_ value: Binding<AttributeValue>) -> Result`
`18`	`18`	`}`
`19`	`19`
`@@ -25,7 +25,7 @@ public struct ContentExpressionView<Root, Expr: ContentExpression<Root>>: Expres`
`25`	`25`	`self.expression = expression`
`26`	`26`	`}`
`27`	`27`
`28`		`- @ViewBuilder`
	`28`	`+ @MainActor`
`29`	`29`	`public var body: some View {`
`30`	`30`	`@Binding(projectedValue: self.expression) var expression: Expr`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`import SwiftUI`
`9`	`9`
`10`	`10`	`extension ExpressionProtocol {`
`11`		`- @ViewBuilder`
	`11`	`+ @ViewBuilder @MainActor`
`12`	`12`	`public static func makeOperatorMenu<T: Hashable>(`
`13`	`13`	`using operation: Binding<T>`
`14`	`14`	`) -> some View {`
`@@ -18,7 +18,7 @@ extension ExpressionProtocol {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`21`		`- @ViewBuilder`
	`21`	`+ @ViewBuilder @MainActor`
`22`	`22`	`public static func makeOperatorMenu<T: Hashable>(`
`23`	`23`	`using operation: Binding<T>,`
`24`	`24`	`@ViewBuilder itemProvider: @escaping (Operator) -> some View`
`@@ -33,10 +33,12 @@ extension ExpressionProtocol {`
`33`	`33`	`.labelsHidden()`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ @MainActor`
`36`	`37`	`public static func makeView(for expression: Binding<Self>) -> some ExpressionView {`
`37`	`38`	`makeView(for: expression, parent: nil)`
`38`	`39`	`}`
`39`	`40`
	`41`	`+ @MainActor`
`40`	`42`	`public static func makeView(for expression: Binding<Self>, parent: Binding<LogicalExpression<Root>>?) -> some ExpressionView {`
`41`	`43`	`ExprView(expression: expression, parent: parent)`
`42`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,3 +22,5 @@ extension KeyPathExpression {`
`22`	`22`	`typealias KeyPathPredicateExpression = PredicateExpressions.KeyPath<PredicateExpressions.Variable<Root>, Value>`
`23`	`23`	`typealias ValuePredicateExpression = PredicateExpressions.Value<Value>`
`24`	`24`	`}`
	`25`	`+`
	`26`	`+extension KeyPath: @retroactive @unchecked Sendable { }`