convergence

.gitmodules

@@ -2,3 +2,4 @@
 	path = dependency
 	url = https://github.com/ResearchKit/ResearchKit.git
 	branch = stable
+

CareKit.xcodeproj/project.pbxproj

@@ -811,17 +811,20 @@
 		8605A5B11C4F04EC00DD65FF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = carekit.org;
 				TargetAttributes = {
 					8605A5B91C4F04EC00DD65FF = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 					8605A5C31C4F04EC00DD65FF = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 					86189D081CC06A75006C74F0 = {
 						CreatedOnToolsVersion = 7.3;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -1051,6 +1054,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -1098,6 +1102,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -1150,6 +1155,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.carekit.CareKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1168,6 +1174,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.carekit.CareKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -1181,6 +1188,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "CareKitTests/CareKitTests-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -1193,6 +1201,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.carekit.CareKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "CareKitTests/CareKitTests-Bridging-Header.h";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

CareKit.xcodeproj/xcshareddata/xcschemes/CareKit.xcscheme

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

CareKit/CareCard/OCKCareCardTableViewCell.m

@@ -328,4 +328,4 @@ - (CGRect)accessibilityFrame {
     return [[self accessibilityContainer] accessibilityFrame];
 }
 
-@end
+@end

CareKit/CareCard/OCKCareCardViewController.m

@@ -430,6 +430,10 @@ - (void)carePlanStore:(OCKCarePlanStore *)store didReceiveUpdateOfEvent:(OCKCare
             break;
         }
     }
+
+    if ([event.date isInSameWeekAsDate: self.selectedDate]) {
+        [self updateWeekView];
+    }
 }
 
 - (void)carePlanStoreActivityListDidChange:(OCKCarePlanStore *)store {
@@ -509,7 +513,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     cell.interventionEvents = _events[indexPath.row];
     cell.delegate = self;
     cell.showEdgeIndicator = self.showEdgeIndicators;
-
     return cell;
 }
 

CareKit/CarePlan/OCKCarePlanStore.h

@@ -102,6 +102,11 @@ OCK_CLASS_AVAILABLE
  */
 @property (nonatomic, weak) id<OCKCarePlanStoreDelegate> delegate;
 
+/**
+You can use the watch delegate to subscribe a watch app to notifications of changes to the store.
+ */
+@property (nonatomic, weak) id<OCKCarePlanStoreDelegate> watchDelegate;
+
 /**
  Add an activity to this store.
  

CareKit/CarePlan/OCKCarePlanStore.m

@@ -424,6 +424,9 @@ - (void)handleActivityListChange:(BOOL)result type:(OCKCarePlanActivityType)type
             if (_delegate && [_delegate respondsToSelector:@selector(carePlanStoreActivityListDidChange:)]) {
                 [_delegate carePlanStoreActivityListDidChange:self];
             }
+            if (_watchDelegate && [_watchDelegate respondsToSelector:@selector(carePlanStoreActivityListDidChange:)]) {
+                [_watchDelegate carePlanStoreActivityListDidChange:self];
+            }
         });
     }
 }
@@ -757,6 +760,9 @@ - (void)updateEvent:(OCKCarePlanEvent *)event
                     if(_delegate && [_delegate respondsToSelector:@selector(carePlanStore:didReceiveUpdateOfEvent:)]) {
                         [_delegate carePlanStore:self didReceiveUpdateOfEvent:copiedEvent];
                     }
+                    if(_watchDelegate && [_watchDelegate respondsToSelector:@selector(carePlanStore:didReceiveUpdateOfEvent:)]) {
+                        [_watchDelegate carePlanStore:self didReceiveUpdateOfEvent:copiedEvent];
+                    }
                 });
             }
         });

CareKit/Connect/OCKConnectDetailViewController.m

@@ -297,6 +297,7 @@ - (void)messageComposeViewController:(MFMessageComposeViewController *)controlle
     }
 }
 
+
 #pragma mark - MFMailComposeViewControllerDelegate
 
 - (void)mailComposeController:(MFMailComposeViewController *)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error {
@@ -309,6 +310,7 @@ - (void)mailComposeController:(MFMailComposeViewController *)controller didFinis
     }
 }
 
+
 #pragma mark - Preview Action Items
 
 - (NSArray<id<UIPreviewActionItem>> *)previewActionItems {

CareKit/Insights/OCKGroupedBarChartView.m

@@ -157,6 +157,7 @@ - (void)layoutSubviews {
 }
 
 - (void)prepareView {
+
     self.backgroundColor = [UIColor whiteColor];
 
     _barView = [UIView new];
@@ -182,7 +183,7 @@ - (void)prepareView {
     NSMutableArray *constraints = [NSMutableArray new];
 
     NSString *visualFormat = [NSString stringWithFormat:@"H:|[barView]-%f-[valueLabel]", MarginBetweenBarAndLabel];
-    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:visualFormat   
+    [constraints addObjectsFromArray:[NSLayoutConstraint constraintsWithVisualFormat:visualFormat
                                                           options:NSLayoutFormatDirectionLeadingToTrailing
                                                           metrics:nil
                                                             views:views]];

RELEASE-NOTES.md

@@ -1,5 +1,39 @@
 # CareKit Release Notes
 
+## CareKit 1.1 Release Notes
+
+*CareKit 1.1* supports *iOS* and requires *Xcode 8.0* or later. The minimum supported *Base SDK* is *9.0*.
+
+*CareKit 1.1* includes the following new features and enhancements.
+
+- **Care Card on Apple Watch**
+
+ *Contributed by [Apple Inc.](https://github.com/carekit-apple).*
+
+ The *Sample App* (OCKSample project in CareKit's workspace) now includes a watch app. The app works out of the box. Included in the Watch group is the *Watch Connectivity Manager* which abstracts the logic of communicating the *Care Card* data between the phone and the watch. 
+
+ The *Care Plan Store* has also been updated to support Apple Watch.
+
+- **New Test App**
+
+ *Contributed by [Apple Inc.](https://github.com/carekit-apple).*
+
+ The *New Test App* is written entirely in Swift and provides extensive coverage for all CareKit Modules.
+
+- **Other Improvements**
+
+ - **3D Touch Support**
+
+  *Contributed by [Troy Tsubota](https://github.com/tktsubota).*
+
+  The *Care Card* and *Connect* view controllers have been updated to support 3D Touch. In the *Care Card* view controller, a user can 3D Touch on an activity to peek and pop. In the *Connect* view controller, a user can peek, pop, and use perform actions right from the master screen.
+
+  - **FaceTime in Connect**
+
+   *Contributed by [Micah Hainline](https://github.com/micahhainline).*
+
+   *FaceTime* calls can now be made from within the Connect module. Apart from *FaceTime* support, *Connect* now has the ability to create any custom method of communication (such as fax).
+
 
 ## CareKit 1.0 Release Notes