fix for watchOS

mentrena · Nov 8, 2021 · 1a1c040 · 1a1c040
1 parent f5e363f
commit 1a1c040
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 33 deletions.
diff --git a/SyncKit/Classes/CoreData/CoreDataAdapter+ModelAdapter.swift b/SyncKit/Classes/CoreData/CoreDataAdapter+ModelAdapter.swift
@@ -317,7 +317,7 @@ extension CoreDataAdapter {
         }
     }
 
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     public func shareForRecordZone() -> CKShare? {
         var record: CKShare?
         privateContext.performAndWait {
@@ -331,7 +331,7 @@ extension CoreDataAdapter {
     /// Store CKShare for the record zone.
     /// - Parameters:
     ///   - share: `CKShare` object to save.
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     public func saveShareForRecordZone(share: CKShare) {
         privateContext.performAndWait {
             self.saveShareForRecordZoneEntity(share: share)
@@ -340,7 +340,7 @@ extension CoreDataAdapter {
     }
 
     /// Delete existing `CKShare` for adapter's record zone.
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     public func deleteShareForRecordZone() {
         privateContext.performAndWait {
             if let share = syncedEntityForRecordZoneShare() {

diff --git a/SyncKit/Classes/CoreData/CoreDataAdapter+Private.swift b/SyncKit/Classes/CoreData/CoreDataAdapter+Private.swift
@@ -188,7 +188,7 @@ extension CoreDataAdapter {
         return fetched?.first
     }
 
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     func syncedEntityForRecordZoneShare() -> QSSyncedEntity? {
         let fetched = try? self.privateContext.executeFetchRequest(entityName: "QSSyncedEntity",
                                                                    predicate: NSPredicate(format: "identifier == %@", CKRecordNameZoneWideShare),
@@ -282,7 +282,7 @@ extension CoreDataAdapter {
         qsRecord.encodedRecord = QSCoder.shared.encode(share) as NSData
     }
 
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     func saveShareForRecordZoneEntity(share: CKShare) {
         var entity = syncedEntityForRecordZoneShare()
         var qsRecord: QSRecord!
@@ -362,7 +362,7 @@ extension CoreDataAdapter {
                         record[attributeName] = transformed
                     } else if let encrypted = encryptedFields,
                               encrypted.contains(attributeName) {
-                        if #available(iOS 15, OSX 12, *) {
+                        if #available(iOS 15, OSX 12, watchOS 8.0, *) {
                             record.encryptedValues[attributeName] = value as? CKRecordValueProtocol
                         }
                         // Else not possible, since the EncryptedObject protocol is only declared for CloudKit versions that support encryption
@@ -522,7 +522,7 @@ extension CoreDataAdapter {
 
         if let encrypted = encryptedFields,
            encrypted.contains(attributeName) {
-            if #available(iOS 15, OSX 12, *) {
+            if #available(iOS 15, OSX 12, watchOS 8.0, *) {
                 object.setValue(record.encryptedValues[attributeName], forKey: attributeName)
             }
             // Else not possible, since the EncryptedObject protocol is only declared for CloudKit versions that support encryption

diff --git a/SyncKit/Classes/CoreData/CoreDataAdapter.swift b/SyncKit/Classes/CoreData/CoreDataAdapter.swift
@@ -216,7 +216,7 @@ extension CoreDataAdapter {
     }
 
     private func setupEncryptedFields() {
-        if #available(iOS 15, OSX 12, *) {
+        if #available(iOS 15, OSX 12, watchOS 8.0, *) {
             targetContext.performAndWait {
                 guard let entities = self.targetContext.persistentStoreCoordinator?.managedObjectModel.entities else { return }
                 for entityDescription in entities {

diff --git a/SyncKit/Classes/QSSynchronizer/CloudKitSynchronizer+Sharing.swift b/SyncKit/Classes/QSSynchronizer/CloudKitSynchronizer+Sharing.swift
@@ -243,7 +243,7 @@ import CloudKit
      - Parameter zoneID  The record zone ID.
      - Returns: `CKShare` stored for the given object.
      */
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     @objc func share(forRecordZoneID zoneID: CKRecordZone.ID) -> CKShare? {
         guard let modelAdapter = modelAdapter(forRecordZoneID: zoneID) else {
             return nil
@@ -259,7 +259,7 @@ import CloudKit
 
         This method should be called by your `UICloudSharingControllerDelegate`, when `cloudSharingControllerDidSaveShare` is called.
      */
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     @objc func cloudSharingControllerDidSaveShare(_ share: CKShare, forRecordZoneID zoneID: CKRecordZone.ID) {
         guard let modelAdapter = modelAdapter(forRecordZoneID: zoneID) else {
             return
@@ -273,7 +273,7 @@ import CloudKit
         - zoneID  The record zone ID.
      This method should be called by your `UICloudSharingControllerDelegate`, when `cloudSharingControllerDidStopSharing` is called.
      */
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     @objc func cloudSharingControllerDidStopSharing(forRecordZoneID zoneID: CKRecordZone.ID) {
         guard let modelAdapter = modelAdapter(forRecordZoneID: zoneID) else {
             return
@@ -291,7 +291,7 @@ import CloudKit
         - completion: Closure that gets called with an optional error when the operation is completed.
 
      */
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     @objc func share(recordZoneID: CKRecordZone.ID, publicPermission: CKShare.ParticipantPermission, participants: [CKShare.Participant], completion: ((CKShare?, Error?) -> ())?) {
         guard !syncing else {
             completion?(nil, CloudKitSynchronizer.SyncError.alreadySyncing)
@@ -356,7 +356,7 @@ import CloudKit
         - recordZoneID  The ID of the record zone to unshare.
         - completion Closure that gets called on completion.
      */
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     @objc func removeShare(recordZoneID: CKRecordZone.ID, completion: ((Error?) -> ())?) {
         guard !syncing else {
             completion?(CloudKitSynchronizer.SyncError.alreadySyncing)

diff --git a/SyncKit/Classes/QSSynchronizer/ModelAdapter.swift b/SyncKit/Classes/QSSynchronizer/ModelAdapter.swift
@@ -119,15 +119,15 @@ public extension Notification.Name {
     @available(iOS 10.0, OSX 10.12, *) func deleteShare(for object: AnyObject)
 
     /// - Returns: CKShare for the adapter's record zone, if one exists.
-    @available(iOS 15.0, OSX 12, *) func shareForRecordZone() -> CKShare?
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *) func shareForRecordZone() -> CKShare?
 
     /// Store CKShare for the record zone.
     /// - Parameters:
     ///   - share: `CKShare` object to save.
-    @available(iOS 15.0, OSX 12, *) func saveShareForRecordZone(share: CKShare)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *) func saveShareForRecordZone(share: CKShare)
 
     /// Delete existing `CKShare` for adapter's record zone.
-    @available(iOS 15.0, OSX 12, *) func deleteShareForRecordZone()
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *) func deleteShareForRecordZone()
 
     /// Returns a list of records for the given object and any parent records, recursively.
     /// - Parameter object: Model object.

diff --git a/SyncKit/Classes/QSSynchronizer/PrimaryKey.swift b/SyncKit/Classes/QSSynchronizer/PrimaryKey.swift
@@ -31,7 +31,7 @@ import Foundation
 /**
  *  Can be adopted by classes to use CloudKit encryption for some fields
  */
-@available(iOS 15, OSX 12, *)
+@available(iOS 15, OSX 12, watchOS 8.0, *)
 @objc public protocol EncryptedObject: AnyObject {
 
     /// Name of the fields that should use encryption

diff --git a/SyncKit/Classes/Realm/RealmAdapter.swift b/SyncKit/Classes/Realm/RealmAdapter.swift
@@ -193,7 +193,7 @@ struct ObjectUpdate {
     }
 
     func setupEncryptedFields() {
-        if #available(iOS 15, OSX 12, *) {
+        if #available(iOS 15, OSX 12, watchOS 8.0, *) {
             targetRealmConfiguration.objectClasses?.forEach { objectType in
                 if let objectType = objectType as? RLMObject.Type,
                    let encryptedType = objectType as? EncryptedObject.Type {
@@ -519,7 +519,7 @@ struct ObjectUpdate {
         return getSyncedEntity(objectIdentifier: identifier, realm: realm)
     }
 
-    @available(iOS 15, OSX 12, *)
+    @available(iOS 15, OSX 12, watchOS 8.0, *)
     func syncedEntityForRecordZoneShare(realm: RLMRealm) -> SyncedEntity? {
         return getSyncedEntity(objectIdentifier: CKRecordNameZoneWideShare, realm: realm)
     }
@@ -633,7 +633,7 @@ struct ObjectUpdate {
 
         if let encrypted = entityEncryptedFields[syncedEntity.entityType],
            encrypted.contains(key) {
-            if #available(iOS 15, OSX 12, *) {
+            if #available(iOS 15, OSX 12, watchOS 8.0, *) {
                 object.setValue(record.encryptedValues[key], forKey: key)
             }
         } else {
@@ -780,7 +780,7 @@ struct ObjectUpdate {
 
         qsRecord?.encodedRecord = encodedRecord(share, onlySystemFields: false)
     }
-    @available(iOS 15, OSX 12, *)
+    @available(iOS 15, OSX 12, watchOS 8.0, *)
     func saveShareForRecordZone(share: CKShare, realmProvider: RealmProvider) {
         var entity = syncedEntityForRecordZoneShare(realm: realmProvider.persistenceRealm)
         var qsRecord: Record!
@@ -907,7 +907,7 @@ struct ObjectUpdate {
 
                     if let encrypted = encryptedFields,
                        encrypted.contains(property.name) {
-                        if #available(iOS 15, OSX 12, *) {
+                        if #available(iOS 15, OSX 12, watchOS 8.0, *) {
                             record.encryptedValues[property.name] = object!.value(forKey: property.name) as? CKRecordValue
                         }
                     } else {
@@ -1360,7 +1360,7 @@ struct ObjectUpdate {
         return records ?? []
     }
 
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     public func shareForRecordZone() -> CKShare? {
         guard realmProvider != nil else {
             return nil
@@ -1380,7 +1380,7 @@ struct ObjectUpdate {
     /// Store CKShare for the record zone.
     /// - Parameters:
     ///   - share: `CKShare` object to save.
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     public func saveShareForRecordZone(share: CKShare) {
         guard realmProvider != nil else {
             return
@@ -1394,7 +1394,7 @@ struct ObjectUpdate {
     }
 
     /// Delete existing `CKShare` for adapter's record zone.
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     public func deleteShareForRecordZone() {
         guard realmProvider != nil else {
             return

diff --git a/SyncKit/Classes/RealmSwift/RealmSwiftAdapter.swift b/SyncKit/Classes/RealmSwift/RealmSwiftAdapter.swift
@@ -192,7 +192,7 @@ public class RealmSwiftAdapter: NSObject, ModelAdapter {
     }
 
     func setupEncryptedFields() {
-        if #available(iOS 15, OSX 12, *) {
+        if #available(iOS 15, OSX 12, watchOS 8.0, *) {
             targetRealmConfiguration.objectTypes?.forEach { objectType in
                 if let encryptedEntity = objectType as? EncryptedObject.Type {
                     entityEncryptedFields[objectType.className()] = Set(encryptedEntity.encryptedFields())
@@ -530,7 +530,7 @@ public class RealmSwiftAdapter: NSObject, ModelAdapter {
         return getSyncedEntity(objectIdentifier: identifier, realm: realm)
     }
 
-    @available(iOS 15, OSX 12, *)
+    @available(iOS 15, OSX 12, watchOS 8.0, *)
     func syncedEntityForRecordZoneShare(realm: Realm) -> SyncedEntity? {
         return getSyncedEntity(objectIdentifier: CKRecordNameZoneWideShare, realm: realm)
     }
@@ -643,7 +643,7 @@ public class RealmSwiftAdapter: NSObject, ModelAdapter {
 
         if let encrypted = entityEncryptedFields[syncedEntity.entityType],
            encrypted.contains(key) {
-            if #available(iOS 15, OSX 12, *) {
+            if #available(iOS 15, OSX 12, watchOS 8.0, *) {
                 object.setValue(record.encryptedValues[key], forKey: key)
             }
         } else {
@@ -794,7 +794,7 @@ public class RealmSwiftAdapter: NSObject, ModelAdapter {
         qsRecord?.encodedRecord = encodedRecord(share, onlySystemFields: false)
     }
 
-    @available(iOS 15, OSX 12, *)
+    @available(iOS 15, OSX 12, watchOS 8.0, *)
     func saveShareForRecordZone(share: CKShare, realmProvider: RealmProvider) {
         var entity = syncedEntityForRecordZoneShare(realm: realmProvider.persistenceRealm)
         var qsRecord: Record!
@@ -931,7 +931,7 @@ public class RealmSwiftAdapter: NSObject, ModelAdapter {
 
                     if let encrypted = encryptedFields,
                        encrypted.contains(property.name) {
-                        if #available(iOS 15, OSX 12, *) {
+                        if #available(iOS 15, OSX 12, watchOS 8.0, *) {
                             record.encryptedValues[property.name] = object.value(forKey: property.name) as? CKRecordValue
                         }
                     } else {
@@ -1384,7 +1384,7 @@ public class RealmSwiftAdapter: NSObject, ModelAdapter {
         return records ?? []
     }
 
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     public func shareForRecordZone() -> CKShare? {
         guard realmProvider != nil else {
             return nil
@@ -1404,7 +1404,7 @@ public class RealmSwiftAdapter: NSObject, ModelAdapter {
     /// Store CKShare for the record zone.
     /// - Parameters:
     ///   - share: `CKShare` object to save.
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     public func saveShareForRecordZone(share: CKShare) {
         guard realmProvider != nil else {
             return
@@ -1418,7 +1418,7 @@ public class RealmSwiftAdapter: NSObject, ModelAdapter {
     }
 
     /// Delete existing `CKShare` for adapter's record zone.
-    @available(iOS 15.0, OSX 12, *)
+    @available(iOS 15.0, OSX 12, watchOS 8.0, *)
     public func deleteShareForRecordZone() {
         guard realmProvider != nil else {
             return