Merge pull request #535 from LoopKit/dev

v1.4.0

.gitignore

@@ -70,3 +70,5 @@ RemoteSettings.plist
 # OS
 .DS_Store
 
+# Framework development
+Loop.xcworkspace

Cartfile

@@ -1,7 +1,7 @@
-github "LoopKit/LoopKit" == 1.3.0
+github "LoopKit/LoopKit" == 1.4.2
 github "LoopKit/xDripG5" ~> 0.8.0
 github "i-schuetz/SwiftCharts" ~> 0.6.0
-github "mddub/dexcom-share-client-swift" == 0.2.1
+github "mddub/dexcom-share-client-swift" == 0.4.0
 github "mddub/G4ShareSpy" == 0.3.2
-github "ps2/rileylink_ios" == 1.1.0
+github "ps2/rileylink_ios" == 1.2.0
 github "amplitude/Amplitude-iOS" ~> 3.8.5

Cartfile.resolved

@@ -1,7 +1,7 @@
-github "LoopKit/LoopKit" "v1.3.0"
+github "LoopKit/LoopKit" "v1.4.2"
 github "LoopKit/xDripG5" "v0.8.0"
 github "amplitude/Amplitude-iOS" "v3.14.1"
 github "i-schuetz/SwiftCharts" "0.6"
 github "mddub/G4ShareSpy" "v0.3.2"
-github "mddub/dexcom-share-client-swift" "v0.2.1"
-github "ps2/rileylink_ios" "v1.1.0"
+github "mddub/dexcom-share-client-swift" "v0.4.0"
+github "ps2/rileylink_ios" "v1.2.0"

Common/Extensions/WCSession+Swift4.swift

@@ -0,0 +1,17 @@
+//
+//  WCSession.swift
+//  Loop
+//
+//  Copyright © 2017 LoopKit Authors. All rights reserved.
+//
+
+import WatchConnectivity
+
+
+extension WCSession {
+    #if swift(>=4)
+    static func `default`() -> WCSession {
+        return self.default
+    }
+    #endif
+}

Common/Models/StatusExtensionContext.swift

@@ -25,7 +25,8 @@ struct LoopContext {
 struct NetBasalContext {
     let rate: Double
     let percentage: Double
-    let startDate: Date
+    let start: Date
+    let end: Date
 }
 
 struct SensorDisplayableContext: SensorDisplayable {
@@ -122,22 +123,25 @@ extension NetBasalContext: RawRepresentable {
         return [
             "rate": rate,
             "percentage": percentage,
-            "startDate": startDate
+            "start": start,
+            "end": end
         ]
     }
 
     init?(rawValue: RawValue) {
         guard
             let rate       = rawValue["rate"] as? Double,
             let percentage = rawValue["percentage"] as? Double,
-            let startDate  = rawValue["startDate"] as? Date
+            let start      = rawValue["start"] as? Date,
+            let end        = rawValue["end"] as? Date
         else {
             return nil
         }
 
         self.rate = rate
         self.percentage = percentage
-        self.startDate = startDate
+        self.start = start
+        self.end = end
     }
 }