diff --git a/.travis.yml b/.travis.yml index 88e8eba8..591fb2fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c -osx_image: xcode7.0 +osx_image: xcode7 xcode_sdk: iphonesimulator9.0 notifications: diff --git a/scripts/common.sh b/scripts/common.sh index 3c91ca93..ebb03c6f 100755 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -24,22 +24,15 @@ BOLDWHITE="\033[1m\033[37m" DEFAULT_IOS7_SIMULATOR=RxSwiftTest-iPhone4s-iOS_7.1 DEFAULT_IOS8_SIMULATOR=RxSwiftTest-iPhone6-iOS_8.4 +DEFAULT_IOS9_SIMULATOR=RxSwiftTest-iPhone6-iOS_9.0 IOS7_SIMULATORS="RxSwiftTest-iPhone4s-iOS_7.1 RxSwiftTest-iPhone5-iOS_7.1 RxSwiftTest-iPhone5s-iOS_7.1" IOS8_SIMULATORS="RxSwiftTest-iPhone4s-iOS_8.4 RxSwiftTest-iPhone5-iOS_8.4 RxSwiftTest-iPhone5s-iOS_8.4 RxSwiftTest-iPhone6-iOS_8.4 RxSwiftTest-iPhone6Plus-iOS_8.4" +#IOS9_SIMULATORS="RxSwiftTest-iPhone4s-iOS_9.0 RxSwiftTest-iPhone5-iOS_9.0 RxSwiftTest-iPhone5s-iOS_9.0 RxSwiftTest-iPhone6-iOS_9.0 RxSwiftTest-iPhone6Plus-iOS_9.0" +IOS9_SIMULATORS="cRxSwiftTest-iPhone6-iOS_9.0" BUILD_DIRECTORY=build -function ios7simulator() { - A=($IOS7_SIMULATORS) - echo ${A[$1]} -} - -function ios8simulator() { - A=($IOS8_SIMULATORS) - echo ${A[$1]} -} - function rx() { SCHEME=$1 CONFIGURATION=$2 @@ -88,6 +81,13 @@ function createDevices() { xcrun simctl create RxSwiftTest-iPhone6-iOS_8.4 'iPhone 6' 'com.apple.CoreSimulator.SimRuntime.iOS-8-4' xcrun simctl create RxSwiftTest-iPhone6Plus-iOS_8.4 'iPhone 6 Plus' 'com.apple.CoreSimulator.SimRuntime.iOS-8-4' + + xcrun simctl create RxSwiftTest-iPhone4s-iOS_9.0 'iPhone 4s' 'com.apple.CoreSimulator.SimRuntime.iOS-9-0' + xcrun simctl create RxSwiftTest-iPhone5-iOS_9.0 'iPhone 5' 'com.apple.CoreSimulator.SimRuntime.iOS-9-0' + xcrun simctl create RxSwiftTest-iPhone5s-iOS_9.0 'iPhone 5s' 'com.apple.CoreSimulator.SimRuntime.iOS-9-0' + + xcrun simctl create RxSwiftTest-iPhone6-iOS_9.0 'iPhone 6' 'com.apple.CoreSimulator.SimRuntime.iOS-9-0' + xcrun simctl create RxSwiftTest-iPhone6Plus-iOS_9.0 'iPhone 6 Plus' 'com.apple.CoreSimulator.SimRuntime.iOS-9-0' } function deleteDevices() { @@ -101,4 +101,11 @@ function deleteDevices() { xcrun simctl delete RxSwiftTest-iPhone6-iOS_8.4 xcrun simctl delete RxSwiftTest-iPhone6Plus-iOS_8.4 + + xcrun simctl delete RxSwiftTest-iPhone4s-iOS_9.0 + xcrun simctl delete RxSwiftTest-iPhone5-iOS_9.0 + xcrun simctl delete RxSwiftTest-iPhone5s-iOS_9.0 + + xcrun simctl delete RxSwiftTest-iPhone6-iOS_9.0 + xcrun simctl delete RxSwiftTest-iPhone6Plus-iOS_9.0 } diff --git a/scripts/pre-release-tests.sh b/scripts/pre-release-tests.sh index 1442b82b..1c15eaac 100755 --- a/scripts/pre-release-tests.sh +++ b/scripts/pre-release-tests.sh @@ -6,24 +6,31 @@ if [ "$#" -eq 1 ]; then IS_LOCAL=1 else # ios 7 sim - if [ `xcrun simctl list | grep "${DEFAULT_IOS7_SIMULATOR}" | wc -l` == 0 ]; then - xcrun simctl create $DEFAULT_IOS7_SIMULATOR 'iPhone 4s' 'com.apple.CoreSimulator.SimRuntime.iOS-7-1' - else - echo "${DEFAULT_IOS7_SIMULATOR} exists" - fi + #if [ `xcrun simctl list | grep "${DEFAULT_IOS7_SIMULATOR}" | wc -l` == 0 ]; then + # xcrun simctl create $DEFAULT_IOS7_SIMULATOR 'iPhone 4s' 'com.apple.CoreSimulator.SimRuntime.iOS-7-1' + #else + # echo "${DEFAULT_IOS7_SIMULATOR} exists" + #fi #ios 8 sim - if [ `xcrun simctl list | grep "${DEFAULT_IOS8_SIMULATOR}" | wc -l` == 0 ]; then - xcrun simctl create $DEFAULT_IOS8_SIMULATOR 'iPhone 6' 'com.apple.CoreSimulator.SimRuntime.iOS-8-4' + #if [ `xcrun simctl list | grep "${DEFAULT_IOS8_SIMULATOR}" | wc -l` == 0 ]; then + # xcrun simctl create $DEFAULT_IOS8_SIMULATOR 'iPhone 6' 'com.apple.CoreSimulator.SimRuntime.iOS-8-4' + #else + # echo "${DEFAULT_IOS8_SIMULATOR} exists" + #fi + + #ios 9 sim + if [ `xcrun simctl list | grep "${DEFAULT_IOS9_SIMULATOR}" | wc -l` == 0 ]; then + xcrun simctl create $DEFAULT_IOS9_SIMULATOR 'iPhone 6' 'com.apple.CoreSimulator.SimRuntime.iOS-9-0' else - echo "${DEFAULT_IOS8_SIMULATOR} exists" + echo "${DEFAULT_IOS9_SIMULATOR} exists" fi fi #make sure all iOS tests pass for configuration in "Debug" "Release-Tests" "Release" do - rx "RxTests-iOS" ${configuration} $DEFAULT_IOS8_SIMULATOR test + rx "RxTests-iOS" ${configuration} $DEFAULT_IOS9_SIMULATOR test done #make sure all OSX tests pass @@ -37,8 +44,9 @@ for scheme in "RxExample-iOS-no-module" do for configuration in "Debug" "Release-Tests" "Release" do - rx ${scheme} ${configuration} $DEFAULT_IOS7_SIMULATOR build - rx ${scheme} ${configuration} $DEFAULT_IOS8_SIMULATOR build + #rx ${scheme} ${configuration} $DEFAULT_IOS7_SIMULATOR build + #rx ${scheme} ${configuration} $DEFAULT_IOS8_SIMULATOR build + rx ${scheme} ${configuration} $DEFAULT_IOS9_SIMULATOR build done done @@ -47,7 +55,7 @@ for scheme in "RxExample-iOS" do for configuration in "Debug" "Release-Tests" "Release" do - rx ${scheme} ${configuration} $DEFAULT_IOS8_SIMULATOR build + rx ${scheme} ${configuration} $DEFAULT_IOS9_SIMULATOR build done done