You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/09/15 19:02:29 UTC

[07/10] usergrid-swift git commit: Adding xcode workspace and updating travis.yml

Adding xcode workspace and updating travis.yml


Project: http://git-wip-us.apache.org/repos/asf/usergrid-swift/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid-swift/commit/43ad9ccb
Tree: http://git-wip-us.apache.org/repos/asf/usergrid-swift/tree/43ad9ccb
Diff: http://git-wip-us.apache.org/repos/asf/usergrid-swift/diff/43ad9ccb

Branch: refs/heads/master
Commit: 43ad9ccb31b84eaacecfc4dd9ab5a0aaad425f0b
Parents: 44a7ae0
Author: Robert Walsh <rj...@gmail.com>
Authored: Wed Sep 14 11:32:00 2016 -0500
Committer: Robert Walsh <rj...@gmail.com>
Committed: Wed Sep 14 11:32:00 2016 -0500

----------------------------------------------------------------------
 .travis.yml                                      | 10 +++++-----
 UsergridSDK.xcworkspace/contents.xcworkspacedata |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/43ad9ccb/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 5c8e5cf..2eb2c06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ env:
   global:
   - LC_CTYPE=en_US.UTF-8
   - LANG=en_US.UTF-8
-  - PROJECT=UsergridSDK.xcodeproj
+  - WORKSPACE=UsergridSDK.xcworkspace
   - IOS_FRAMEWORK_SCHEME="UsergridSDK iOS"
   - OSX_FRAMEWORK_SCHEME="UsergridSDK OSX"
   - TVOS_FRAMEWORK_SCHEME="UsergridSDK tvOS"
@@ -25,14 +25,14 @@ script:
 
   # Build Framework in Debug and Run Tests if specified
   - if [ $RUN_TESTS == "YES" ]; then
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
     else
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
     fi
 
   # Build Framework in Release and Run Tests if specified
   - if [ $RUN_TESTS == "YES" ]; then
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty -c;
     else
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
     fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid-swift/blob/43ad9ccb/UsergridSDK.xcworkspace/contents.xcworkspacedata
----------------------------------------------------------------------
diff --git a/UsergridSDK.xcworkspace/contents.xcworkspacedata b/UsergridSDK.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..c4efa30
--- /dev/null
+++ b/UsergridSDK.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:UsergridSDK.xcodeproj">
+   </FileRef>
+</Workspace>