Преглед на файлове

Added Swift 2.3 support (#335)

* Added Swift 2.3 support

* Added Xcode 8 to test environment

* Fixed travis settings

* Rewritten travis config based on Alamofire config

* Fixed travis config

* Removed duplicated compilation step in tests

* Removed xcpretty

* Reverted xcpretty removal
Lluís Ulzurrun de Asanza Sàez преди 9 години
родител
ревизия
03a745bb65
променени са 2 файла, в които са добавени 38 реда и са изтрити 10 реда
  1. 30 10
      .travis.yml
  2. 8 0
      CryptoSwift.xcodeproj/project.pbxproj

+ 30 - 10
.travis.yml

@@ -1,11 +1,31 @@
-os:
-    - linux
-    - osx
-language: generic
-sudo: required
-dist: trusty
-osx_image: xcode7.3
-install:
-    - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/02090c7ede5a637b76e6df1710e83cd0bbe7dcdf/swiftenv-install.sh)"
+language: objective-c
+env:
+  global:
+  - LC_CTYPE=en_US.UTF-8
+  - LANG=en_US.UTF-8
+  - WORKSPACE=CryptoSwift.xcworkspace
+  - IOS_SCHEME="CryptoSwift iOS"
+  - OSX_SCHEME="CryptoSwift OSX"
+  - TVOS_SCHEME="CryptoSwift tvOS"
+  - WATCHOS_SCHEME="CryptoSwift watchOS"
+  - IOS_SIM="iphonesimulator"
+  - OSX_SIM="macosx"
+  - TVOS_SIM="appletvsimulator"
+  - WATCHOS_SIM="watchsimulator"
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode7.3
+      env: DESTINATION="OS=9.3,name=iPhone 6S Plus" SCHEME="$IOS_SCHEME" SDK="${IOS_SIM}9.3"
+
+    - os: osx
+      osx_image: xcode8
+      env: DESTINATION="OS=10.0,name=iPhone 6S" SCHEME="$IOS_SCHEME" SDK="${IOS_SIM}10.0"
+
 script:
-    - bash <(curl -s https://raw.githubusercontent.com/PlanTeam/Tools/master/CI.sh)
+  - set -o pipefail
+  - xcodebuild -version
+  - xcodebuild -showsdks
+
+  - xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES clean test | xcpretty -c;
+  - xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES clean test | xcpretty -c;

+ 8 - 0
CryptoSwift.xcodeproj/project.pbxproj

@@ -1151,6 +1151,7 @@
 				PRODUCT_NAME = CryptoSwift;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -1173,6 +1174,7 @@
 				PRODUCT_NAME = CryptoSwift;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -1223,6 +1225,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -1265,6 +1268,7 @@
 				PRODUCT_NAME = CryptoSwift;
 				SDKROOT = iphoneos;
 				SWIFT_INSTALL_OBJC_HEADER = NO;
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -1387,6 +1391,7 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1418,6 +1423,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_DISABLE_SAFETY_CHECKS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
@@ -1444,6 +1450,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -1471,6 +1478,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_DISABLE_SAFETY_CHECKS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};