Skip to content

Commit b8c5d1d

Browse files
Merge pull request #2 from LoopKit/master
updating
2 parents 3bc866b + 997f982 commit b8c5d1d

File tree

399 files changed

+6878
-3495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

399 files changed

+6878
-3495
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,8 @@ fastlane/report.xml
6565
fastlane/screenshots
6666

6767
# Sensitive details about remote backup
68-
RemoteSettings.plist
68+
RemoteSettings.plist
69+
70+
# OS
71+
.DS_Store
72+

.travis.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
language: objective-c
2-
osx_image: xcode7.3
3-
# xcode_sdk: iphonesimulator9.3
2+
osx_image: xcode8
3+
# xcode_sdk: iphonesimulator10.0
44
# xcode_project: Loop.xcodeproj
55
# xcode_scheme: Loop
66
before_script:
77
# - carthage bootstrap
8-
- cp Loop/RemoteSettings-template.plist Loop/RemoteSettings.plist
98
script:
109
# Build the app target
11-
- xctool -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
10+
- xcodebuild -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty
1211
# Run the test target
13-
- xcodebuild -project Loop.xcodeproj -scheme LoopTests -destination 'name=iPhone 6' test | xcpretty
14-
- xctool -project Loop.xcodeproj -scheme DoseMathTests -sdk iphonesimulator9.3 test
12+
- xcodebuild -project Loop.xcodeproj -scheme LoopTests -destination 'name=iPhone SE' test | xcpretty
13+
- xcodebuild -project Loop.xcodeproj -scheme DoseMathTests -destination 'name=iPhone SE' test | xcpretty

Cartfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
github "loudnate/LoopKit" ~> 0.3.4
2-
github "loudnate/xDripG5" ~> 0.5.0
3-
github "loudnate/SwiftCharts" "loudnate/naterade"
4-
github "mddub/dexcom-share-client-swift" ~> 0.1
5-
github "ps2/rileylink_ios" ~> 0.6.0
6-
github "amplitude/Amplitude-iOS" "mpurland-framework"
1+
github "LoopKit/LoopKit" ~> 1.1.0
2+
github "LoopKit/xDripG5" ~> 0.8.0
3+
github "i-schuetz/SwiftCharts" ~> 0.5.0
4+
github "mddub/dexcom-share-client-swift" ~> 0.2.0
5+
github "mddub/G4ShareSpy" ~> 0.3.0
6+
github "ps2/rileylink_ios" ~> 0.12.6
7+
github "amplitude/Amplitude-iOS" ~> 3.8.5

Cartfile.resolved

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
github "amplitude/Amplitude-iOS" "a3d6720626e72a678489bce83ed9dacadb505dd7"
2-
github "loudnate/Crypto" "13fee45175b88629aeabe60b4b4fc3daf86fa0a3"
3-
github "loudnate/LoopKit" "v0.3.4"
4-
github "loudnate/SwiftCharts" "8671287afb29640f9cffced6521b1098b7aac085"
5-
github "mddub/dexcom-share-client-swift" "v0.1.3"
6-
github "loudnate/xDripG5" "0.5.0"
7-
github "ps2/rileylink_ios" "v0.6.0"
1+
github "amplitude/Amplitude-iOS" "v3.8.5"
2+
github "mddub/G4ShareSpy" "v0.3.0"
3+
github "LoopKit/LoopKit" "v1.1.0"
4+
github "i-schuetz/SwiftCharts" "0.5"
5+
github "mddub/dexcom-share-client-swift" "v0.2.0"
6+
github "ps2/rileylink_ios" "v0.12.6"
7+
github "LoopKit/xDripG5" "v0.8.0"
1.55 MB
Binary file not shown.

Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPConstants.h renamed to Carthage/Build/iOS/Amplitude.framework/Headers/AMPConstants.h

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)