Commit the framework dependencies.

This will hopefully improve ease of building and common refrains like, "Did you remember to run `carthage bootstrap`?" The slow rebuild times weren't helping either.
Lisabetes · Jun 9, 2016 · 8839870 · 8839870
1 parent 6e88b55
commit 8839870
Show file tree

Hide file tree

Showing 196 changed files with 3,055 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
 ## Build generated
-build/
+# build/
 DerivedData
 
 ## Various settings
@@ -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
 #

diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ osx_image: xcode7.3
 xcode_sdk: iphonesimulator9.3
 xcode_project: Loop.xcodeproj
 xcode_scheme: Loop
-before_script:
-    - carthage bootstrap
+# before_script:
+#     - carthage bootstrap
 script:
     - xctool -project Loop.xcodeproj -scheme LoopTests -sdk iphonesimulator9.3 test
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -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" "c99c7e9dd473dc2e4accc770bf01cc60d27687a3"
+github "ps2/rileylink_ios" "ccf7feb6300a16672353ba03f57bc3c9688917c6"
 github "loudnate/xDripG5" "0.4.1"
diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/AmplitudeFramework b/Carthage/Build/iOS/AmplitudeFramework.framework/AmplitudeFramework
diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPARCMacros.h b/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPARCMacros.h
diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPConstants.h b/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPConstants.h
diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPDatabaseHelper.h b/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPDatabaseHelper.h
diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPDeviceInfo.h b/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPDeviceInfo.h
diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPIdentify.h b/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPIdentify.h
diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPLocationManagerDelegate.h b/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPLocationManagerDelegate.h
diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPRevenue.h b/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPRevenue.h
diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPURLConnection.h b/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPURLConnection.h
diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPUtils.h b/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/AMPUtils.h
diff --git a/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/Amplitude+SSLPinning.h b/Carthage/Build/iOS/AmplitudeFramework.framework/Headers/Amplitude+SSLPinning.h