Merge pull request #6 from LoopKit/dev

Update my dev branch

Author: elnjensen

.gitignore

@@ -22,6 +22,7 @@ xcuserdata
 *.moved-aside
 *.xcuserstate
 *.xcscmblueprint
+project.xcworkspace
 
 ## Obj-C/Swift specific
 *.hmap
@@ -53,6 +54,7 @@ Carthage/Checkouts/
 Carthage/Build/tvOS/
 Carthage/Build/iOS/*.bcsymbolmap
 Carthage/Build/iOS/*.dSYM
+Carthage/Build/watchOS/
 
 # fastlane
 #

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.2
+osx_image: xcode9.3
 # xcode_sdk: iphonesimulator11
 # xcode_project: Loop.xcodeproj
 # xcode_scheme: Loop

Cartfile

@@ -1,7 +1,7 @@
-github "LoopKit/LoopKit" == 1.5.3
-github "LoopKit/xDripG5" ~> 0.8.1
+github "LoopKit/LoopKit" == 1.5.6
+github "LoopKit/CGMBLEKit" ~> 2.0
 github "i-schuetz/SwiftCharts" == 0.6.1
 github "mddub/dexcom-share-client-swift" == 0.4.1
 github "mddub/G4ShareSpy" == 0.3.3
-github "ps2/rileylink_ios" == 1.2.2
-github "amplitude/Amplitude-iOS" ~> 3.8.5
+github "ps2/rileylink_ios" == 2.0.0
+github "LoopKit/Amplitude-iOS" "decreepify"

Cartfile.resolved

@@ -1,7 +1,7 @@
-github "LoopKit/LoopKit" "v1.5.3"
-github "LoopKit/xDripG5" "v0.8.1"
-github "amplitude/Amplitude-iOS" "v3.14.1"
+github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
+github "LoopKit/CGMBLEKit" "v2.0"
+github "LoopKit/LoopKit" "v1.5.6"
 github "i-schuetz/SwiftCharts" "6b55a26a7b0b95e49202ddc1db5404702fce114f"
 github "mddub/G4ShareSpy" "v0.3.3"
 github "mddub/dexcom-share-client-swift" "v0.4.1"
-github "ps2/rileylink_ios" "v1.2.2"
+github "ps2/rileylink_ios" "v2.0.0"