Skip to content

Cleanups post widget merge (and on top of PR #419) #420

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

Closed
wants to merge 23 commits into from
Closed

Cleanups post widget merge (and on top of PR #419) #420

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
8b1b98f
Clean build on Swift 3.1
Mar 29, 2017
bef3866
update osx_image to xcode8.3
Mar 29, 2017
b2d78b5
Fix Swift 3.1 warnings from G4ShareSpy, ShareClient
mddub Mar 29, 2017
4231d18
Two cleanups
Mar 29, 2017
72a7cf7
Merge branch 'dev' into dev-frameworks-swift3.1
Mar 29, 2017
5ea5f83
Merge branch 'dev-frameworks-swift3.1' into g4-and-share-deps-to-swif…
Mar 29, 2017
03ff1a6
Merge pull request #2 from mddub/g4-and-share-deps-to-swift-3-1
Mar 29, 2017
a9de9b4
Move LoopKit framework back to LoopKit/LoopKit
Mar 29, 2017
c1881d1
Rebuild SwiftCharts with swift 3.1
Mar 29, 2017
241222d
Clean up some warnings, remove unnecessary parameters.
Mar 29, 2017
19efa1e
Cleanup: change internal back to private where possible
Mar 29, 2017
b43d157
move membership of Chart models into LoopUI (haven't done the file mo…
Mar 29, 2017
b707b3c
Move Chart models into LoopUI
Mar 29, 2017
1414acc
Change membership of StatusChartsManager and ChartPointsScatterDownTr…
Mar 29, 2017
20532d0
Move various files out of Common into LoopUI
Mar 29, 2017
0d486fd
Revert to using LoopKit 1.2.0
Mar 29, 2017
7b2fe9e
Merge branch 'dev-frameworks-swift3.1' into dev-3.1-cleanups
Mar 29, 2017
84da434
Revert "Revert to using LoopKit 1.2.0"
Mar 29, 2017
a2dc7c4
Merge branch 'dev-frameworks-swift3.1' into dev-3.1-cleanups
Mar 29, 2017
60ec49a
Don't create any ChartPointsTouchHighlightLayerViewCaches unless we have
Mar 29, 2017
d2e965e
Use LoopKit 1.2.1
Mar 29, 2017
49c7756
Merge branch 'dev-frameworks-swift3.1' into dev-3.1-cleanups
Mar 29, 2017
1fcc007
Create ChartColorPalette to contain StatusChartsManagers's color pale…
Mar 30, 2017
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: 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: xcode8.1
osx_image: xcode8.3
# xcode_sdk: iphonesimulator10.0
# 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.2.0
github "LoopKit/LoopKit" ~> 1.2.1
github "LoopKit/xDripG5" ~> 0.8.0
github "bharat/SwiftCharts" "0.5.1-extension-api-safe"
github "mddub/dexcom-share-client-swift" ~> 0.2.0
github "mddub/G4ShareSpy" ~> 0.3.1
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
10 changes: 5 additions & 5 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.2.1"
github "LoopKit/xDripG5" "v0.8.0"
github "amplitude/Amplitude-iOS" "v3.14.1"
github "mddub/G4ShareSpy" "v0.3.1"
github "LoopKit/LoopKit" "v1.2.0"
github "bharat/SwiftCharts" "0.5.1-extension-api-safe"
github "mddub/dexcom-share-client-swift" "v0.2.0"
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"
github "LoopKit/xDripG5" "v0.8.0"
13 changes: 13 additions & 0 deletions 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.

13 changes: 13 additions & 0 deletions 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.

25 changes: 25 additions & 0 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.

13 changes: 13 additions & 0 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.

13 changes: 13 additions & 0 deletions 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.

29 changes: 29 additions & 0 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.

13 changes: 13 additions & 0 deletions 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.
2 changes: 1 addition & 1 deletion Carthage/Build/iOS/Amplitude.framework/Headers/AMPURLConnection.h
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/iOS/Amplitude.framework/Headers/Amplitude+SSLPinning.h
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/iOS/Amplitude.framework/Headers/ISPCertificatePinning.h
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/iOS/Amplitude.framework/Headers/ISPPinnedNSURLConnectionDelegate.h
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/iOS/Amplitude.framework/Headers/ISPPinnedNSURLSessionDelegate.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/Amplitude.framework/Info.plist
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 Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryEditViewController.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/CarbEntryTableViewController.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/LyL-9U-twn-view-9Ci-XW-6nA.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...age/Build/iOS/CarbKit.framework/CarbKit.storyboardc/UINavigationController-wgu-gT-TgV.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/CarbKit.framework/CarbKit.storyboardc/rUL-yg-cFX-view-b1s-8o-0Wp.nib
View file
Open in desktop
Binary file not shown.
37 changes: 27 additions & 10 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 modified Carthage/Build/iOS/G4ShareSpy.framework/G4ShareSpy
View file
Open in desktop
Binary file not shown.
19 changes: 18 additions & 1 deletion Carthage/Build/iOS/G4ShareSpy.framework/Headers/G4ShareSpy-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/G4ShareSpy.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/i386.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/G4ShareSpy.framework/Modules/G4ShareSpy.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/GlucoseKit
View file
Open in desktop
Binary file not shown.
19 changes: 18 additions & 1 deletion Carthage/Build/iOS/GlucoseKit.framework/Headers/GlucoseKit-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/GlucoseKit.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/i386.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/GlucoseKit.framework/Modules/GlucoseKit.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified ...sulinKit.framework/Base.lproj/InsulinKit.storyboardc/UITableViewController-jGX-GA-nlH.nib
View file
Open in desktop
Binary file not shown.
Binary file modified ...iOS/InsulinKit.framework/Base.lproj/InsulinKit.storyboardc/jGX-GA-nlH-view-ccM-3y-LQM.nib
View file
Open in desktop
Binary file not shown.
27 changes: 22 additions & 5 deletions Carthage/Build/iOS/InsulinKit.framework/Headers/InsulinKit-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/InsulinKit.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/InsulinKit
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Model.momd/Model.mom
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Model.momd/VersionInfo.plist
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/arm64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/i386.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftdoc
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/InsulinKit.framework/Modules/InsulinKit.swiftmodule/x86_64.swiftmodule
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/Assets.car
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/GlucoseRangeOverrideTableViewCell.nib
View file
Open in desktop
Binary file not shown.
Binary file modified Carthage/Build/iOS/LoopKit.framework/GlucoseRangeTableViewCell.nib
View file
Open in desktop
Binary file not shown.
Loading