FetchRequests v7: Swift 6 language mode (#51)

Also removes JSON

Author: lickel

.github/workflows/build.yml

@@ -19,24 +19,24 @@ jobs:
           - tvOS
           - watchOS
           - macOS
-          #- visionOS
-    runs-on: macos-14
+          - visionOS
+    runs-on: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Build
-        uses: mxcl/xcodebuild@v2
+        uses: mxcl/xcodebuild@v3
         with:
           platform: ${{ matrix.platform }}
           scheme: FetchRequests-${{ matrix.platform }}
-          xcode: 15.2
+          swift: ~6.0
           action: test
           code-coverage: true
       - name: Code Coverage
         #uses: codecov/codecov-action@v2
         run: bash <(curl -s https://codecov.io/bash);
   validate:
-    runs-on: macos-14
+    runs-on: macos-latest
     needs: build
     steps:
       - name: Checkout
@@ -52,11 +52,10 @@ jobs:
       - name: Pod Lint
         run: pod lib lint --quick --fail-fast --verbose --skip-tests
       - name: Example Project
-        uses: mxcl/xcodebuild@v2
+        uses: mxcl/xcodebuild@v3
         with:
           platform: iOS
           scheme: iOS Example
-          xcode: 15.2
+          swift: ~6.0
           action: build
-          warnings-as-errors: true
           working-directory: Example

.swiftformat

@@ -1,13 +1,16 @@
---swiftversion 5.9
+--swiftversion 6.0
 
 --exclude Pods
 
 --rules andOperator
 --rules anyObjectProtocol
 
+--rules blankLinesBetweenScopes
 --rules blankLineAfterImports
 --rules braces
 --rules conditionalAssignment
+--rules consecutiveSpaces
+--rules consistentSwitchCaseSpacing
 --rules duplicateImports
 --rules elseOnSameLine
 --rules genericExtensions
@@ -24,14 +27,18 @@
 --rules leadingDelimiters
 --rules linebreakAtEndOfFile
 
+--rules redundantBreak
 --rules redundantClosure
 --rules redundantFileprivate
 --rules redundantGet
 --rules redundantInit
+--rules redundantLet
+--rules redundantLetError
 --rules redundantOptionalBinding
 --rules redundantParens
 --rules redundantPattern
 --rules redundantReturn
+--rules redundantTypedThrows
 --rules redundantVoidReturnType
 --rules semicolons
 
@@ -49,6 +56,7 @@
 
 --rules strongifiedSelf
 --rules todos
+--rules trailingClosures
 --rules trailingCommas
 --rules trailingSpace
 --rules typeSugar
@@ -58,5 +66,6 @@
   --wraparguments before-first
   --wrapcollections before-first
   --wrapparameters before-first
+  --closingparen balanced
 
 --rules wrapMultilineStatementBraces

.swiftlint.yml

@@ -50,7 +50,9 @@ opt_in_rules:
   - optional_enum_case_matching
   - overridden_super_call
   - pattern_matching_keywords
+  - prefer_key_path
   - prefer_self_type_over_type_of_self
+  - private_swiftui_state
   - prohibited_super_call
   - private_outlet
   - private_subject
@@ -59,6 +61,7 @@ opt_in_rules:
   - redundant_nil_coalescing
   - redundant_objc_attribute
   - self_binding
+  - shorthand_argument
   - single_test_class
   - shorthand_optional_binding
   - sorted_first_last
@@ -106,3 +109,4 @@ deployment_target:
   tvOS_deployment_target: 14
   watchOS_deployment_target: 7
   macOS_deployment_target: 11
+  # visionOS_deployment_target: 1

CHANGELOG.md

@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file.
 `FetchRequests` adheres to [Semantic Versioning](https://semver.org/).
 
+## [7.0](https://github.com/square/FetchRequests/releases/tag/7.0.0)
+Release 2024-09-XX
+
+* Compiles cleanly in the Swift 6 language mode
+* Requires the Swift 6 compiler
+* `JSON` has been removed from the library as it is no longer necessary
+
 ## [6.1](https://github.com/square/FetchRequests/releases/tag/6.1.0)
 Release 2024-04-03
 

Example/.DS_Store

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		472E8F6F23388380005045D2 /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472E8F6E23388380005045D2 /* Observable.swift */; };
+		472E8F6F23388380005045D2 /* ObservableValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472E8F6E23388380005045D2 /* ObservableValue.swift */; };
 		472E8F7723388E93005045D2 /* Atomic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 472E8F7623388E93005045D2 /* Atomic.swift */; };
 		4736ABC822CBE82A00253EB6 /* Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4736ABC722CBE82A00253EB6 /* Model.swift */; };
 		4736ABD022CBE9C600253EB6 /* Model+Fetchable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4736ABCF22CBE9C600253EB6 /* Model+Fetchable.swift */; };
