Skip to content

Update my master branch #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elnjensen merged 23 commits into from
Jun 4, 2018
Merged

Update my master branch #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
167ea21
Bump version for next dev
ps2 Dec 21, 2017
4b746ad
Merge pull request #651 from LoopKit/bump-version
ps2 Jan 4, 2018
01fb59b
Hotfix: Update to LoopKit 1.5.4 (#664)
ps2 Jan 12, 2018
b34539f
Merge branch 'dev' into master
ps2 Jan 13, 2018
96eb8b2
Hotfix: Update to LoopKit 1.5.4 (#664) (#665)
ps2 Jan 13, 2018
03afe51
Revert changes made for merging to dev
ps2 Jan 14, 2018
48e1d2d
Implement glucose schedule override (pre-meal/workout) in Watch App (…
mpangburn Feb 6, 2018
51f28ce
Make sure watch extension code runs on main queue. (#675)
ps2 Feb 15, 2018
a6b3549
Update the Carthage script to specify output files per latest documen…
ps2 Feb 23, 2018
a1fee4e
Watch entitlements and framework reference updates (#685)
ps2 Mar 3, 2018
13beff4
Hotfix: Update for Xcode 9.3, Swift 4.1 (#694)
ps2 Mar 30, 2018
4b36a53
Merge master into dev
ps2 Mar 30, 2018
45613bf
Bump version for dev
ps2 Mar 30, 2018
20d51cb
Fix all Xcode 9.3 warnings (#697)
Apr 5, 2018
8b53a2e
Update to rileylink_ios frameworks version 2.0.0
ps2 Apr 14, 2018
61b957b
Merge pull request #699 from LoopKit/rlkit2
ps2 Apr 14, 2018
84ffd0f
CGMBLEKit version 2.0 (#700)
ps2 Apr 14, 2018
a90e4ef
Fix sensor state display (#701)
ps2 Apr 16, 2018
107082b
Add prompt on Max Basal Rate (#690)
Kdisimone May 4, 2018
2e945d3
fix for face-id authentication on bolusing (#710)
Kdisimone May 5, 2018
a86743b
Update LoopKit 1.5.5 (#717)
ps2 May 5, 2018
64eed58
Bump version for release (#718)
ps2 May 5, 2018
49dbf95
Merge pull request #719 from LoopKit/dev
ps2 May 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ xcuserdata
*.moved-aside
*.xcuserstate
*.xcscmblueprint
project.xcworkspace

## Obj-C/Swift specific
*.hmap
Expand Down Expand Up @@ -53,6 +54,7 @@ Carthage/Checkouts/
Carthage/Build/tvOS/
Carthage/Build/iOS/*.bcsymbolmap
Carthage/Build/iOS/*.dSYM
Carthage/Build/watchOS/

# fastlane
#
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "LoopKit/LoopKit" == 1.5.3
github "LoopKit/xDripG5" ~> 0.8.1
github "LoopKit/LoopKit" == 1.5.5
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 "ps2/rileylink_ios" == 2.0.0
github "amplitude/Amplitude-iOS" ~> 3.8.5
6 changes: 3 additions & 3 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github "LoopKit/LoopKit" "v1.5.3"
github "LoopKit/xDripG5" "v0.8.1"
github "LoopKit/CGMBLEKit" "v2.0"
github "LoopKit/LoopKit" "v1.5.5"
github "amplitude/Amplitude-iOS" "v3.14.1"
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"
2 changes: 1 addition & 1 deletion Carthage/Build/.Amplitude-iOS.version
View file
Open in desktop

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

21 changes: 21 additions & 0 deletions Carthage/Build/.CGMBLEKit.version
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Carthage/Build/.G4ShareSpy.version
View file
Open in desktop

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

16 changes: 8 additions & 8 deletions Carthage/Build/.LoopKit.version
View file
Open in desktop

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/.SwiftCharts.version
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Carthage/Build/.dexcom-share-client-swift.version
View file
Open in desktop

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

25 changes: 16 additions & 9 deletions Carthage/Build/.rileylink_ios.version
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Carthage/Build/.xDripG5.version
View file
Open in desktop

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
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/Amplitude.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file added Carthage/Build/iOS/CGMBLEKit.framework/CGMBLEKit
View file
Open in desktop
Binary file not shown.
0 .../iOS/xDripG5.framework/Headers/AESCrypt.h → ...OS/CGMBLEKit.framework/Headers/AESCrypt.h
View file
Open in desktop
File renamed without changes.
30 changes: 17 additions & 13 deletions ...xDripG5.framework/Headers/xDripG5-Swift.h → ...LEKit.framework/Headers/CGMBLEKit-Swift.h
View file
Open in desktop

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

17 changes: 17 additions & 0 deletions Carthage/Build/iOS/CGMBLEKit.framework/Headers/CGMBLEKit.h
View file
Open in desktop

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

Binary file renamed ...ge/Build/iOS/xDripG5.framework/Info.plist → .../Build/iOS/CGMBLEKit.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file added Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file added Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file added Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file added Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file added Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/i386.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file added Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/i386.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file added Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/x86_64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file added Carthage/Build/iOS/CGMBLEKit.framework/Modules/CGMBLEKit.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
11 changes: 11 additions & 0 deletions Carthage/Build/iOS/CGMBLEKit.framework/Modules/module.modulemap
View file
Open in desktop

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/Assets.car
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/CarbKit
View file
Open in desktop
Binary file not shown.
Binary file modified ...CarbKit.framework/CarbKit.storyboardc/CarbAbsorptionInputController.nib/objects-11.0+.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...d/iOS/CarbKit.framework/CarbKit.storyboardc/CarbAbsorptionInputController.nib/runtime.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...S/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib/objects-11.0+.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...ild/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib/runtime.nib
View file
Open in desktop
Binary file not shown.
Binary file modified .../CarbKit.framework/CarbKit.storyboardc/CarbEntryTableViewController.nib/objects-11.0+.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...ld/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryTableViewController.nib/runtime.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...OS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib/objects-11.0+.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...uild/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib/runtime.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...OS/CarbKit.framework/CarbKit.storyboardc/QAc-uE-L5K-view-ZAF-8o-e2g.nib/objects-11.0+.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...uild/iOS/CarbKit.framework/CarbKit.storyboardc/QAc-uE-L5K-view-ZAF-8o-e2g.nib/runtime.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...Kit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib/objects-11.0+.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...S/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib/runtime.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...OS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib/objects-11.0+.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...uild/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib/runtime.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/DatePickerTableViewCell.nib
View file
Open in desktop
Binary file not shown.
25 changes: 12 additions & 13 deletions Carthage/Build/iOS/CarbKit.framework/Headers/CarbKit-Swift.h
View file
Open in desktop

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
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/i386.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/Modules/CarbKit.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/Crypto.framework/Crypto
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/Crypto.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file added Carthage/Build/iOS/Crypto.framework/es.lproj/InfoPlist.strings
View file
Open in desktop
Binary file not shown.
Binary file added Carthage/Build/iOS/Crypto.framework/ru.lproj/InfoPlist.strings
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy
View file
Open in desktop
Binary file not shown.
Loading