Update to ParseSwift 4.14.2 (#175)

cbaker6 · web-flow · commit 98b1abd56af2 · 2022-10-08T22:40:35.000-04:00
* Update to ParseSwift 4.14.2

* update ci

* fix watch simultor

* fix watch simultor
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
     branches: [ main ]
 env:
-  CI_XCODE: '/Applications/Xcode_14.0.app/Contents/Developer'
+  CI_XCODE: '/Applications/Xcode_14.0.1.app/Contents/Developer'
 
 jobs:
   xcode-test-ios:
@@ -42,7 +42,7 @@ jobs:
     - name: Use multiple cores
       run: defaults write com.apple.dt.XCBuild EnableSwiftBuildSystemIntegration 1
     - name: Build
-      run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -scheme ParseCareKit-watchOS -destination platform\=watchOS\ Simulator,name\=Apple\ Watch\ Series\ 6\ -\ 44mm | xcpretty
+      run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -scheme ParseCareKit-watchOS -destination platform\=watchOS\ Simulator,name\=Apple\ Watch\ Series\ 6\ \(44mm\) | xcpretty
       env:
           DEVELOPER_DIR: ${{ env.CI_XCODE }}
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ on:
   release:
     types: [published]
 env:
-  CI_XCODE: '/Applications/Xcode_14.0.app/Contents/Developer'
+  CI_XCODE: '/Applications/Xcode_14.0.1.app/Contents/Developer'
   
 jobs:
   docs:
diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/cbaker6/CareKit.git",
         "state": {
           "branch": null,
-          "revision": "c18f88d7131db8431796f30241e31ed9d0051c60",
-          "version": "2.1.0"
+          "revision": "90860442762805ceda874921ff04ff15a91e58a7",
+          "version": "2.1.1"
         }
       },
       {
@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/parse-community/Parse-Swift",
         "state": {
           "branch": null,
-          "revision": "40a7b42b20c22253d53b09dc49c37fbb7973fdfe",
-          "version": "4.14.1"
+          "revision": "dc7666f774755be333f48f25c4d8bead0a1a6877",
+          "version": "4.14.2"
         }
       }
     ]
