Skip to content

Commit 5584541

Browse files
cbaker6cbaker6
authored
Switch to netreconlab ParseSwift (#176)
* Switch to netreconlab ParseSwift * nits
1 parent 98b1abd commit 5584541

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

‎Package.resolved

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
},
2222
{
2323
"package": "ParseSwift",
24-
"repositoryURL": "https://github.com/parse-community/Parse-Swift",
24+
"repositoryURL": "https://github.com/netreconlab/Parse-Swift.git",
2525
"state": {
2626
"branch": null,
27-
"revision": "dc7666f774755be333f48f25c4d8bead0a1a6877",
28-
"version": "4.14.2"
27+
"revision": "8c58ad28038d2d2894257ceba98ed1f3d2b11e0c",
28+
"version": "4.15.1"
2929
}
3030
}
3131
]

‎Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ let package = Package(
1313
dependencies: [
1414
.package(url: "https://github.com/cbaker6/CareKit.git",
1515
.upToNextMajor(from: "2.1.1")),
16-
.package(url: "https://github.com/parse-community/Parse-Swift.git",
17-
.upToNextMajor(from: "4.14.2"))
16+
.package(url: "https://github.com/netreconlab/Parse-Swift.git",
17+
.upToNextMajor(from: "4.15.1"))
1818
],
1919
targets: [
2020
.target(

‎ParseCareKit.xcodeproj/project.pbxproj

+23-23
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
709D18072586903C0002E772 /* LoggerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 709D18062586903C0002E772 /* LoggerTests.swift */; };
3737
709D1818258699840002E772 /* ParseRemoteDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 709D1817258699840002E772 /* ParseRemoteDelegate.swift */; };
3838
709D1819258699840002E772 /* ParseRemoteDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 709D1817258699840002E772 /* ParseRemoteDelegate.swift */; };
39+
70B12C792904BA07002EE2FA /* ParseSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 70B12C782904BA07002EE2FA /* ParseSwift */; };
40+
70B12C7B2904BA1E002EE2FA /* ParseSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 70B12C7A2904BA1E002EE2FA /* ParseSwift */; };
3941
70B326BE251EBE610028B229 /* PCKUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70B326BD251EBE610028B229 /* PCKUser.swift */; };
4042
70B5578327A74113002C39D4 /* PCKRoleable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70B5578227A74113002C39D4 /* PCKRoleable.swift */; };
4143
70B5578427A74113002C39D4 /* PCKRoleable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70B5578227A74113002C39D4 /* PCKRoleable.swift */; };
@@ -45,8 +47,6 @@
4547
70B5578A27A744A9002C39D4 /* PCKWriteRole.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70B5578827A744A9002C39D4 /* PCKWriteRole.swift */; };
4648
70D41D7C28B453B500613510 /* CareKitStore in Frameworks */ = {isa = PBXBuildFile; productRef = 70D41D7B28B453B500613510 /* CareKitStore */; };
4749
70D41D7E28B453C600613510 /* CareKitStore in Frameworks */ = {isa = PBXBuildFile; productRef = 70D41D7D28B453C600613510 /* CareKitStore */; };
48-
70D41D8628B7EA7B00613510 /* ParseSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 70D41D8528B7EA7B00613510 /* ParseSwift */; };
49-
70D41D8828B7EA8D00613510 /* ParseSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 70D41D8728B7EA8D00613510 /* ParseSwift */; };
5050
70D5A29425E0D2D30036A8AD /* PCKHealthKitTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70D5A29325E0D2D30036A8AD /* PCKHealthKitTask.swift */; };
5151
70D5A29525E0D2D30036A8AD /* PCKHealthKitTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 70D5A29325E0D2D30036A8AD /* PCKHealthKitTask.swift */; };
5252
70F2E181254EFC8000B2EA5C /* PCKObjectable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 918F07ED247D66C800C3A205 /* PCKObjectable.swift */; };
@@ -218,7 +218,7 @@
218218
isa = PBXFrameworksBuildPhase;
219219
buildActionMask = 2147483647;
220220
files = (
221-
70D41D8828B7EA8D00613510 /* ParseSwift in Frameworks */,
221+
70B12C7B2904BA1E002EE2FA /* ParseSwift in Frameworks */,
222222
70D41D7E28B453C600613510 /* CareKitStore in Frameworks */,
223223
);
224224
runOnlyForDeploymentPostprocessing = 0;
@@ -227,7 +227,7 @@
227227
isa = PBXFrameworksBuildPhase;
228228
buildActionMask = 2147483647;
229229
files = (
230-
70D41D8628B7EA7B00613510 /* ParseSwift in Frameworks */,
230+
70B12C792904BA07002EE2FA /* ParseSwift in Frameworks */,
231231
70D41D7C28B453B500613510 /* CareKitStore in Frameworks */,
232232
);
233233
runOnlyForDeploymentPostprocessing = 0;
@@ -499,7 +499,7 @@
499499
name = "ParseCareKit-watchOS";
500500
packageProductDependencies = (
501501
70D41D7D28B453C600613510 /* CareKitStore */,
502-
70D41D8728B7EA8D00613510 /* ParseSwift */,
502+
70B12C7A2904BA1E002EE2FA /* ParseSwift */,
503503
);
504504
productName = "ParseCareKit-watchOS";
505505
productReference = 70F2E177254EFC6100B2EA5C /* ParseCareKit_watchOS.framework */;
@@ -523,7 +523,7 @@
523523
name = ParseCareKit;
524524
packageProductDependencies = (
525525
70D41D7B28B453B500613510 /* CareKitStore */,
526-
70D41D8528B7EA7B00613510 /* ParseSwift */,
526+
70B12C782904BA07002EE2FA /* ParseSwift */,
527527
);
528528
productName = ParseCareKit;
529529
productReference = 9119D5EB245618D7001B7AA3 /* ParseCareKit.framework */;
@@ -566,7 +566,7 @@
566566
mainGroup = 9119D5E1245618D7001B7AA3;
567567
packageReferences = (
568568
70D41D7A28B453B500613510 /* XCRemoteSwiftPackageReference "CareKit" */,
569-
70D41D8428B7EA7B00613510 /* XCRemoteSwiftPackageReference "Parse-Swift" */,
569+
70B12C772904BA07002EE2FA /* XCRemoteSwiftPackageReference "Parse-Swift" */,
570570
);
571571
productRefGroup = 9119D5EC245618D7001B7AA3 /* Products */;
572572
projectDirPath = "";
@@ -1154,25 +1154,35 @@
11541154
/* End XCConfigurationList section */
11551155

