update build script and travis settings

tanu11 · Feb 24, 2016 · bb856d8 · bb856d8
1 parent 1703bd7
commit bb856d8
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ osx_image: xcode7.2
 before_install:
   - brew update
   - brew reinstall xctool
+  - brew reinstall carthage
   - gem install cocoapods -v 0.38.2
   - gem install slather
   - xcrun simctl list

diff --git a/build.sh b/build.sh
@@ -35,13 +35,31 @@ if [ "$MODE" = "examples" ]; then
 
     for example in examples/*/; do
         echo "Building $example."
-        pod install --project-directory=$example
-        xctool \
-            -workspace "${example}Sample.xcworkspace" \
-            -scheme Sample \
-            -sdk "$SDK" \
-            -destination "$PLATFORM" \
-            build
+
+        if [ -f "${example}/Podfile" ]; then
+          echo "Using CocoaPods"
+          pod install --project-directory=$example
+
+          xctool \
+              -workspace "${example}Sample.xcworkspace" \
+              -scheme Sample \
+              -sdk "$SDK" \
+              -destination "$PLATFORM" \
+              build
+        elif [ -f "${example}/Cartfile" ]; then
+          echo "Using Carthage"
+          cd $example
+          carthage update --platform iOS
+
+          xctool \
+              -project "Sample.xcodeproj" \
+              -scheme Sample \
+              -sdk "$SDK" \
+              -destination "$PLATFORM" \
+              build
+
+          cd ../..
+        fi
     done
     trap - EXIT
     exit 0

diff --git a/examples/CarthageBuildTest/Cartfile.resolved b/examples/CarthageBuildTest/Cartfile.resolved
@@ -1 +1 @@
-github "facebook/AsyncDisplayKit" "92f87756b3635f59fdd6c9f6c497209e3059ac35"
+github "facebook/AsyncDisplayKit" "eb6aa28d42f3dd547f048d0a4d5cd4787f0647b0"
diff --git a/...CarthageExample.xcodeproj/project.pbxproj → ...uildTest/Sample.xcodeproj/project.pbxproj b/...CarthageExample.xcodeproj/project.pbxproj → ...uildTest/Sample.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "facebook/AsyncDisplayKit" "92f87756b3635f59fdd6c9f6c497209e3059ac35"
		github "facebook/AsyncDisplayKit" "eb6aa28d42f3dd547f048d0a4d5cd4787f0647b0"