Merge dev into master

.travis.yml

@@ -1,13 +1,13 @@
 language: objective-c
-osx_image: xcode8.1
+osx_image: xcode8.3
 # xcode_sdk: iphonesimulator10.0
 # xcode_project: Loop.xcodeproj
 # xcode_scheme: Loop
 before_script:
 #     - carthage bootstrap
 script:
     # Build the app target
-    - 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_REQUIRED=NO | xcpretty
     # Run the test target
-    - xcodebuild -project Loop.xcodeproj -scheme LoopTests -destination 'name=iPhone SE' test | xcpretty
-    - xcodebuild -project Loop.xcodeproj -scheme DoseMathTests -destination 'name=iPhone SE' test | xcpretty
+    - 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

Cartfile

@@ -1,7 +1,7 @@
-github "LoopKit/LoopKit" ~> 1.2.0
+github "LoopKit/LoopKit" == 1.2.1
 github "LoopKit/xDripG5" ~> 0.8.0
-github "i-schuetz/SwiftCharts" ~> 0.5.0
-github "mddub/dexcom-share-client-swift" ~> 0.2.0
-github "mddub/G4ShareSpy" ~> 0.3.1
+github "bharat/SwiftCharts" "0.5.1-extension-api-safe"
+github "mddub/dexcom-share-client-swift" == 0.2.1
+github "mddub/G4ShareSpy" == 0.3.2
 github "ps2/rileylink_ios" ~> 1.0
 github "amplitude/Amplitude-iOS" ~> 3.8.5

Cartfile.resolved

@@ -1,7 +1,7 @@
-github "amplitude/Amplitude-iOS" "v3.14.0"
-github "mddub/G4ShareSpy" "v0.3.1"
-github "LoopKit/LoopKit" "v1.2.0"
-github "i-schuetz/SwiftCharts" "0.5.1"
-github "mddub/dexcom-share-client-swift" "v0.2.0"
-github "ps2/rileylink_ios" "v1.0"
+github "LoopKit/LoopKit" "v1.2.1"
 github "LoopKit/xDripG5" "v0.8.0"
+github "amplitude/Amplitude-iOS" "v3.14.1"
+github "bharat/SwiftCharts" "9faad7c38762a177ae01382def605a77c0e61aba"
+github "mddub/G4ShareSpy" "v0.3.2"
+github "mddub/dexcom-share-client-swift" "v0.2.1"
+github "ps2/rileylink_ios" "v1.0"