From 3455f6149697f52adabeec3567b76a95a2387f0d Mon Sep 17 00:00:00 2001
From: Akshay <akshay@Akshays-macBook-Pro-2.local>
Date: Thu, 13 Jul 2017 13:50:06 -0700
Subject: [PATCH] Dependency update

---
 CareKit.podspec                                              | 2 +-
 .../Assets.xcassets/AppIcon.appiconset/Contents.json         | 5 -----
 Sample/OCKSample/WatchConnectivityManager.swift              | 4 ++--
 Sample/OCKSampleWatch Extension/InterfaceController.swift    | 4 ++--
 dependency                                                   | 2 +-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/CareKit.podspec b/CareKit.podspec
index 81b67d0e9..a1f8d178b 100644
--- a/CareKit.podspec
+++ b/CareKit.podspec
@@ -34,7 +34,7 @@
 
 Pod::Spec.new do |s|
   s.name                  = 'CareKit'
-  s.version               = '1.2.0'
+  s.version               = '1.2.1'
   s.summary               = 'CareKit is an open source software framework for creating apps that help people better understand and manage their health.'
   s.homepage              = 'https://github.com/carekit-apple/CareKit/'
   s.documentation_url     = 'http://carekit.org/docs/'
diff --git a/Sample/OCKSample/Assets.xcassets/AppIcon.appiconset/Contents.json b/Sample/OCKSample/Assets.xcassets/AppIcon.appiconset/Contents.json
index b79d9e297..ce9cc0668 100644
--- a/Sample/OCKSample/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Sample/OCKSample/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -102,11 +102,6 @@
       "filename" : "Icon-App-83.5x83.5@2x.png",
       "scale" : "2x"
     },
-    {
-      "idiom" : "ios-marketing",
-      "size" : "1024x1024",
-      "scale" : "1x"
-    },
     {
       "size" : "24x24",
       "idiom" : "watch",
diff --git a/Sample/OCKSample/WatchConnectivityManager.swift b/Sample/OCKSample/WatchConnectivityManager.swift
index ee515f8f4..e43269fee 100644
--- a/Sample/OCKSample/WatchConnectivityManager.swift
+++ b/Sample/OCKSample/WatchConnectivityManager.swift
@@ -47,7 +47,7 @@ class WatchConnectivityManager : NSObject {
     
     init(withStore store : OCKCarePlanStore) {
         self.store = store
-        self.session = WCSession.default
+        self.session = WCSession.default()
 
         super.init()
         
@@ -204,7 +204,7 @@ extension WatchConnectivityManager : WCSessionDelegate {
     }
 
     func sessionDidDeactivate(_ session: WCSession) {
-        WCSession.default.activate()
+        WCSession.default().activate()
     }
    
     func session(_ session: WCSession, didReceiveMessageData messageData: Data, replyHandler: @escaping (Data) -> Void) {
diff --git a/Sample/OCKSampleWatch Extension/InterfaceController.swift b/Sample/OCKSampleWatch Extension/InterfaceController.swift
index fc5f0c118..665542019 100644
--- a/Sample/OCKSampleWatch Extension/InterfaceController.swift	
+++ b/Sample/OCKSampleWatch Extension/InterfaceController.swift	
@@ -73,7 +73,7 @@ class InterfaceController: WKInterfaceController {
         self.setTitle("")
         loaderGroup.setHidden(false)
         loaderImage.startAnimating()
-        loaderLabel.setText("Loading\nCare Card")
+        loaderLabel.setText("Loading\nCare Contents")
         activities.removeAll()
         activityOrder.removeAll()
         activityRowIndices.removeAll()
@@ -133,7 +133,7 @@ class InterfaceController: WKInterfaceController {
         let activityChildEvents = activity.eventsForToday
         let activityEventRows = getRowIndex(ofEventIndex: activityChildEvents.count - 1) + 1
         
-        tableView.insertRows(at: IndexSet.init(integersIn: Range(NSMakeRange(rowIndex, activityEventRows)) ?? 0..<0) , withRowType: "EventRow")
+        tableView.insertRows(at: IndexSet.init(integersIn: NSMakeRange(rowIndex, activityEventRows).toRange() ?? 0..<0) , withRowType: "EventRow")
         
         for childRowIndex in 0..<activityEventRows {
             if let row = tableView.rowController(at: rowIndex + childRowIndex) as? EventRow {
diff --git a/dependency b/dependency
index 007583929..44c88877c 160000
--- a/dependency
+++ b/dependency
@@ -1 +1 @@
-Subproject commit 007583929c81a84dfa797a41d73e454ae0e18e53
+Subproject commit 44c88877c537997f1e191b94a3a21d137f917390