Skip to content

Commit

Permalink
Merge pull request #584 from LoopKit/dev
Browse files Browse the repository at this point in the history
v1.5.0
  • Loading branch information
ps2 authored Sep 20, 2017
2 parents 4002948 + 7c76112 commit 1bebf6a
Show file tree
Hide file tree
Showing 258 changed files with 3,964 additions and 1,717 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: objective-c
osx_image: xcode8.3
# xcode_sdk: iphonesimulator10.0
osx_image: xcode9
# xcode_sdk: iphonesimulator11
# xcode_project: Loop.xcodeproj
# xcode_scheme: Loop
before_script:
Expand Down
12 changes: 6 additions & 6 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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.4.0
github "mddub/G4ShareSpy" == 0.3.2
github "ps2/rileylink_ios" == 1.2.0
github "LoopKit/LoopKit" == 1.5.0
github "LoopKit/xDripG5" ~> 0.8.1
github "i-schuetz/SwiftCharts" "master"
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
12 changes: 6 additions & 6 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "LoopKit/LoopKit" "v1.4.2"
github "LoopKit/xDripG5" "v0.8.0"
github "LoopKit/LoopKit" "v1.5.0"
github "LoopKit/xDripG5" "v0.8.1"
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.4.0"
github "ps2/rileylink_ios" "v1.2.0"
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"
2 changes: 1 addition & 1 deletion Carthage/Build/.Amplitude-iOS.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Carthage/Build/.G4ShareSpy.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Carthage/Build/.LoopKit.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Carthage/Build/.SwiftCharts.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Carthage/Build/.dexcom-share-client-swift.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 9 additions & 5 deletions Carthage/Build/.rileylink_ios.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Carthage/Build/.xDripG5.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/Amplitude.framework/Amplitude
Binary file not shown.
Binary file modified Carthage/Build/iOS/Amplitude.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Assets.car
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/CarbKit
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/DatePickerTableViewCell.nib
Binary file not shown.
103 changes: 62 additions & 41 deletions Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/CarbKit.framework/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Carthage/Build/iOS/Crypto.framework/Crypto
Binary file not shown.
Binary file modified Carthage/Build/iOS/Crypto.framework/Info.plist
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy
Binary file not shown.
Loading

0 comments on commit 1bebf6a

Please sign in to comment.