ReactiveX/RxSwift
1
1
Fork 0
mirror of https://github.com/ReactiveX/RxSwift.git synced 2024-10-05 06:27:29 +03:00
Code Issues Projects Releases Wiki Activity

Update test scripts for WatchOS

Browse Source 
Add WatchOS 2 target in Podspecs
This commit is contained in:
Junior B 2015-09-30 15:15:34 +02:00 committed by Krunoslav Zaher
parent 7d1e73beca
commit 83c3f51461
5 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
RxBlocking.podspec
View File

@ -14,6 +14,7 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '8.0' s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9' s.osx.deployment_target = '10.9'
s.watchos.deployment_target = '2.0'
s.source_files = 'RxBlocking/**/*.swift' s.source_files = 'RxBlocking/**/*.swift'

2
RxCocoa.podspec
View File

@ -16,10 +16,12 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '8.0' s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9' s.osx.deployment_target = '10.9'
s.watchos.deployment_target = '2.0'
s.source_files = 'RxCocoa/RxCocoa.h', 'RxCocoa/Common/**/*.{swift,h,m}' s.source_files = 'RxCocoa/RxCocoa.h', 'RxCocoa/Common/**/*.{swift,h,m}'
s.ios.source_files = 'RxCocoa/iOS/**/*.swift' s.ios.source_files = 'RxCocoa/iOS/**/*.swift'
s.osx.source_files = 'RxCocoa/OSX/**/*.swift' s.osx.source_files = 'RxCocoa/OSX/**/*.swift'
s.watchos.source_files = 'RxCocoa/iOS/**/*.swift'
s.dependency 'RxSwift', '~> 2.0.0-alpha' s.dependency 'RxSwift', '~> 2.0.0-alpha'
end end

1
RxSwift.podspec
View File

@ -32,6 +32,7 @@ Pod::Spec.new do |s|
s.ios.deployment_target = '8.0' s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9' s.osx.deployment_target = '10.9'
s.watchos.deployment_target = '2.0'
s.source_files = 'RxSwift/**/*.swift' s.source_files = 'RxSwift/**/*.swift'
end end

19
scripts/common.sh
View File

@ -25,6 +25,7 @@ BOLDWHITE="\033[1m\033[37m"
DEFAULT_IOS7_SIMULATOR=RxSwiftTest-iPhone4s-iOS_7.1 DEFAULT_IOS7_SIMULATOR=RxSwiftTest-iPhone4s-iOS_7.1
DEFAULT_IOS8_SIMULATOR=RxSwiftTest-iPhone6-iOS_8.4 DEFAULT_IOS8_SIMULATOR=RxSwiftTest-iPhone6-iOS_8.4
DEFAULT_IOS9_SIMULATOR=RxSwiftTest-iPhone6-iOS_9.0 DEFAULT_IOS9_SIMULATOR=RxSwiftTest-iPhone6-iOS_9.0
DEFAULT_WATCHOS2_SIMULATOR=RxSwiftTest-AppleWatch-watchOS_2.0
if [ "${IS_LOCAL}" -eq 1 ]; then if [ "${IS_LOCAL}" -eq 1 ]; then
IOS7_SIMULATORS="RxSwiftTest-iPhone4s-iOS_7.1 RxSwiftTest-iPhone5-iOS_7.1 RxSwiftTest-iPhone5s-iOS_7.1" IOS7_SIMULATORS="RxSwiftTest-iPhone4s-iOS_7.1 RxSwiftTest-iPhone5-iOS_7.1 RxSwiftTest-iPhone5s-iOS_7.1"
@ -54,7 +55,11 @@ function rx() {
DESTINATION="" DESTINATION=""
if [ "$SIMULATOR" != "" ]; then if [ "$SIMULATOR" != "" ]; then
OS=`echo $SIMULATOR| cut -d'_' -f 2` OS=`echo $SIMULATOR| cut -d'_' -f 2`
DESTINATION='platform=iOS Simulator,OS='$OS',name='$SIMULATOR'' if contains $SIMULATOR "watchOS"; then
DESTINATION='platform=watchOS Simulator,OS='$OS',name='$SIMULATOR''
else
DESTINATION='platform=iOS Simulator,OS='$OS',name='$SIMULATOR''
fi
else else
DESTINATION='platform=OS X,arch=x86_64' DESTINATION='platform=OS X,arch=x86_64'
fi fi
@ -117,3 +122,15 @@ function deleteDevices() {
xcrun simctl delete RxSwiftTest-iPhone6-iOS_9.0 || echo "failed" xcrun simctl delete RxSwiftTest-iPhone6-iOS_9.0 || echo "failed"
xcrun simctl delete RxSwiftTest-iPhone6Plus-iOS_9.0 || echo "failed" xcrun simctl delete RxSwiftTest-iPhone6Plus-iOS_9.0 || echo "failed"
} }
# used to check simulator name
contains() {
string="$1"
substring="$2"
if test "${string#*$substring}" != "$string"
then
return 0 # $substring is in $string
else
return 1 # $substring is not in $string
fi
}

14
scripts/pre-release-tests.sh
View File

@ -40,6 +40,13 @@ else
echo "${DEFAULT_IOS9_SIMULATOR} exists" echo "${DEFAULT_IOS9_SIMULATOR} exists"
fi fi
#watch os 2 sim
if [ `xcrun simctl list | grep "${DEFAULT_WATCHOS2_SIMULATOR}" | wc -l` == 0 ]; then
xcrun simctl create $DEFAULT_WATCHOS2_SIMULATOR 'Apple Watch - 38mm' 'com.apple.CoreSimulator.SimRuntime.watchOS-2-0'
else
echo "${DEFAULT_WATCHOS2_SIMULATOR} exists"
fi
if [ "${IS_QUICK}" -eq 1 ]; then if [ "${IS_QUICK}" -eq 1 ]; then
CONFIGURATIONS=(Release) CONFIGURATIONS=(Release)
else else
@ -70,6 +77,13 @@ do
rx "RxTests-iOS" ${configuration} $DEFAULT_IOS9_SIMULATOR test rx "RxTests-iOS" ${configuration} $DEFAULT_IOS9_SIMULATOR test
done done
#make sure all watchOS tests pass
#tests for Watch OS are not available rdar://21760513
# for configuration in ${CONFIGURATIONS[@]}
# do
# rx "RxTests-watchOS" ${configuration} $DEFAULT_WATCHOS2_SIMULATOR test
# done
#make sure all OSX tests pass #make sure all OSX tests pass
for configuration in ${CONFIGURATIONS[@]} for configuration in ${CONFIGURATIONS[@]}
do do