Merge pull request #1223 from LoopKit/dev

Release 2.0

Author: ps2

.gitignore

@@ -22,7 +22,6 @@ xcuserdata
 *.moved-aside
 *.xcuserstate
 *.xcscmblueprint
-project.xcworkspace
 
 ## Obj-C/Swift specific
 *.hmap
@@ -55,7 +54,7 @@ Carthage/
 
 # fastlane
 #
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
 # https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
@@ -71,3 +70,7 @@ RemoteSettings.plist
 
 # Framework development
 Loop.xcworkspace
+
+# Avoid checking in built assets
+Loop/DerivedAssets.xcassets/
+WatchApp/DerivedAssets.xcassets/

.travis.yml

@@ -1,13 +1,21 @@
 language: objective-c
-osx_image: xcode10
+osx_image: xcode11
 # xcode_sdk: iphonesimulator11
 # xcode_project: Loop.xcodeproj
 # xcode_scheme: Loop
+
+addons:
+  homebrew:
+    packages:
+    - carthage
+    update: true
 before_script:
+    - git config --global protocol.version 1
     - set -o pipefail && xcodebuild -project Loop.xcodeproj -target Cartfile
 script:
     # Build the app target
-    - set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty
+    - set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_ALLOWED=NO | xcpretty
+    - set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme Learn build CODE_SIGN_IDENTITY="" CODE_SIGNING_ALLOWED=NO | xcpretty
     # Run the test target
-    - set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme LoopTests -destination 'name=iPhone SE' test | xcpretty
-    - set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme DoseMathTests -destination 'name=iPhone SE' test | xcpretty
+    - set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme LoopTests -destination 'name=iPhone 8' test | xcpretty
+    - set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme DoseMathTests -destination 'name=iPhone 8' test | xcpretty

Cartfile

@@ -1,8 +1,7 @@
-
-github "LoopKit/LoopKit" ~> 2.2
-github "LoopKit/CGMBLEKit" ~> 3.1
-github "ps2/SwiftCharts" "hotfix-xcode10.2"
-github "LoopKit/dexcom-share-client-swift" == 1.0
-github "LoopKit/G4ShareSpy" == 1.0
-github "ps2/rileylink_ios" ~> 2.1
+github "LoopKit/LoopKit" ~> 3.0
+github "LoopKit/CGMBLEKit" ~> 3.2
+github "i-schuetz/SwiftCharts" == 0.6.5
+github "LoopKit/dexcom-share-client-swift" ~> 1.2
+github "LoopKit/G4ShareSpy" ~> 1.1
+github "ps2/rileylink_ios" ~> 3.0
 github "LoopKit/Amplitude-iOS" "decreepify"

Cartfile.resolved

@@ -1,7 +1,8 @@
 github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
-github "LoopKit/CGMBLEKit" "v3.1"
-github "LoopKit/G4ShareSpy" "v1.0"
-github "LoopKit/LoopKit" "v2.2.2"
-github "LoopKit/dexcom-share-client-swift" "v1.0"
-github "ps2/SwiftCharts" "cc8c401171d5ccb638ec6c87f6c410ee31fa774d"
-github "ps2/rileylink_ios" "v2.1.1"
+github "LoopKit/CGMBLEKit" "v3.2"
+github "LoopKit/G4ShareSpy" "v1.1"
+github "LoopKit/LoopKit" "v3.0"
+github "LoopKit/MKRingProgressView" "f548a5c64832be2d37d7c91b5800e284887a2a0a"
+github "LoopKit/dexcom-share-client-swift" "v1.2"
+github "i-schuetz/SwiftCharts" "0.6.5"
+github "ps2/rileylink_ios" "v3.0"

Common/Base.lproj/Intents.intentdefinition

@@ -7,16 +7,18 @@
 	<key>INIntentDefinitionModelVersion</key>
 	<string>1.0</string>
 	<key>INIntentDefinitionSystemVersion</key>
-	<string>17G65</string>
+	<string>18G87</string>
 	<key>INIntentDefinitionToolsBuildVersion</key>
-	<string>10L232m</string>
+	<string>10G8</string>
 	<key>INIntentDefinitionToolsVersion</key>
-	<string>10.0</string>
+	<string>10.3</string>
 	<key>INIntents</key>
 	<array>
 		<dict>
 			<key>INIntentCategory</key>
 			<string>create</string>
+			<key>INIntentDescription</key>
+			<string>Add a carb entry to Loop</string>
 			<key>INIntentDescriptionID</key>
 			<string>yc02Yq</string>
 			<key>INIntentLastParameterTag</key>

Common/Extensions/GlucoseRangeSchedule.swift