11561156
/* Begin XCRemoteSwiftPackageReference section */
1157-
70D41D7A28B453B500613510 /* XCRemoteSwiftPackageReference "CareKit" */ = {
1157+
70B12C772904BA07002EE2FA /* XCRemoteSwiftPackageReference "Parse-Swift" */ = {
11581158
isa = XCRemoteSwiftPackageReference;
1159-
repositoryURL = "https://github.com/cbaker6/CareKit.git";
1159+
repositoryURL = "https://github.com/netreconlab/Parse-Swift.git";
11601160
requirement = {
11611161
kind = upToNextMajorVersion;
1162-
minimumVersion = 2.1.1;
1162+
minimumVersion = 4.15.1;
11631163
};
11641164
};
1165-
70D41D8428B7EA7B00613510 /* XCRemoteSwiftPackageReference "Parse-Swift" */ = {
1165+
70D41D7A28B453B500613510 /* XCRemoteSwiftPackageReference "CareKit" */ = {
11661166
isa = XCRemoteSwiftPackageReference;
1167-
repositoryURL = "https://github.com/parse-community/Parse-Swift";
1167+
repositoryURL = "https://github.com/cbaker6/CareKit.git";
11681168
requirement = {
11691169
kind = upToNextMajorVersion;
1170-
minimumVersion = 4.14.2;
1170+
minimumVersion = 2.1.1;
11711171
};
11721172
};
11731173
/* End XCRemoteSwiftPackageReference section */
11741174

11751175
/* Begin XCSwiftPackageProductDependency section */
1176+
70B12C782904BA07002EE2FA /* ParseSwift */ = {
1177+
isa = XCSwiftPackageProductDependency;
1178+
package = 70B12C772904BA07002EE2FA /* XCRemoteSwiftPackageReference "Parse-Swift" */;
1179+
productName = ParseSwift;
1180+
};
1181+
70B12C7A2904BA1E002EE2FA /* ParseSwift */ = {
1182+
isa = XCSwiftPackageProductDependency;
1183+
package = 70B12C772904BA07002EE2FA /* XCRemoteSwiftPackageReference "Parse-Swift" */;
1184+
productName = ParseSwift;
1185+
};
11761186
70D41D7B28B453B500613510 /* CareKitStore */ = {
11771187
isa = XCSwiftPackageProductDependency;
11781188
package = 70D41D7A28B453B500613510 /* XCRemoteSwiftPackageReference "CareKit" */;
@@ -1183,16 +1193,6 @@
11831193
package = 70D41D7A28B453B500613510 /* XCRemoteSwiftPackageReference "CareKit" */;
11841194
productName = CareKitStore;
11851195
};
1186-
70D41D8528B7EA7B00613510 /* ParseSwift */ = {
1187-
isa = XCSwiftPackageProductDependency;
1188-
package = 70D41D8428B7EA7B00613510 /* XCRemoteSwiftPackageReference "Parse-Swift" */;
1189-
productName = ParseSwift;
1190-
};
1191-
70D41D8728B7EA8D00613510 /* ParseSwift */ = {
1192-
isa = XCSwiftPackageProductDependency;
1193-
package = 70D41D8428B7EA7B00613510 /* XCRemoteSwiftPackageReference "Parse-Swift" */;
1194-
productName = ParseSwift;
1195-
};
11961196
/* End XCSwiftPackageProductDependency section */
11971197
};
11981198
rootObject = 9119D5E2245618D7001B7AA3 /* Project object */;

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
**Use at your own risk. There is no promise that this is HIPAA compliant and we are not responsible for any mishandling of your data**
1212

13-
This framework is an API to synchronize [CareKit](https://github.com/carekit-apple/CareKit) 2.1+ data with [parse-server](https://github.com/parse-community/parse-server) using [Parse-Swift](https://github.com/parse-community/Parse-Swift). The learn more about how to use ParseCareKit check out the [API documentation](https://netreconlab.github.io/ParseCareKit/main/documentation/parsecarekit/) along with the rest of the README.
13+
This framework is an API to synchronize [CareKit](https://github.com/carekit-apple/CareKit) 2.1+ data with [parse-server](https://github.com/parse-community/parse-server) using [Parse-Swift](https://github.com/netreconlab/Parse-Swift). The learn more about how to use ParseCareKit check out the [API documentation](https://netreconlab.github.io/ParseCareKit/main/documentation/parsecarekit/) along with the rest of the README.
1414

1515
For the backend, it is suggested to use [parse-hipaa](https://github.com/netreconlab/parse-hipaa) which is an out-of-the-box HIPAA compliant Parse/[Postgres](https://www.postgresql.org) or Parse/[Mongo](https://www.mongodb.com) server that comes with [Parse Dashboard](https://github.com/parse-community/parse-dashboard). Since [parse-hipaa](https://github.com/netreconlab/parse-hipaa) is a pare-server, it can be used for [iOS](https://docs.parseplatform.org/ios/guide/), [Android](https://docs.parseplatform.org/android/guide/), and web based apps. API's such as [GraphQL](https://docs.parseplatform.org/graphql/guide/), [REST](https://docs.parseplatform.org/rest/guide/), and [JS](https://docs.parseplatform.org/js/guide/) are also enabled in parse-hipaa and can be accessed directly or tested via the "API Console" in parse-dashboard. See the [Parse SDK documentation](https://parseplatform.org/#sdks) for details. These docker images include the necessary database auditing and logging for HIPAA compliance.
1616

@@ -49,7 +49,7 @@ PCKUtility.setupServer { (challenge, completionHandler) in
4949
```
5050

5151
## What version of ParseCareKit Suits Your Needs?
52-
- (Most cases) Need to use ParseCareKit for iOS13+ and/or watchOS7 and will be using the latest (the minimal required commit is from [PR #508](https://github.com/carekit-apple/CareKit/commit/248c42c4e4ea97ff5fe349361fa6e0a849eab204)) [CareKit 2.1](https://github.com/carekit-apple/CareKit#carekit-), [CareKitUI](https://github.com/carekit-apple/CareKit#carekitui-), and [CareKitStore](https://github.com/carekit-apple/CareKit#carekitstore-) (using `OCKStore`) within your app? You should use the [main](https://github.com/netreconlab/ParseCareKit) branch. You can take advantage of all of the capabilities of ParseCareKit. You should use `ParseRemote()` see [below](#synchronizing-your-data) more details. This branch uses the [Parse-Swift SDK](https://github.com/parse-community/Parse-Swift) instead of the [Parse-Objc SDK](https://github.com/parse-community/Parse-SDK-iOS-OSX).
52+
- (Most cases) Need to use ParseCareKit for iOS13+ and/or watchOS7 and will be using the latest (the minimal required commit is from [PR #508](https://github.com/carekit-apple/CareKit/commit/248c42c4e4ea97ff5fe349361fa6e0a849eab204)) [CareKit 2.1](https://github.com/carekit-apple/CareKit#carekit-), [CareKitUI](https://github.com/carekit-apple/CareKit#carekitui-), and [CareKitStore](https://github.com/carekit-apple/CareKit#carekitstore-) (using `OCKStore`) within your app? You should use the [main](https://github.com/netreconlab/ParseCareKit) branch. You can take advantage of all of the capabilities of ParseCareKit. You should use `ParseRemote()` see [below](#synchronizing-your-data) more details. This branch uses the [Parse-Swift SDK](https://github.com/netreconlab/Parse-Swift) instead of the [Parse-Objc SDK](https://github.com/parse-community/Parse-SDK-iOS-OSX).
5353
- Need to use ParseCareKit for iOS13+ and/or watchOS7 and will be using the latest [CareKit](https://github.com/carekit-apple/CareKit#carekit-), [CareKitUI](https://github.com/carekit-apple/CareKit#carekitui-), and [CareKitStore](https://github.com/carekit-apple/CareKit#carekitstore-) (but you would like to use the [Parse Objc SDK](https://github.com/parse-community/Parse-SDK-iOS-OSX)) within your app? You will need to use Cocoapods and the [Parse-Objc SDK](https://github.com/netreconlab/ParseCareKit/tree/parse-objc) branch. You can still use all of the capabilities of ParseCareKit. You should use `ParseSynchronizedStoreManager()` see [here](https://github.com/netreconlab/ParseCareKit/tree/parse-objc#synchronizing-your-data) for more details.
5454
- Need to use ParseCareKit for iOS13+ and will be using [CareKit <= 2.0.1](https://github.com/carekit-apple/CareKit#carekit-), [CareKitUI <= 2.0.1](https://github.com/carekit-apple/CareKit#carekitui-), and [CareKitStore <= 2.0.1](https://github.com/carekit-apple/CareKit#carekitstore-) (using `OCKStore` or conforming to `OCKAnyStoreProtocol`) within your app? You should use the [carekit_2.0.1](https://github.com/netreconlab/ParseCareKit/tree/carekit_2.0.1) branch. You can still use most of the capabilities of ParseCareKit, but you will be limited to syncing via a "wall clock" instead of "knowledge vectors". You will also have to use the [Parse Objc SDK](https://github.com/parse-community/Parse-SDK-iOS-OSX)) and Cocoapods. You should use `ParseSynchronizedStoreManager()` see [here](https://github.com/netreconlab/ParseCareKit/tree/carekit_2.0.1#synchronizing-your-data) for more details.
5555

‎Sources/ParseCareKit/Documentation.docc/ParseCareKit.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Seamlessly Synchronize CareKit 2.1+ data with a Parse Server.
44

55
## Overview
66

7-
This framework provides an API to synchronize [CareKit](https://github.com/carekit-apple/CareKit) 2.1+ data with [parse-server](https://github.com/parse-community/parse-server) using [Parse-Swift](https://github.com/parse-community/Parse-Swift). The learn more about how to use ParseCareKit check out the [API documentation](https://netreconlab.github.io/ParseCareKit/api/) along with the rest of the README.
7+
This framework provides an API to synchronize [CareKit](https://github.com/carekit-apple/CareKit) 2.1+ data with [parse-server](https://github.com/parse-community/parse-server) using [Parse-Swift](https://github.com/netreconlab/Parse-Swift). The learn more about how to use ParseCareKit check out the [API documentation](https://netreconlab.github.io/ParseCareKit/api/) along with the rest of the README.
88

99
**Use at your own risk. There is no promise that this is HIPAA compliant and we are not responsible for any mishandling of your data**
1010

‎Tests/ParseCareKitTests/EncodingCareKitTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class ParseCareKitTests: XCTestCase {
8787
}
8888
ParseSwift.initialize(applicationId: "applicationId",
8989
clientKey: "clientKey",
90-
masterKey: "masterKey",
90+
primaryKey: "primaryKey",
9191
serverURL: url,
9292
requiringCustomObjectIds: true,
9393
usingPostForQuery: true,

0 commit comments

Comments
 (0)