Skip to content

Commit b114365

Browse files
cbaker6cbaker6
authored
Bump to CareKit 2.1.8 (#182)
* Bump to CareKit 2.1.8 * add CareKit back to watchOS * Update SPM * Bump ParseSwift
1 parent 13521d6 commit b114365

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ let package = Package(
1212
],
1313
dependencies: [
1414
.package(url: "https://github.com/cbaker6/CareKit.git",
15-
.upToNextMajor(from: "2.1.1")),
15+
.upToNextMajor(from: "2.1.8")),
1616
.package(url: "https://github.com/netreconlab/Parse-Swift.git",
17-
.upToNextMajor(from: "4.15.1"))
17+
.upToNextMajor(from: "4.16.2"))
1818
],
1919
targets: [
2020
.target(

‎ParseCareKit.xcodeproj/project.pbxproj

+14-14
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@
3838
709D1819258699840002E772 /* ParseRemoteDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 709D1817258699840002E772 /* ParseRemoteDelegate.swift */; };
3939
70B12C792904BA07002EE2FA /* ParseSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 70B12C782904BA07002EE2FA /* ParseSwift */; };
4040
70B12C7B2904BA1E002EE2FA /* ParseSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 70B12C7A2904BA1E002EE2FA /* ParseSwift */; };
41+
70B1CB022971A58E0009FDD7 /* CareKitStore in Frameworks */ = {isa = PBXBuildFile; productRef = 70B1CB012971A58E0009FDD7 /* CareKitStore */; };
4142
70B326BE251EBE610028B229 /* PCKUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70B326BD251EBE610028B229 /* PCKUser.swift */; };
4243
70B5578327A74113002C39D4 /* PCKRoleable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70B5578227A74113002C39D4 /* PCKRoleable.swift */; };
4344
70B5578427A74113002C39D4 /* PCKRoleable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70B5578227A74113002C39D4 /* PCKRoleable.swift */; };
4445
70B5578627A7439B002C39D4 /* PCKReadRole.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70B5578527A7439B002C39D4 /* PCKReadRole.swift */; };
4546
70B5578727A7439B002C39D4 /* PCKReadRole.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70B5578527A7439B002C39D4 /* PCKReadRole.swift */; };
4647
70B5578927A744A9002C39D4 /* PCKWriteRole.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70B5578827A744A9002C39D4 /* PCKWriteRole.swift */; };
4748
70B5578A27A744A9002C39D4 /* PCKWriteRole.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70B5578827A744A9002C39D4 /* PCKWriteRole.swift */; };
48-
70D41D7C28B453B500613510 /* CareKitStore in Frameworks */ = {isa = PBXBuildFile; productRef = 70D41D7B28B453B500613510 /* CareKitStore */; };
49-
70D41D7E28B453C600613510 /* CareKitStore in Frameworks */ = {isa = PBXBuildFile; productRef = 70D41D7D28B453C600613510 /* CareKitStore */; };
5049
70D5A29425E0D2D30036A8AD /* PCKHealthKitTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70D5A29325E0D2D30036A8AD /* PCKHealthKitTask.swift */; };
5150
70D5A29525E0D2D30036A8AD /* PCKHealthKitTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70D5A29325E0D2D30036A8AD /* PCKHealthKitTask.swift */; };
51+
70DF63DC29719D6E002FA5C5 /* CareKitStore in Frameworks */ = {isa = PBXBuildFile; productRef = 70DF63DB29719D6E002FA5C5 /* CareKitStore */; };
5252
70F2E181254EFC8000B2EA5C /* PCKObjectable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 918F07ED247D66C800C3A205 /* PCKObjectable.swift */; };
5353
70F2E182254EFC8000B2EA5C /* PCKPatient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9119D5FB24561A28001B7AA3 /* PCKPatient.swift */; };
5454
70F2E183254EFC8000B2EA5C /* PCKContact.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9119D5F824561A28001B7AA3 /* PCKContact.swift */; };
@@ -218,17 +218,17 @@
218218
isa = PBXFrameworksBuildPhase;
219219
buildActionMask = 2147483647;
220220
files = (
221+
70B1CB022971A58E0009FDD7 /* CareKitStore in Frameworks */,
221222
70B12C7B2904BA1E002EE2FA /* ParseSwift in Frameworks */,
222-
70D41D7E28B453C600613510 /* CareKitStore in Frameworks */,
223223
);
224224
runOnlyForDeploymentPostprocessing = 0;
225225
};
226226
9119D5E8245618D7001B7AA3 /* Frameworks */ = {
227227
isa = PBXFrameworksBuildPhase;
228228
buildActionMask = 2147483647;
229229
files = (
230+
70DF63DC29719D6E002FA5C5 /* CareKitStore in Frameworks */,
230231
70B12C792904BA07002EE2FA /* ParseSwift in Frameworks */,
231-
70D41D7C28B453B500613510 /* CareKitStore in Frameworks */,
232232
);
233233
runOnlyForDeploymentPostprocessing = 0;
234234
};
@@ -498,8 +498,8 @@
498498
);
499499
name = "ParseCareKit-watchOS";
500500
packageProductDependencies = (
501-
70D41D7D28B453C600613510 /* CareKitStore */,
502501
70B12C7A2904BA1E002EE2FA /* ParseSwift */,
502+
70B1CB012971A58E0009FDD7 /* CareKitStore */,
503503
);
504504
productName = "ParseCareKit-watchOS";
505505
productReference = 70F2E177254EFC6100B2EA5C /* ParseCareKit_watchOS.framework */;
@@ -522,8 +522,8 @@
522522
);
523523
name = ParseCareKit;
524524
packageProductDependencies = (
525-
70D41D7B28B453B500613510 /* CareKitStore */,
526525
70B12C782904BA07002EE2FA /* ParseSwift */,
526+
70DF63DB29719D6E002FA5C5 /* CareKitStore */,
527527
);
528528
productName = ParseCareKit;
529529
productReference = 9119D5EB245618D7001B7AA3 /* ParseCareKit.framework */;
@@ -565,8 +565,8 @@
565565
);
566566
mainGroup = 9119D5E1245618D7001B7AA3;
567567
packageReferences = (
568-
70D41D7A28B453B500613510 /* XCRemoteSwiftPackageReference "CareKit" */,
569568
70B12C772904BA07002EE2FA /* XCRemoteSwiftPackageReference "Parse-Swift" */,
569+
70DF63DA29719D6E002FA5C5 /* XCRemoteSwiftPackageReference "CareKit" */,
570570
);
571571
productRefGroup = 9119D5EC245618D7001B7AA3 /* Products */;
572572
projectDirPath = "";
@@ -1159,15 +1159,15 @@
11591159
repositoryURL = "https://github.com/netreconlab/Parse-Swift.git";
11601160
requirement = {
11611161
kind = upToNextMajorVersion;
1162-
minimumVersion = 4.15.1;
1162+
minimumVersion = 4.16.2;
11631163
};
11641164
};
1165-
70D41D7A28B453B500613510 /* XCRemoteSwiftPackageReference "CareKit" */ = {
1165+
70DF63DA29719D6E002FA5C5 /* XCRemoteSwiftPackageReference "CareKit" */ = {
11661166
isa = XCRemoteSwiftPackageReference;
11671167
repositoryURL = "https://github.com/cbaker6/CareKit.git";
11681168
requirement = {
11691169
kind = upToNextMajorVersion;
1170-
minimumVersion = 2.1.1;
1170+
minimumVersion = 2.1.8;
11711171
};
11721172
};
11731173
/* End XCRemoteSwiftPackageReference section */
@@ -1183,14 +1183,14 @@
11831183
package = 70B12C772904BA07002EE2FA /* XCRemoteSwiftPackageReference "Parse-Swift" */;
11841184
productName = ParseSwift;
11851185
};
1186-
70D41D7B28B453B500613510 /* CareKitStore */ = {
1186+
70B1CB012971A58E0009FDD7 /* CareKitStore */ = {
11871187
isa = XCSwiftPackageProductDependency;
1188-
package = 70D41D7A28B453B500613510 /* XCRemoteSwiftPackageReference "CareKit" */;
1188+
package = 70DF63DA29719D6E002FA5C5 /* XCRemoteSwiftPackageReference "CareKit" */;
11891189
productName = CareKitStore;
11901190
};
1191-
70D41D7D28B453C600613510 /* CareKitStore */ = {
1191+
70DF63DB29719D6E002FA5C5 /* CareKitStore */ = {
11921192
isa = XCSwiftPackageProductDependency;
1193-
package = 70D41D7A28B453B500613510 /* XCRemoteSwiftPackageReference "CareKit" */;
1193+
package = 70DF63DA29719D6E002FA5C5 /* XCRemoteSwiftPackageReference "CareKit" */;
11941194
productName = CareKitStore;
11951195
};
11961196
/* End XCSwiftPackageProductDependency section */

‎Sources/ParseCareKit/Objects/PCKOutcome.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ public struct PCKOutcome: PCKVersionable, PCKSynchronizable {
427427
return nil
428428
}
429429

430-
public static func queryNotDeleted()-> Query<PCKOutcome> {
430+
public static func queryNotDeleted() -> Query<PCKOutcome> {
431431
let taskQuery = PCKTask.query(doesNotExist(key: OutcomeKey.deletedDate))
432432
// **** BAKER need to fix matchesKeyInQuery and find equivalent "queryKey" in matchesQuery
433433
let query = Self.query(doesNotExist(key: OutcomeKey.deletedDate),

‎Sources/ParseCareKit/Protocols/PCKObjectable.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ extension PCKObjectable {
129129
tags = other.tags
130130
}
131131

132-
/// Stamps all related entities with the current `logicalClock` value
132+
// Stamps all related entities with the current `logicalClock` value
133133
/*mutating public func stampRelationalEntities() throws -> Self {
134134
guard let logicalClock = self.logicalClock else {
135135
throw ParseCareKitError.couldntUnwrapSelf

‎Sources/ParseCareKit/Protocols/PCKVersionable.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ extension PCKVersionable {
247247
return .init(and(queries: [startsBeforeEndOfQuery, noNextVersion]))
248248
}
249249

250-
private static func queryNoNextVersion(for date: Date)-> Query<Self> {
250+
private static func queryNoNextVersion(for date: Date) -> Query<Self> {
251251
// Where empty array
252252
let query = Self.query(VersionableKey.nextVersionUUIDs == [String]())
253253

0 commit comments

Comments
 (0)