Update Parse and project

ParseCareKit.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -408,7 +408,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1170;
-				LastUpgradeCheck = 1140;
+				LastUpgradeCheck = 1200;
 				ORGANIZATIONNAME = "Network Reconnaissance Lab";
 				TargetAttributes = {
 					709752D0250D270E0020EA70 = {
@@ -736,6 +736,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -799,6 +800,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

ParseCareKit.xcodeproj/xcshareddata/xcschemes/ParseCareKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1170"
+   LastUpgradeVersion = "1200"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

ParseCareKit.xcodeproj/xcshareddata/xcschemes/ParseCareKitTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1170"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ParseCareKit.xcodeproj/xcshareddata/xcschemes/TestHost.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1170"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ParseCareKit/PCKObjects/Patient.swift

@@ -12,7 +12,7 @@ import CareKitStore
 
 open class Patient: PCKVersionedObject, PCKRemoteSynchronized {
 
-    @NSManaged public var alergies:[String]?
+    @NSManaged public var allergies:[String]?
     @NSManaged public var birthday:Date?
     @NSManaged public var name:[String:String]
     @NSManaged public var sex:String?
@@ -188,7 +188,7 @@ open class Patient: PCKVersionedObject, PCKRemoteSynchronized {
         self.name = other.name
         self.birthday = other.birthday
         self.sex = other.sex
-        self.alergies = other.alergies
+        self.allergies = other.allergies
     }
 
     open func copyCareKit(_ patientAny: OCKAnyPatient)->Patient?{
@@ -220,7 +220,7 @@ open class Patient: PCKVersionedObject, PCKRemoteSynchronized {
         self.timezone = patient.timezone.abbreviation()!
         self.userInfo = patient.userInfo
         self.remoteID = patient.remoteID
-        self.alergies = patient.allergies
+        self.allergies = patient.allergies
         self.createdDate = patient.createdDate
         self.notes = patient.notes?.compactMap{Note(careKitEntity: $0)}
         self.previousVersionUUID = patient.previousVersionUUID
@@ -245,7 +245,7 @@ open class Patient: PCKVersionedObject, PCKRemoteSynchronized {
             patient.effectiveDate = effectiveDate
         }
         patient.birthday = self.birthday
-        patient.allergies = self.alergies
+        patient.allergies = self.allergies
         patient.groupIdentifier = self.groupIdentifier
         patient.tags = self.tags
         patient.source = self.source

ParseCareKit/ParseCareKitConstants.swift

@@ -214,7 +214,7 @@ public let kPCKVersionedObjectPreviousKey                           = "previous"
 public let kPCKPatientClassKey                                 = "Patient"
 
 // Field keys
-public let kPCKPatientAllergiesKey                                  = "alergies"
+public let kPCKPatientAllergiesKey                                  = "allergies"
 public let kPCKPatientBirthdayKey                                   = "birthday"
 public let kPCKPatientSexKey                                        = "sex"
 public let kPCKPatientNameKey                                       = "name"

Podfile

@@ -3,8 +3,8 @@ platform :ios, '13.0'
 
 def shared_pods
   # Pods for ParseCareKit
-  pod 'CareKitStore', :git => 'https://github.com/cbaker6/CareKit.git', :branch => 'pod_vector'
-  pod 'Parse', '~>1.19'
+  pod 'CareKitStore', :git => 'https://github.com/cbaker6/CareKit.git', :branch => 'pod-2.1'
+  pod 'Parse', '~>1.19.1'
 end
 
 target 'ParseCareKit' do

Podfile.lock

@@ -1,14 +1,14 @@
 PODS:
   - Bolts/Tasks (1.9.1)
   - CareKitStore (2.0)
-  - Parse (1.19.0):
-    - Parse/Core (= 1.19.0)
-  - Parse/Core (1.19.0):
+  - Parse (1.19.1):
+    - Parse/Core (= 1.19.1)
+  - Parse/Core (1.19.1):
     - Bolts/Tasks (= 1.9.1)
 
 DEPENDENCIES:
-  - CareKitStore (from `https://github.com/cbaker6/CareKit.git`, branch `pod_vector`)
-  - Parse (~> 1.19)
+  - CareKitStore (from `https://github.com/cbaker6/CareKit.git`, branch `pod-2.1`)
+  - Parse (~> 1.19.1)
 
 SPEC REPOS:
   trunk:
@@ -17,19 +17,19 @@ SPEC REPOS:
 
 EXTERNAL SOURCES:
   CareKitStore:
-    :branch: pod_vector
+    :branch: pod-2.1
     :git: https://github.com/cbaker6/CareKit.git
 
 CHECKOUT OPTIONS:
   CareKitStore:
-    :commit: 318777d4228ded9ed7d86546c8c8e0a85b972235
+    :commit: 4505f49c4e661473591dfd7d62b559612798325d
     :git: https://github.com/cbaker6/CareKit.git
 
 SPEC CHECKSUMS:
   Bolts: 8c1e8aab2f603387b8b9924f57d1d64f43d3ffdc
-  CareKitStore: a0aeabb8c7dd7430c23ff537e7c45c8a6c829daa
-  Parse: 0fb5c7cc7ee5900f2434e24607d0496155b8d04f
+  CareKitStore: 101833e04614da1849be23f4346b052ba7a16e8d
+  Parse: e40fdb9c7d665823b7fe9865949cac9a53eb2ce7
 
-PODFILE CHECKSUM: 60e27d205026810ad54d92f7a016d06f5e106ce7
+PODFILE CHECKSUM: d9ae13d59005a29048eba24d7b5c30168ae5042b
 
 COCOAPODS: 1.9.3