[Fix] Build server issues.

Author: kzaher

.travis.yml

@@ -1,6 +1,6 @@
 language: objective-c
 
-osx_image: xcode7.3
+osx_image: xcode8
 
 notifications:
   slack: rxswift:3ykt2Z61f8GkdvhCZTYPduOL

scripts/all-tests.sh

@@ -46,10 +46,6 @@ function checkPlistVersions() {
 
 checkPlistVersions
 
-if [ "${IS_SWIFT_3}" -ne 1 ]; then
-    ./scripts/validate-headers.swift
-    ./scripts/package-spm.swift > /dev/null
-fi
 ensureNoGitChanges "Package for Swift package manager isn't updated, please run ./scripts/package-spm.swift and commit the changes"
 
 CONFIGURATIONS=(Release-Tests)
@@ -126,9 +122,3 @@ do
 		rx ${scheme} ${configuration} "" build
 	done
 done
-
-# compile and run playgrounds
-
-if [ "${IS_SWIFT_3}" -ne 1 ]; then
-	. scripts/validate-playgrounds.sh
-fi

scripts/common.sh

@@ -21,16 +21,22 @@ BOLDWHITE="\033[1m\033[37m"
 
 # make sure all tests are passing
 
-IS_SWIFT_3=`swift --version | grep "Apple Swift version 3.0" | wc -l`
-
-if [ "${IS_SWIFT_3}" -eq 1 ]; then
+if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.iOS-10-1 | wc -l` -eq 1 ]; then
     DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/10.1
+else
+    DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/10.0
+fi
+
+if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.watchOS-3-1 | wc -l` -eq 1 ]; then
     DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/3.1
-    DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/10.0
 else
-    DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/9.3
-    DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/2.2
-    DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/9.1
+    DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/3.0
+fi
+
+if [ `xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.tvOS-10-1 | wc -l` -eq 1 ]; then
+    DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/10.1
+else
+    DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/10.0
 fi
 
 function runtime_available() {

scripts/validate-headers.swift

@@ -40,6 +40,7 @@ let excludedRootPaths = [
 
 let excludePaths = [
     "AllTests/main.swift",
+    "AllTestz/main.swift",
     "RxExample/Services/Reachability.swift",
     "RxCocoaTests/RxTests-"
 ]