Update to latest ParseSwift (#183)

cbaker6 · web-flow · commit d83dff408bdd · 2023-02-23T13:20:05.000-05:00
diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/cbaker6/CareKit.git",
         "state": {
           "branch": null,
-          "revision": "90860442762805ceda874921ff04ff15a91e58a7",
-          "version": "2.1.1"
+          "revision": "954185b307222431e50f656d2870019e9ec97c28",
+          "version": "2.1.8"
         }
       },
       {
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/netreconlab/Parse-Swift.git",
         "state": {
           "branch": null,
-          "revision": "8c58ad28038d2d2894257ceba98ed1f3d2b11e0c",
-          "version": "4.15.1"
+          "revision": "9e7f393744108c796d89be9c91101d106d7ddc67",
+          "version": "5.0.0-beta.7"
         }
       }
     ]
diff --git a/Package.swift b/Package.swift
@@ -12,9 +12,8 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/cbaker6/CareKit.git",
-                  .upToNextMajor(from: "2.1.8")),
-        .package(url: "https://github.com/netreconlab/Parse-Swift.git",
-                  .upToNextMajor(from: "4.16.2"))
+                 .upToNextMajor(from: "2.1.8")),
+        .package(url: "https://github.com/netreconlab/Parse-Swift.git", .exact("5.0.0-beta.7"))
     ],
     targets: [
         .target(
diff --git a/ParseCareKit.xcodeproj/project.pbxproj b/ParseCareKit.xcodeproj/project.pbxproj
@@ -1158,8 +1158,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/netreconlab/Parse-Swift.git";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 4.16.2;
+				kind = exactVersion;
+				version = "5.0.0-beta.7";
 			};
 		};
 		70DF63DA29719D6E002FA5C5 /* XCRemoteSwiftPackageReference "CareKit" */ = {
diff --git a/Sources/ParseCareKit/PCKUtility.swift b/Sources/ParseCareKit/PCKUtility.swift
@@ -47,7 +47,7 @@ public class PCKUtility {
     public class func setupServer(fileName: String = "ParseCareKit",
                                   authentication: ((URLAuthenticationChallenge,
                                                     (URLSession.AuthChallengeDisposition,
-                                                      URLCredential?) -> Void) -> Void)? = nil) {
+                                                      URLCredential?) -> Void) -> Void)? = nil) throws {
         var plistConfiguration: [String: AnyObject]
         var clientKey: String?
         var liveQueryURL: URL?
@@ -81,15 +81,15 @@ public class PCKUtility {
             deleteKeychainIfNeeded = deleteKeychain
         }
 
-        ParseSwift.initialize(applicationId: appID,
-                              clientKey: clientKey,
-                              serverURL: serverURL,
-                              liveQueryServerURL: liveQueryURL,
-                              requiringCustomObjectIds: true,
-                              usingTransactions: useTransactions,
-                              usingPostForQuery: true,
-                              deletingKeychainIfNeeded: deleteKeychainIfNeeded,
-                              authentication: authentication)
+        try ParseSwift.initialize(applicationId: appID,
+                                  clientKey: clientKey,
+                                  serverURL: serverURL,
+                                  liveQueryServerURL: liveQueryURL,
+                                  requiringCustomObjectIds: true,
+                                  usingTransactions: useTransactions,
+                                  usingPostForQuery: true,
+                                  deletingKeychainIfNeeded: deleteKeychainIfNeeded,
+                                  authentication: authentication)
     }
 
     /**
diff --git a/Sources/ParseCareKit/ParseRemote.swift b/Sources/ParseCareKit/ParseRemote.swift
@@ -255,11 +255,12 @@ public class ParseRemote: OCKRemoteSynchronizable {
 
         Task {
             do {
-                guard try await ParseHealth.check().contains("ok") else {
+                let status = try await ParseHealth.check()
+                guard status == .ok else {
                     if #available(iOS 14.0, watchOS 7.0, *) {
-                        Logger.pullRevisions.error("Server health is not \"ok\"")
+                        Logger.pullRevisions.error("Server health is: \(status.rawValue)")
                     } else {
-                        os_log("Server health is not \"ok\"", log: .pullRevisions, type: .error)
+                        os_log("Server health is not ok", log: .pullRevisions, type: .error)
                     }
                     completion(ParseCareKitError.parseHealthError)
                     return
@@ -425,9 +426,10 @@ public class ParseRemote: OCKRemoteSynchronizable {
 
         Task {
             do {
-                guard try await ParseHealth.check().contains("ok") else {
+                let status = try await ParseHealth.check()
+                guard status == .ok else {
                     if #available(iOS 14.0, watchOS 7.0, *) {
-                        Logger.pushRevisions.error("Server health is not \"ok\"")
+                        Logger.pushRevisions.error("Server health is: \(status.rawValue)")
                     } else {
                         os_log("Server health is not \"ok\"", log: .pushRevisions, type: .error)
                     }
diff --git a/Tests/ParseCareKitTests/EncodingCareKitTests.swift b/Tests/ParseCareKitTests/EncodingCareKitTests.swift
@@ -85,13 +85,13 @@ class ParseCareKitTests: XCTestCase {
             XCTFail("Should create valid URL")
             return
         }
-        ParseSwift.initialize(applicationId: "applicationId",
-                              clientKey: "clientKey",
-                              primaryKey: "primaryKey",
-                              serverURL: url,
-                              requiringCustomObjectIds: true,
-                              usingPostForQuery: true,
-                              testing: true)
+        try ParseSwift.initialize(applicationId: "applicationId",
+                                  clientKey: "clientKey",
+                                  primaryKey: "primaryKey",
+                                  serverURL: url,
+                                  requiringCustomObjectIds: true,
+                                  usingPostForQuery: true,
+                                  testing: true)
         do {
             _ = try userLogin()
             parse = try ParseRemote(uuid: UUID(uuidString: "3B5FD9DA-C278-4582-90DC-101C08E7FC98")!,
diff --git a/Tests/ParseCareKitTests/NetworkMocking/MockURLResponse.swift b/Tests/ParseCareKitTests/NetworkMocking/MockURLResponse.swift
@@ -34,7 +34,7 @@ struct MockURLResponse {
             let encoded = try JSONEncoder().encode(string)
             self.init(data: encoded, statusCode: statusCode, delay: delay, headerFields: headerFields)
         } catch {
-            throw ParseError(code: .unknownError, message: "unable to convert string to data")
+            throw ParseError(code: .otherCause, message: "unable to convert string to data")
         }
     }
 
diff --git a/Tests/ParseCareKitTests/UtilityTests.swift b/Tests/ParseCareKitTests/UtilityTests.swift
@@ -24,7 +24,7 @@ class UtilityTests: XCTestCase {
     }
 
     func testSetupServer() throws {
-        PCKUtility.setupServer { (_, completionHandler) in
+        try PCKUtility.setupServer { (_, completionHandler) in
             completionHandler(.performDefaultHandling, nil)
         }
         XCTAssertEqual(ParseSwift.configuration.applicationId, "3B5FD9DA-C278-4582-90DC-101C08E7FC98")

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`	`"repositoryURL": "https://github.com/cbaker6/CareKit.git",`
`7`	`7`	`"state": {`
`8`	`8`	`"branch": null,`
`9`		`- "revision": "90860442762805ceda874921ff04ff15a91e58a7",`
`10`		`- "version": "2.1.1"`
	`9`	`+ "revision": "954185b307222431e50f656d2870019e9ec97c28",`
	`10`	`+ "version": "2.1.8"`
`11`	`11`	`}`
`12`	`12`	`},`
`13`	`13`	`{`
`@@ -24,8 +24,8 @@`
`24`	`24`	`"repositoryURL": "https://github.com/netreconlab/Parse-Swift.git",`
`25`	`25`	`"state": {`
`26`	`26`	`"branch": null,`
`27`		`- "revision": "8c58ad28038d2d2894257ceba98ed1f3d2b11e0c",`
`28`		`- "version": "4.15.1"`
	`27`	`+ "revision": "9e7f393744108c796d89be9c91101d106d7ddc67",`
	`28`	`+ "version": "5.0.0-beta.7"`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`]`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ struct MockURLResponse {`
`34`	`34`	`let encoded = try JSONEncoder().encode(string)`
`35`	`35`	`self.init(data: encoded, statusCode: statusCode, delay: delay, headerFields: headerFields)`
`36`	`36`	`} catch {`
`37`		`- throw ParseError(code: .unknownError, message: "unable to convert string to data")`
	`37`	`+ throw ParseError(code: .otherCause, message: "unable to convert string to data")`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class UtilityTests: XCTestCase {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`func testSetupServer() throws {`
`27`		`- PCKUtility.setupServer { (_, completionHandler) in`
	`27`	`+ try PCKUtility.setupServer { (_, completionHandler) in`
`28`	`28`	`completionHandler(.performDefaultHandling, nil)`
`29`	`29`	`}`
`30`	`30`	`XCTAssertEqual(ParseSwift.configuration.applicationId, "3B5FD9DA-C278-4582-90DC-101C08E7FC98")`