@@ -21,6 +21,20 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		2A6FBFED2C920B7300A7CDBE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 47ACD1A422CBE3E200B3F1FE /* FetchRequests.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 2ABB235E2B98FC770015F902;
+			remoteInfo = "FetchRequests-visionOS";
+		};
+		2A6FBFEF2C920B7300A7CDBE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 47ACD1A422CBE3E200B3F1FE /* FetchRequests.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 2ABB23782B98FC7E0015F902;
+			remoteInfo = "FetchRequests-visionOSTests";
+		};
 		4798B6DD22CBE4CA001F6B3D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 47ACD1A422CBE3E200B3F1FE /* FetchRequests.xcodeproj */;
@@ -87,7 +101,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		472E8F6E23388380005045D2 /* Observable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Observable.swift; sourceTree = "<group>"; };
+		472E8F6E23388380005045D2 /* ObservableValue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObservableValue.swift; sourceTree = "<group>"; };
 		472E8F7623388E93005045D2 /* Atomic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Atomic.swift; sourceTree = "<group>"; };
 		4736ABC722CBE82A00253EB6 /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = "<group>"; };
 		4736ABCF22CBE9C600253EB6 /* Model+Fetchable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Model+Fetchable.swift"; sourceTree = "<group>"; };
@@ -148,7 +162,7 @@
 				4736ABC722CBE82A00253EB6 /* Model.swift */,
 				4736ABCF22CBE9C600253EB6 /* Model+Fetchable.swift */,
 				4736ABD122CBEBDD00253EB6 /* Model+Persistence.swift */,
-				472E8F6E23388380005045D2 /* Observable.swift */,
+				472E8F6E23388380005045D2 /* ObservableValue.swift */,
 				472E8F7623388E93005045D2 /* Atomic.swift */,
 				47ACD19922CBE39700B3F1FE /* Assets.xcassets */,
 				47ACD19B22CBE39700B3F1FE /* LaunchScreen.storyboard */,
@@ -168,6 +182,8 @@
 				47ACD1B922CBE3E200B3F1FE /* FetchRequests-tvOSTests.xctest */,
 				47ACD1BB22CBE3E200B3F1FE /* FetchRequests.framework */,
 				669AE0F0269E446F006DD76C /* FetchRequests-watchOSTests.xctest */,
+				2A6FBFEE2C920B7300A7CDBE /* FetchRequests.framework */,
+				2A6FBFF02C920B7300A7CDBE /* FetchRequests-visionOSTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -234,6 +250,20 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+		2A6FBFEE2C920B7300A7CDBE /* FetchRequests.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = FetchRequests.framework;
+			remoteRef = 2A6FBFED2C920B7300A7CDBE /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2A6FBFF02C920B7300A7CDBE /* FetchRequests-visionOSTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "FetchRequests-visionOSTests.xctest";
+			remoteRef = 2A6FBFEF2C920B7300A7CDBE /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		47ACD1AF22CBE3E200B3F1FE /* FetchRequests.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
@@ -314,7 +344,7 @@
 				D958902C2A27A3300060A0CF /* SwiftUIView.swift in Sources */,
 				47ACD19522CBE39600B3F1FE /* ViewController.swift in Sources */,
 				4736ABD022CBE9C600253EB6 /* Model+Fetchable.swift in Sources */,
-				472E8F6F23388380005045D2 /* Observable.swift in Sources */,
+				472E8F6F23388380005045D2 /* ObservableValue.swift in Sources */,
 				472E8F7723388E93005045D2 /* Atomic.swift in Sources */,
 				47ACD19322CBE39600B3F1FE /* AppDelegate.swift in Sources */,
 			);

