Skip to content

Commit

Permalink
Merge pull request #26 from loudnate/dev
Browse files Browse the repository at this point in the history
0.3.0
  • Loading branch information
loudnate authored Jun 10, 2016
2 parents 73e3726 + 1caeacf commit f204199
Show file tree
Hide file tree
Showing 240 changed files with 4,064 additions and 606 deletions.
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
# build/
DerivedData

## Various settings
Expand Down Expand Up @@ -49,8 +49,10 @@ Pods/
# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
Carthage/Checkouts
Carthage/Build
Carthage/Checkouts/
Carthage/Build/tvOS/
Carthage/Build/iOS/*.bcsymbolmap
Carthage/Build/iOS/*.dSYM

# fastlane
#
Expand Down
12 changes: 8 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
language: objective-c
osx_image: xcode7.3
xcode_sdk: iphonesimulator9.3
xcode_project: Loop.xcodeproj
xcode_scheme: Loop
# xcode_sdk: iphonesimulator9.3
# xcode_project: Loop.xcodeproj
# xcode_scheme: Loop
before_script:
- carthage bootstrap
# - carthage bootstrap
- cp Loop/RemoteSettings-template.plist Loop/RemoteSettings.plist
script:
# Build the app target
- xctool -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
# Run the test target
- xctool -project Loop.xcodeproj -scheme LoopTests -sdk iphonesimulator9.3 test
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ github "loudnate/LoopKit" ~> 0.3
github "loudnate/xDripG5" ~> 0.4
github "loudnate/SwiftCharts" "loudnate/naterade"
github "mddub/dexcom-share-client-swift" ~> 0.1
github "ps2/rileylink_ios" ~> 0.3.2
github "ps2/rileylink_ios" ~> 0.3.3
github "mpurland/Amplitude-iOS" "framework"
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ github "loudnate/Crypto" "e0ef5b498f2c373d676135dabf5d1803b8558509"
github "loudnate/LoopKit" "v0.3.2"
github "loudnate/SwiftCharts" "dc8f5fbb29e391a65995d138158139559e365a1e"
github "mddub/dexcom-share-client-swift" "v0.1.2"
github "ps2/rileylink_ios" "v0.3.2"
github "ps2/rileylink_ios" "v0.3.3"
github "loudnate/xDripG5" "0.4.1"
Binary file not shown.

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

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

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

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

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

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

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

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

16 changes: 16 additions & 0 deletions Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPUtils.h

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

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

Loading

0 comments on commit f204199

Please sign in to comment.