diff --git a/Package.swift b/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
         .package(url: "https://github.com/cbaker6/CareKit.git",
                   .upToNextMajor(from: "2.1.1")),
         .package(url: "https://github.com/parse-community/Parse-Swift.git",
-                  .upToNextMajor(from: "4.14.1"))
+                  .upToNextMajor(from: "4.14.2"))
     ],
     targets: [
         .target(
diff --git a/ParseCareKit.xcodeproj/project.pbxproj b/ParseCareKit.xcodeproj/project.pbxproj
@@ -1167,7 +1167,7 @@
 			repositoryURL = "https://github.com/parse-community/Parse-Swift";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 4.14.1;
+				minimumVersion = 4.14.2;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/Sources/ParseCareKit/Objects/PCKClock.swift b/Sources/ParseCareKit/Objects/PCKClock.swift
@@ -44,7 +44,7 @@ struct PCKClock: ParseObject {
         return updated
     }
 
-    func decodeClock(completion:@escaping(OCKRevisionRecord.KnowledgeVector?) -> Void) {
+    func decodeClock(completion: @escaping(OCKRevisionRecord.KnowledgeVector?) -> Void) {
         guard let data = self.vector?.data(using: .utf8) else {
             if #available(iOS 14.0, watchOS 7.0, *) {
                 Logger.clock.error("Error in Clock. Couldn't get data as utf8")
@@ -144,7 +144,7 @@ struct PCKClock: ParseObject {
     }
 
     static func fetchFromCloud(uuid: UUID, createNewIfNeeded: Bool,
-                               completion:@escaping(PCKClock?,
+                               completion: @escaping(PCKClock?,
                                                     OCKRevisionRecord.KnowledgeVector?,
                                                     ParseError?) -> Void) {
 
diff --git a/Sources/ParseCareKit/PCKUtility.swift b/Sources/ParseCareKit/PCKUtility.swift
@@ -85,7 +85,7 @@ public class PCKUtility {
                               clientKey: clientKey,
                               serverURL: serverURL,
                               liveQueryServerURL: liveQueryURL,
-                              allowingCustomObjectIds: true,
+                              requiringCustomObjectIds: true,
                               usingTransactions: useTransactions,
                               usingPostForQuery: true,
                               deletingKeychainIfNeeded: deleteKeychainIfNeeded,
diff --git a/Sources/ParseCareKit/ParseCareKitConstants.swift b/Sources/ParseCareKit/ParseCareKitConstants.swift
@@ -106,6 +106,7 @@ public enum PCKStoreClass: String {
         ]
 
         for (key, value) in concreteClasses {
+            // swiftlint:disable for_where
             if !isCorrectType(key, check: value) {
                 concreteClasses.removeValue(forKey: key)
             }
diff --git a/Tests/ParseCareKitTests/EncodingCareKitTests.swift b/Tests/ParseCareKitTests/EncodingCareKitTests.swift
@@ -89,7 +89,7 @@ class ParseCareKitTests: XCTestCase {
                               clientKey: "clientKey",
                               masterKey: "masterKey",
                               serverURL: url,
-                              allowingCustomObjectIds: true,
+                              requiringCustomObjectIds: true,
                               usingPostForQuery: true,
                               testing: true)
         do {

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": "c18f88d7131db8431796f30241e31ed9d0051c60",`
`10`		`- "version": "2.1.0"`
	`9`	`+ "revision": "90860442762805ceda874921ff04ff15a91e58a7",`
	`10`	`+ "version": "2.1.1"`
`11`	`11`	`}`
`12`	`12`	`},`
`13`	`13`	`{`
`@@ -24,8 +24,8 @@`
`24`	`24`	`"repositoryURL": "https://github.com/parse-community/Parse-Swift",`
`25`	`25`	`"state": {`
`26`	`26`	`"branch": null,`
`27`		`- "revision": "40a7b42b20c22253d53b09dc49c37fbb7973fdfe",`
`28`		`- "version": "4.14.1"`
	`27`	`+ "revision": "dc7666f774755be333f48f25c4d8bead0a1a6877",`
	`28`	`+ "version": "4.14.2"`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`]`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ struct PCKClock: ParseObject {`
`44`	`44`	`return updated`
`45`	`45`	`}`
`46`	`46`
`47`		`- func decodeClock(completion:@escaping(OCKRevisionRecord.KnowledgeVector?) -> Void) {`
	`47`	`+ func decodeClock(completion: @escaping(OCKRevisionRecord.KnowledgeVector?) -> Void) {`
`48`	`48`	`guard let data = self.vector?.data(using: .utf8) else {`
`49`	`49`	`if #available(iOS 14.0, watchOS 7.0, *) {`
`50`	`50`	`Logger.clock.error("Error in Clock. Couldn't get data as utf8")`
`@@ -144,7 +144,7 @@ struct PCKClock: ParseObject {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`static func fetchFromCloud(uuid: UUID, createNewIfNeeded: Bool,`
`147`		`- completion:@escaping(PCKClock?,`
	`147`	`+ completion: @escaping(PCKClock?,`
`148`	`148`	`OCKRevisionRecord.KnowledgeVector?,`
`149`	`149`	`ParseError?) -> Void) {`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ public enum PCKStoreClass: String {`
`106`	`106`	`]`
`107`	`107`
`108`	`108`	`for (key, value) in concreteClasses {`
	`109`	`+ // swiftlint:disable for_where`
`109`	`110`	`if !isCorrectType(key, check: value) {`
`110`	`111`	`concreteClasses.removeValue(forKey: key)`
`111`	`112`	`}`