Example/iOS-Example.xcodeproj/project.pbxproj

@@ -41,7 +41,7 @@ class ModelCreationToken<T: Model>: ObservableToken {
         notificationToken.invalidate()
     }
 
-    func observe(handler: @escaping (T.RawData) -> Void) {
+    func observe(handler: @escaping @Sendable @MainActor (T.RawData) -> Void) {
         let include = self.include
         notificationToken.observe { notification in
             guard let object = notification.object as? T else {
@@ -66,7 +66,7 @@ class ModelClearedToken<T: Model>: ObservableToken {
         notificationToken.invalidate()
     }
 
-    func observe(handler: @escaping (()) -> Void) {
+    func observe(handler: @escaping @Sendable @MainActor (()) -> Void) {
         notificationToken.observe { notification in
             handler(())
         }

Example/iOS-Example.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -11,7 +11,7 @@ import Foundation
 import FetchRequests
 
 @dynamicMemberLookup
-class Model: NSObject {
+final class Model: NSObject, @unchecked Sendable {
     typealias ID = String
 
     struct RawData: Codable, Identifiable, Equatable {
@@ -20,7 +20,7 @@ class Model: NSObject {
         var updatedAt: Date
     }
 
-    @Observable
+    @ObservableValue
     var data: RawData {
         willSet {
             integrate(data: newValue)
@@ -117,10 +117,12 @@ extension Model: FetchableObjectProtocol {
 
     func observeIsDeletedChanges(_ handler: @escaping @MainActor () -> Void) -> InvalidatableToken {
         self.observe(\.isDeleted, options: [.old, .new]) { object, change in
-            guard let old = change.oldValue, let new = change.newValue, old != new else {
-                return
+            MainActor.assumeIsolated {
+                guard let old = change.oldValue, let new = change.newValue, old != new else {
+                    return
+                }
+                handler()
             }
-            unsafeHandler(for: handler)
         }
     }
 
@@ -133,13 +135,6 @@ extension Model: FetchableObjectProtocol {
     }
 }
 
-@MainActor(unsafe)
-private func unsafeHandler(for handler: @MainActor () -> Void) {
-    assert(Thread.isMainThread)
-    // This is a dumb wrapper, but I can't otherwise have a "clean" compile
-    handler()
-}
-
 // MARK: - Private Helpers
 
 private extension Model {

Example/iOS-Example/Model+Fetchable.swift

@@ -1,5 +1,5 @@
 //
-//  Observable.swift
+//  ObservableValue.swift
 //  iOS Example
 //
 //  Created by Adam Lickel on 9/22/19.
@@ -16,14 +16,14 @@ struct Change<Value> {
 }
 
 @propertyWrapper
-class Observable<Value> {
+class ObservableValue<Value> {
     typealias Handler = @MainActor (Change<Value>) -> Void
 
     fileprivate var observers: Atomic<[UUID: Handler]> = Atomic(wrappedValue: [:])
 
     var wrappedValue: Value {
         didSet {
-            unsafeHandler {
+            MainActor.assumeIsolated {
                 let change = Change(oldValue: oldValue, newValue: wrappedValue)
                 let observers = self.observers.wrappedValue
 
@@ -45,14 +45,7 @@ class Observable<Value> {
     }
 }
 
-@MainActor(unsafe)
-private func unsafeHandler(for handler: @MainActor () -> Void) {
-    assert(Thread.isMainThread)
-    // This is a dumb wrapper, but I can't otherwise have a "clean" compile
-    handler()
-}
-
-extension Observable where Value: Equatable {
+extension ObservableValue where Value: Equatable {
     func observeChanges(handler: @escaping Handler) -> InvalidatableToken {
         observe { change in
             guard change.oldValue != change.newValue else {
@@ -65,9 +58,9 @@ extension Observable where Value: Equatable {
 
 private class Token<Value>: InvalidatableToken {
     let uuid = UUID()
-    private weak var parent: Observable<Value>?
+    private weak var parent: ObservableValue<Value>?
 
-    init(parent: Observable<Value>) {
+    init(parent: ObservableValue<Value>) {
         self.parent = parent
     }