Upgrade to Offline Core 1.0

Author: Clément Le Provost

AlgoliaSearch-Offline-Swift.podspec

@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
 
     s.ios.deployment_target = '8.0'
 
-    s.dependency 'AlgoliaSearchOfflineCore-iOS', '~> 0.2'
+    s.dependency 'AlgoliaSearchOfflineCore-iOS', '~> 1.0'
 
     # Activate Core-dependent code.
     # WARNING: Specifying the preprocessor macro is not enough; it must be added to Swift flags as well.

Podfile

@@ -3,5 +3,5 @@
 use_frameworks!
 
 target "AlgoliaSearch-Offline-iOS" do
-    pod 'AlgoliaSearchOfflineCore-iOS', '~> 0.2'
+    pod 'AlgoliaSearchOfflineCore-iOS', '~> 1.0'
 end

Podfile.lock

@@ -1,12 +1,12 @@
 PODS:
-  - AlgoliaSearchOfflineCore-iOS (0.2.1)
+  - AlgoliaSearchOfflineCore-iOS (1.0)
 
 DEPENDENCIES:
-  - AlgoliaSearchOfflineCore-iOS (~> 0.2)
+  - AlgoliaSearchOfflineCore-iOS (~> 1.0)
 
 SPEC CHECKSUMS:
-  AlgoliaSearchOfflineCore-iOS: 37d76ccada33254b6bad6529fb3c0d4ddcd70e94
+  AlgoliaSearchOfflineCore-iOS: b3eb50575f79c91396bc1aacc529fd3d8954f7ae
 
-PODFILE CHECKSUM: 70f8e7e3ce3a1a02df550109e528d546a9555548
+PODFILE CHECKSUM: 1b63159de2f97dc9b071134b68eb9eab928c59e2
 
 COCOAPODS: 1.1.0.rc.2

Source/Offline/MirroredIndex.swift

@@ -114,7 +114,7 @@ import Foundation
     }
 
     /// The local index mirroring this remote index (lazy instantiated, only if mirroring is activated).
-    lazy var localIndex: ASLocalIndex = ASLocalIndex(dataDir: self.offlineClient.rootDataDir, appID: self.client.appID, indexName: self.name)
+    lazy var localIndex: LocalIndex = LocalIndex(dataDir: self.offlineClient.rootDataDir, appID: self.client.appID, indexName: self.name)
 
     /// The mirrored index settings.
     let mirrorSettings = MirrorSettings()
@@ -338,7 +338,7 @@ import Foundation
         // Task: build the index using the downloaded files.
         buildIndexOperation = BlockOperation() {
             if self.syncError == nil {
-                let status = self.localIndex.build(fromSettingsFile: self.settingsFilePath!, objectFiles: self.objectsFilePaths!, clearIndex: true)
+                let status = self.localIndex.build(settingsFile: self.settingsFilePath!, objectFiles: self.objectsFilePaths!, clearIndex: true, deletedObjectIDs: nil)
                 if status != 200 {
                     self.syncError = HTTPError(statusCode: Int(status))
                 } else {
@@ -670,7 +670,7 @@ import Foundation
         assert(!Thread.isMainThread) // make sure it's run in the background
 
         let searchResults = localIndex.search(query.build())
-        return OfflineClient.parseSearchResults(searchResults: searchResults)
+        return OfflineClient.parseResponse(searchResults)
     }
 
     // MARK: Multiple queries
@@ -870,6 +870,6 @@ import Foundation
         assert(!Thread.isMainThread) // make sure it's run in the background
 
         let searchResults = localIndex.browse(query.build())
-        return OfflineClient.parseSearchResults(searchResults: searchResults)
+        return OfflineClient.parseResponse(searchResults)
     }
 }

Source/Offline/OfflineClient.swift

@@ -50,7 +50,7 @@ import Foundation
         userAgents.append(LibraryVersion(name: "AlgoliaSearchOfflineCore-iOS", version: sdk.versionString))
     }
 
-    var sdk: ASSdk = ASSdk.shared()
+    var sdk: Sdk = Sdk.shared
 
     /// Path to directory where the local data is stored.
     /// Defaults to an `algolia` sub-directory inside the `Library/Application Support` directory.
@@ -100,7 +100,7 @@ import Foundation
         }
 
         // Init the SDK.
-        sdk.initWithLicenseData(licenseKey)
+        sdk.initialize(licenseKey: licenseKey)
         // NOTE: Errors reported by the core itself.
     }
 
@@ -126,14 +126,14 @@ import Foundation
     /// - parameter searchResults: Search results to parse.
     /// - returns: A (content, error) pair that can be passed to a `CompletionHandler`.
     ///
-    internal static func parseSearchResults(searchResults: ASSearchResults) -> (content: JSONObject?, error: Error?) {
+    internal static func parseResponse(_ response: Response) -> (content: JSONObject?, error: Error?) {
         var content: JSONObject?
         var error: Error?
-        let statusCode = Int(searchResults.statusCode)
+        let statusCode = Int(response.statusCode)
         if statusCode == StatusCode.ok.rawValue {
-            assert(searchResults.data != nil)
+            assert(response.data != nil)
             do {
-                let json = try JSONSerialization.jsonObject(with: searchResults.data!, options: [])
+                let json = try JSONSerialization.jsonObject(with: response.data!, options: [])
                 if json is JSONObject {
                     content = (json as! JSONObject)
                     // NOTE: Origin tagging performed by the SDK.