Convergence

Bilue · Jul 7, 2017 · a80985c · a80985c
1 parent 25e766e
commit a80985c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/Sample/OCKSample.xcodeproj/project.pbxproj b/Sample/OCKSample.xcodeproj/project.pbxproj
@@ -777,7 +777,7 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -799,7 +799,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -821,7 +821,7 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -843,7 +843,7 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 3.0;
 			};
@@ -900,6 +900,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -947,6 +948,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -963,7 +965,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.example.apple-samplecode.CareKit";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -981,7 +983,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

diff --git a/Sample/OCKSampleWatch Extension/InterfaceController.swift b/Sample/OCKSampleWatch Extension/InterfaceController.swift
@@ -55,15 +55,15 @@ class InterfaceController: WKInterfaceController {
 
     override func awake(withContext context: Any?) {
         super.awake(withContext: context)
-        session.delegate = self
-        session.activate()
+        session().delegate = self
+        session().activate()
     }
 
     override func willActivate() {
         self.setTitle("")
 
-        if session.activationState != .activated {
-            session.activate()
+        if session().activationState != .activated {
+            session().activate()
         } else {
             loadData()
         }
@@ -84,7 +84,7 @@ class InterfaceController: WKInterfaceController {
     }
 
     func didLosePhoneConnection() {
-        guard session.activationState != .activated else {
+        guard session().activationState != .activated else {
             return
         }
 
@@ -229,7 +229,7 @@ class InterfaceController: WKInterfaceController {
 
     func updateDataStoreEvent(withActivityIdentifier activityIdentifier : String, atIndex eventIndex : Int, toCompletedState completedState : Bool) {
 
-        if !session.isReachable {
+        if !session().isReachable {
             didLosePhoneConnection()
             return
         }
@@ -246,7 +246,7 @@ class InterfaceController: WKInterfaceController {
         updateComplications(withCompletionPercentage: nil)
 
         encoder.finishEncoding()
-        session.sendMessageData(data as Data, replyHandler: {data in
+        session().sendMessageData(data as Data, replyHandler: {data in
             let decoder = NSKeyedUnarchiver(forReadingWith: data)
             if decoder.decodeBool(forKey: "success") {
             } else {
@@ -262,8 +262,8 @@ class InterfaceController: WKInterfaceController {
     }
 
     func messagingErrorHandler(_ error : Error) {
-        NSLog("error: \(error)\nsession reachable = \(session.isReachable)")
-        if session.activationState != .activated {
+        NSLog("error: \(error)\nsession reachable = \(session().isReachable)")
+        if session().activationState != .activated {
             didLosePhoneConnection()
         } else {
             loadData()
@@ -278,12 +278,12 @@ class InterfaceController: WKInterfaceController {
     // MARK: Fetching Data
 
     func getAllData() {
-        if session.activationState == .activated {
+        if session().activationState == .activated {
             let data = NSMutableData()
             let encoder = NSKeyedArchiver(forWritingWith: data)
             encoder.encode("getAllData", forKey: "type")
             encoder.finishEncoding()
-            session.sendMessageData(data as Data, replyHandler: {(data) in
+            session().sendMessageData(data as Data, replyHandler: {(data) in
                 let decoder = NSKeyedUnarchiver(forReadingWith: data)
                 defer {
                     decoder.finishDecoding()

diff --git a/dependency b/dependency
diff --git a/testing/OCKTest/OCKTest.xcodeproj/project.pbxproj b/testing/OCKTest/OCKTest.xcodeproj/project.pbxproj
@@ -477,6 +477,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -524,6 +525,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -540,7 +542,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.carekit.OCKTest;
 				PRODUCT_NAME = OCKTest;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -556,7 +558,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = org.carekit.OCKTest;
 				PRODUCT_NAME = OCKTest;
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;