Merge pull request #6 from recisio/hotfix/travis

Update travis
tbaranes · Aug 12, 2016 · 17ee2e1 · 17ee2e1
2 parents f099362 + d34c07e
commit 17ee2e1
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,28 +1,42 @@
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8
 notifications:
   email: false
+branches:
+  except:
+      - feature/swift3
 env:
   global:
-  - PROJECT=Demo/AdaptiveSpaceItemDemo.xcodeproj
-  - OSX_SCHEME="AdaptiveSpaceItem Demo"
-  - OSX_SDK=macosx10.11
-  matrix:    
-    - DESTINATION="arch=x86_64" SCHEME="$OSX_SCHEME"   SDK="$OSX_SDK"   RUN_TESTS="NO" BUILD_EXAMPLE="YES"  POD_LINT="NO"
-
+  - LC_CTYPE=en_US.UTF-8
+  - LANG=en_US.UTF-8
+  - WORKSPACE=AdaptiveSpaceItem.xcworkspace
+  - MACOS_FRAMEWORK_SCHEME="AdaptiveSpaceItem"
+  - MACOS_SDK=macosx10.12
+  - EXAMPLE_SCHEME="AdaptiveSpaceItem Demo"
+  matrix:
+    - DESTINATION="arch=x86_64"   SCHEME="$MACOS_FRAMEWORK_SCHEME"   SDK="$MACOS_SDK"   RUN_TESTS="NO" BUILD_EXAMPLE="YES"  POD_LINT="YES"
 script:
   - set -o pipefail
   - xcodebuild -version
   - xcodebuild -showsdks
 
   # 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 test | xcpretty -c;
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
+    else
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+    fi
+
+  # Build Framework in ReleaseTest and Run Tests if specified
+  - if [ $RUN_TESTS == "YES" ]; then
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration ReleaseTest ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
+    else
+      xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration ReleaseTest ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
     fi
 
   # Build Example in Debug if specified
   - if [ $BUILD_EXAMPLE == "YES" ]; then
-      xcodebuild -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
+      xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty -c;
     fi
 
   # Run `pod lib lint` if specified

diff --git a/AdaptiveSpaceItem Example/macOS Example.xcodeproj/project.pbxproj b/AdaptiveSpaceItem Example/macOS Example.xcodeproj/project.pbxproj
@@ -10,15 +10,32 @@
 		E24C8F851C761258000EEF6B /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E24C8F841C761258000EEF6B /* AppDelegate.swift */; };
 		E24C8F871C761258000EEF6B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E24C8F861C761258000EEF6B /* Assets.xcassets */; };
 		E24C8F8A1C761258000EEF6B /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E24C8F881C761258000EEF6B /* MainMenu.xib */; };
+		E280E8D01D5E57B400A9D893 /* AdaptiveSpaceItem.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E280E8CF1D5E57B400A9D893 /* AdaptiveSpaceItem.framework */; };
+		E280E8D11D5E57B400A9D893 /* AdaptiveSpaceItem.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E280E8CF1D5E57B400A9D893 /* AdaptiveSpaceItem.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		E2FE9B4B1D5C5B9E00E0820E /* AdaptiveSpaceItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2FE9B4A1D5C5B9E00E0820E /* AdaptiveSpaceItem.swift */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		E280E8D21D5E57B500A9D893 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				E280E8D11D5E57B400A9D893 /* AdaptiveSpaceItem.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		E24C8F811C761258000EEF6B /* AdaptiveSpaceItem Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "AdaptiveSpaceItem Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E24C8F841C761258000EEF6B /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		E24C8F861C761258000EEF6B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		E24C8F891C761258000EEF6B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		E24C8F8B1C761258000EEF6B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		E280E8CF1D5E57B400A9D893 /* AdaptiveSpaceItem.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = AdaptiveSpaceItem.framework; path = "/Users/Tom/Library/Developer/Xcode/DerivedData/AdaptiveSpaceItem-fmreryekgdukjedlmpfowkjxrcjd/Build/Products/Debug/AdaptiveSpaceItem.framework"; sourceTree = "<absolute>"; };
 		E2FE9B4A1D5C5B9E00E0820E /* AdaptiveSpaceItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AdaptiveSpaceItem.swift; path = /Users/Tom/Developer/AdaptiveSpaceItem/AdaptiveSpaceItem/AdaptiveSpaceItem/../../Sources/AdaptiveSpaceItem.swift; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */
 
@@ -27,6 +44,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E280E8D01D5E57B400A9D893 /* AdaptiveSpaceItem.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -36,6 +54,7 @@
 		E24C8F781C761258000EEF6B = {
 			isa = PBXGroup;
 			children = (
+				E280E8CF1D5E57B400A9D893 /* AdaptiveSpaceItem.framework */,
 				E24C8F831C761258000EEF6B /* AdaptiveSpaceItem */,
 				E24C8F821C761258000EEF6B /* Products */,
 			);
@@ -72,6 +91,7 @@
 				E24C8F7D1C761258000EEF6B /* Sources */,
 				E24C8F7E1C761258000EEF6B /* Frameworks */,
 				E24C8F7F1C761258000EEF6B /* Resources */,
+				E280E8D21D5E57B500A9D893 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);