@@ -10,58 +10,16 @@ import HealthKit
 
 
 extension GlucoseRangeSchedule {
-    func overrideEnabledForContext(_ context: Override.Context) -> Bool? {
-        guard let override = override, override.context == context else {
-            guard let value = overrideRanges[context], !value.isZero else {
-                // Unavailable to set
-                return nil
-            }
-
-            return false
-        }
-
-        return override.isActive()
-    }
-
-    var activeOverride: GlucoseRangeSchedule.Override? {
-        guard let override = override, override.isActive() else {
-            return nil
-        }
-
-        return override
-    }
-
-    var activeOverrideContext: GlucoseRangeSchedule.Override.Context? {
-        return activeOverride?.context
-    }
-
-    var activeOverrideQuantityRange: Range<HKQuantity>? {
-        guard let activeOverride = activeOverride else {
-            return nil
-        }
-
-        let lowerBound = HKQuantity(unit: unit, doubleValue: activeOverride.value.minValue)
-        let upperBound = HKQuantity(unit: unit, doubleValue: activeOverride.value.maxValue)
-        return lowerBound..<upperBound
-    }
-
-    var configuredOverrideContexts: [GlucoseRangeSchedule.Override.Context] {
-        var contexts: [GlucoseRangeSchedule.Override.Context] = []
-        for (context, range) in overrideRanges where !range.isZero {
-            contexts.append(context)
-        }
-
-        return contexts
-    }
-
     func minQuantity(at date: Date) -> HKQuantity {
         return HKQuantity(unit: unit, doubleValue: value(at: date).minValue)
     }
 }
 
 
-extension DoubleRange {
-    var averageValue: Double {
+extension ClosedRange where Bound == HKQuantity {
+    func averageValue(for unit: HKUnit) -> Double {
+        let minValue = lowerBound.doubleValue(for: unit)
+        let maxValue = upperBound.doubleValue(for: unit)
         return (maxValue + minValue) / 2
     }
 }

Common/Extensions/HKUnit.swift

@@ -7,6 +7,7 @@
 //
 
 import HealthKit
+import LoopCore
 
 // Code in this extension is duplicated from:
 //   https://github.com/LoopKit/LoopKit/blob/master/LoopKit/HKUnit.swift
@@ -21,14 +22,6 @@ extension HKUnit {
         }
     }
 
-    static let milligramsPerDeciliter: HKUnit = {
-        return HKUnit.gramUnit(with: .milli).unitDivided(by: HKUnit.literUnit(with: .deci))
-    }()
-    
-    static let millimolesPerLiter: HKUnit = {
-        return HKUnit.moleUnit(with: .milli, molarMass: HKUnitMolarMassBloodGlucose).unitDivided(by: HKUnit.liter())
-    }()
-
     var localizedShortUnitString: String {
         if self == HKUnit.millimolesPerLiter {
             return NSLocalizedString("mmol/L", comment: "The short unit display string for millimoles of glucose per liter")
@@ -43,15 +36,6 @@ extension HKUnit {
         }
     }
 
-    /// An example value for the "ideal" target
-    var glucoseExampleTargetValue: Double {
-        if self == .milligramsPerDeciliter {
-            return 100
-        } else {
-            return 5.5
-        }
-    }
-
     /// The smallest value expected to be visible on a chart
     var chartableIncrement: Double {
         if self == .milligramsPerDeciliter {

Common/Extensions/NSBundle.swift

@@ -30,11 +30,35 @@ extension Bundle {
         return object(forInfoDictionaryKey: "AppGroupIdentifier") as! String
     }
 
+    var isAppExtension: Bool {
+        return bundleURL.pathExtension == "appex"
+    }
+
     var mainAppUrl: URL? {
         if let mainAppBundleIdentifier = mainAppBundleIdentifier {
             return URL(string: "\(mainAppBundleIdentifier)://")
         } else {
             return nil
         }
     }
+    
+    var gitRevision: String? {
+        return object(forInfoDictionaryKey: "com-loopkit-Loop-git-revision") as? String
+    }
+    
+    var gitBranch: String? {
+        return object(forInfoDictionaryKey: "com-loopkit-Loop-git-branch") as? String
+    }
+    
+    var sourceRoot: String? {
+        return object(forInfoDictionaryKey: "com-loopkit-Loop-srcroot") as? String
+    }
+    
+    var buildDateString: String? {
+        return object(forInfoDictionaryKey: "com-loopkit-Loop-build-date") as? String
+    }
+
+    var xcodeVersion: String? {
+        return object(forInfoDictionaryKey: "com-loopkit-Loop-xcode-version") as? String
+    }
 }

Common/Extensions/NSTimeInterval.swift

@@ -37,4 +37,5 @@ extension TimeInterval {
     var hours: Double {
         return minutes / 60.0
     }
+
 }

Common/Extensions/NewCarbEntryIntent+Loop.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import LoopCore
 
 @available(iOS 12.0, watchOSApplicationExtension 5.0, *)
 extension NewCarbEntryIntent: IdentifiableClass { }