Ver código fonte

Update Travis-CI, project for Xcode 7.3.

Nikita Lutsenko 9 anos atrás
pai
commit
58012cfeb7
2 arquivos alterados com 13 adições e 16 exclusões
  1. 11 8
      .travis.yml
  2. 2 8
      SocketRocket.xcodeproj/project.pbxproj

+ 11 - 8
.travis.yml

@@ -1,23 +1,26 @@
+branches:
+  only:
+    - master
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode7.3
 sudo: false
 xcode_project: SocketRocket.xcodeproj
 env:
   global:
-    - IOS_SDK=iphonesimulator9.2
+    - IOS_SDK=iphonesimulator9.3
     - IOS_SCHEME="SocketRocket-iOS"
     - MACOS_SDK=macosx10.11
     - MACOS_SCHEME="SocketRocketOSX"
-    - TVOS_SDK=appletvsimulator9.1
+    - TVOS_SDK=appletvsimulator9.2
     - TVOS_SCHEME="SocketRocket-tvOS"
   matrix:
-    - DESTINATION="OS=9.2,name=iPad 2"         SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
-    - DESTINATION="OS=9.2,name=iPad Air"       SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
-    - DESTINATION="OS=9.2,name=iPhone 5"       SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
-    - DESTINATION="OS=9.2,name=iPhone 6s"      SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
+    - DESTINATION="OS=9.3,name=iPad 2"         SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
+    - DESTINATION="OS=9.3,name=iPad Air"       SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
+    - DESTINATION="OS=9.3,name=iPhone 5"       SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
+    - DESTINATION="OS=9.3,name=iPhone 6s"      SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
     - DESTINATION="OS=8.4,name=iPhone 6"       SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
     - DESTINATION="OS=8.4,name=iPad Air"       SDK="$IOS_SDK"   SCHEME="$IOS_SCHEME"
-    - DESTINATION="OS=9.1,name=Apple TV 1080p" SDK="$TVOS_SDK"  SCHEME="$TVOS_SCHEME"
+    - DESTINATION="OS=9.2,name=Apple TV 1080p" SDK="$TVOS_SDK"  SCHEME="$TVOS_SCHEME"
     - DESTINATION="platform=OS X"              SDK="$MACOS_SDK" SCHEME="$MACOS_SCHEME"
 before_script:
     - bundle install

+ 2 - 8
SocketRocket.xcodeproj/project.pbxproj

@@ -623,8 +623,6 @@
 		2D4227681BB4358C000C1A6C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -635,7 +633,6 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
@@ -657,8 +654,6 @@
 		2D4227691BB4358C000C1A6C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -670,7 +665,6 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_NS_ASSERTIONS = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
@@ -716,7 +710,7 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.squareup.SocketRocket;
 				PRODUCT_NAME = SocketRocket;
-				SDKROOT = appletvos9.1;
+				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -752,7 +746,7 @@
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.squareup.SocketRocket;
 				PRODUCT_NAME = SocketRocket;
-				SDKROOT = appletvos9.1;
+				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";