4.0.0 Release #734

Author: gavirawson-apple

.swiftpm/xcode/xcshareddata/xcschemes/CareKit (SPM).xcscheme

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

.swiftpm/xcode/xcshareddata/xcschemes/CareKitFHIR (SPM).xcscheme

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

.swiftpm/xcode/xcshareddata/xcschemes/CareKitStore (SPM).xcscheme

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

.swiftpm/xcode/xcshareddata/xcschemes/CareKitUI (SPM).xcscheme

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

CareKit/CareKit.xcodeproj/project.pbxproj

@@ -874,7 +874,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1020;
-				LastUpgradeCheck = 1620;
+				LastUpgradeCheck = 1640;
 				ORGANIZATIONNAME = carekit.org;
 				TargetAttributes = {
 					5196C7F8226F8F8F00F1C2A2 = {
@@ -1223,7 +1223,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				MARKETING_VERSION = "$(VERSION_NUMBER)";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1237,7 +1237,7 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 8.7;
+				WATCHOS_DEPLOYMENT_TARGET = 11.0;
 			};
 			name = Debug;
 		};
@@ -1300,7 +1300,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
+				IPHONEOS_DEPLOYMENT_TARGET = 18.0;
 				MARKETING_VERSION = "$(VERSION_NUMBER)";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = NO;
@@ -1314,7 +1314,7 @@
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
-				WATCHOS_DEPLOYMENT_TARGET = 8.7;
+				WATCHOS_DEPLOYMENT_TARGET = 11.0;
 			};
 			name = Release;
 		};
@@ -1357,7 +1357,6 @@
 				"SWIFT_ACTIVE_COMPILATION_CONDITIONS[arch=*]" = DEBUG;
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
 				TARGETED_DEVICE_FAMILY = "1,2,4";
-				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 			};
 			name = Debug;
 		};
@@ -1399,7 +1398,6 @@
 				SUPPORTS_UIKITFORMAC = NO;
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
 				TARGETED_DEVICE_FAMILY = "1,2,4";
-				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 			};
 			name = Release;
 		};

CareKit/CareKit.xcodeproj/xcshareddata/xcschemes/CareKit.xcscheme

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

CareKit/CareKit/Shared/Extensions/OCKAnyContact+Extension.swift

@@ -60,7 +60,7 @@ extension OCKAnyContact {
 
         // Generate the map item that pinpoints the contact's address
         let geoloc = CLGeocoder()
-        geoloc.geocodePostalAddress(address) { placemarks, error in
+        geoloc.geocodePostalAddress(address.cnPostalAddress()) { placemarks, error in
 
             if let error {
                 log(.error, "Failed to geocode postal address", error: error)

CareKit/CareKit/iOS/Extensions/OCKContact+Extensions.swift

@@ -39,7 +39,7 @@ private extension OCKLabeledValue {
 }
 
 private extension OCKPostalAddress {
-    func toCNLabeledValue() -> CNLabeledValue<CNPostalAddress> { CNLabeledValue(label: "", value: self) }
+    func toCNLabeledValue() -> CNLabeledValue<CNPostalAddress> { CNLabeledValue(label: "", value: cnPostalAddress()) }
 }
 
 

CareKit/CareKit/iOS/View Updaters/Contact/OCKDetailedContactView+Updatable.swift

@@ -43,7 +43,7 @@ extension OCKDetailedContactView: OCKContactUpdatable {
         }
 
         instructionsLabel.text = contact.role
-        addressButton.detailLabel.text = OCKContactUtility.string(from: contact.address)
+        addressButton.detailLabel.text = OCKContactUtility.string(from: contact.address?.cnPostalAddress())
 
         // Show the contact buttons if the contact has relevant data
         addressButton.setIsHiddenIfNeeded(contact.address == nil)

CareKit/CareKitTests/Contact/TestDetailedContactViewSynchronizer.swift

@@ -45,12 +45,15 @@ private extension OCKContact {
         contact.title = "Family Practice"
         contact.messagingNumbers = phoneNumbers
         contact.emailAddresses = [OCKLabeledValue(label: "work", value: "[email protected]")]
-        let address = OCKPostalAddress()
-        address.street = "26 E Centerline Rd"
-        address.city = "Victor"
-        address.state = "MI"
-        address.postalCode = "48848"
-        contact.address = address
+
+        contact.address = OCKPostalAddress(
+            street: "26 E Centerline Rd",
+            city: "Victor",
+            state: "MI",
+            postalCode:  "48848",
+            country: ""
+        )
+
         return contact
     }
 }
@@ -99,7 +102,7 @@ class TestDetailedContactViewSynchronizer: XCTestCase {
         XCTAssertEqual(view.headerView.detailLabel.text, contact.title)
         XCTAssertEqual(view.headerView.iconImageView?.image, UIImage(systemName: "person.crop.circle"))
         XCTAssertEqual(view.instructionsLabel.text, contact.role)
-        XCTAssertEqual(view.addressButton.detailLabel.text, addressFormatter.string(from: contact.address!))
+        XCTAssertEqual(view.addressButton.detailLabel.text, addressFormatter.string(from: contact.address!.cnPostalAddress()))
         XCTAssertFalse(view.addressButton.isHidden)
         XCTAssertFalse(view.callButton.isHidden)
         XCTAssertFalse(view.emailButton.isHidden)