Use the new ObjC Interop functions in RealmSwift 2.1.1

Roobiq · Dec 15, 2016 · a571344 · a571344
1 parent 3b5490d
commit a571344
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 56 deletions.
diff --git a/RBQFetchedResultsController.xcodeproj/project.pbxproj b/RBQFetchedResultsController.xcodeproj/project.pbxproj
@@ -596,6 +596,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.Roobiq.SwiftFetchedResultsController;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -619,6 +620,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

diff --git a/RBQFetchedResultsController/Source/Swift/FetchRequest.swift b/RBQFetchedResultsController/Source/Swift/FetchRequest.swift
@@ -29,7 +29,7 @@ open class FetchRequest<T: Object> {
 
         self.realmConfiguration = realm.configuration
 
-        let rlmConfiguration: RLMRealmConfiguration = Realm.toRLMConfiguration(realm.configuration)
+        let rlmConfiguration: RLMRealmConfiguration = ObjectiveCSupport.convert(object: realm.configuration)
 
         let rlmRealm = try! RLMRealm(configuration: rlmConfiguration)
 

diff --git a/RBQFetchedResultsController/Source/Swift/Utilities.swift b/RBQFetchedResultsController/Source/Swift/Utilities.swift
@@ -47,58 +47,3 @@ extension Object {
         return false
     }
 }
-
-/**
-Category on Realm that provides convenience methods similar to Realm class methods but include notifying RBQRealmNotificationManager
-*/
-extension Realm {
-
-    // MARK: Helper Functions To Bridge Objective-C
-
-    /**
-    Convenience method to convert Configuration into RLMRealmConfiguration
-    
-    :nodoc:
-    */
-    internal class func toRLMConfiguration(_ configuration: Configuration) -> RLMRealmConfiguration {
-        let rlmConfiguration = RLMRealmConfiguration()
-
-        if let syncConfig = configuration.syncConfiguration {
-            rlmConfiguration.syncConfiguration = RLMSyncConfiguration(user: syncConfig.user, realmURL: syncConfig.realmURL)
-        }
-
-        // Hack to get around issue with cache objects appearing in Realm
-        // when building RBQFRC not as a framework
-        let mirror = Mirror(reflecting: configuration)
-        for child in mirror.children {
-            if let customSchema = child.value as? RLMSchema, "customSchema" == child.label {
-                // Filter out cache objects
-                let schemaSubset = customSchema.objectSchema.filter { (objectSchema) -> Bool in
-                    let cacheObjectNames = ["RBQControllerCacheObject",
-                                            "RBQObjectCacheObject",
-                                            "RBQSectionCacheObject"]
-
-                    if cacheObjectNames.contains(objectSchema.objectName) {
-                        return false
-                    }
-
-                    return true
-                }
-
-                rlmConfiguration.objectClasses = schemaSubset.map { $0.objectClass }
-            }
-        }
-
-        if (configuration.fileURL != nil) {
-            rlmConfiguration.fileURL = configuration.fileURL
-        }
-
-        if (configuration.inMemoryIdentifier != nil) {
-            rlmConfiguration.inMemoryIdentifier = configuration.inMemoryIdentifier
-        }
-        rlmConfiguration.encryptionKey = configuration.encryptionKey
-        rlmConfiguration.readOnly = configuration.readOnly
-        rlmConfiguration.schemaVersion = configuration.schemaVersion
-        return rlmConfiguration
-    }
-}