Update to Swift 6

rafaelesantos · Oct 6, 2024 · 31ba9bb · 31ba9bb
1 parent f06c507
commit 31ba9bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -7,13 +7,13 @@ let package = Package(
     name: "RefdsCoreData",
     defaultLocalization: "pt",
     platforms: [
-        .iOS(.v17),
-        .macCatalyst(.v17),
-        .macOS(.v14),
-        .tvOS(.v17),
-        .watchOS(.v10),
-        .visionOS(.v1),
-        .driverKit(.v23)
+        .iOS(.v18),
+        .macCatalyst(.v18),
+        .macOS(.v15),
+        .tvOS(.v18),
+        .watchOS(.v11),
+        .visionOS(.v2),
+        .driverKit(.v24)
     ],
     products: [
         .library(

diff --git a/Sources/RefdsCoreData/NSPersistentCloudKitContainer+Extensions.swift b/Sources/RefdsCoreData/NSPersistentCloudKitContainer+Extensions.swift
@@ -21,7 +21,7 @@ public extension NSPersistentCloudKitContainer {
             }
         })
         container.viewContext.automaticallyMergesChangesFromParent = true
-        container.viewContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy
+        container.viewContext.mergePolicy = NSMergePolicy(merge: .mergeByPropertyObjectTrumpMergePolicyType)
         return container
     }