File tree Expand file tree Collapse file tree 4 files changed +15
-18
lines changed Expand file tree Collapse file tree 4 files changed +15
-18
lines changed Original file line number Diff line number Diff line change 1
1
language : objective-c
2
2
3
- osx_image : xcode7.3
3
+ osx_image : xcode8
4
4
5
5
notifications :
6
6
slack : rxswift:3ykt2Z61f8GkdvhCZTYPduOL
Original file line number Diff line number Diff line change @@ -46,10 +46,6 @@ function checkPlistVersions() {
46
46
47
47
checkPlistVersions
48
48
49
- if [ " ${IS_SWIFT_3} " -ne 1 ]; then
50
- ./scripts/validate-headers.swift
51
- ./scripts/package-spm.swift > /dev/null
52
- fi
53
49
ensureNoGitChanges " Package for Swift package manager isn't updated, please run ./scripts/package-spm.swift and commit the changes"
54
50
55
51
CONFIGURATIONS=(Release-Tests)
126
122
rx ${scheme} ${configuration} " " build
127
123
done
128
124
done
129
-
130
- # compile and run playgrounds
131
-
132
- if [ " ${IS_SWIFT_3} " -ne 1 ]; then
133
- . scripts/validate-playgrounds.sh
134
- fi
Original file line number Diff line number Diff line change @@ -21,16 +21,22 @@ BOLDWHITE="\033[1m\033[37m"
21
21
22
22
# make sure all tests are passing
23
23
24
- IS_SWIFT_3=` swift --version | grep " Apple Swift version 3.0" | wc -l`
25
-
26
- if [ " ${IS_SWIFT_3} " -eq 1 ]; then
24
+ if [ ` xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.iOS-10-1 | wc -l` -eq 1 ]; then
27
25
DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/10.1
26
+ else
27
+ DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/10.0
28
+ fi
29
+
30
+ if [ ` xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.watchOS-3-1 | wc -l` -eq 1 ]; then
28
31
DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/3.1
29
- DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/10.0
30
32
else
31
- DEFAULT_IOS_SIMULATOR=RxSwiftTest/iPhone-6/iOS/9.3
32
- DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/2.2
33
- DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/9.1
33
+ DEFAULT_WATCHOS_SIMULATOR=RxSwiftTest/Apple-Watch-38mm/watchOS/3.0
34
+ fi
35
+
36
+ if [ ` xcrun simctl list runtimes | grep com.apple.CoreSimulator.SimRuntime.tvOS-10-1 | wc -l` -eq 1 ]; then
37
+ DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/10.1
38
+ else
39
+ DEFAULT_TVOS_SIMULATOR=RxSwiftTest/Apple-TV-1080p/tvOS/10.0
34
40
fi
35
41
36
42
function runtime_available() {
Original file line number Diff line number Diff line change @@ -40,6 +40,7 @@ let excludedRootPaths = [
40
40
41
41
let excludePaths = [
42
42
" AllTests/main.swift " ,
43
+ " AllTestz/main.swift " ,
43
44
" RxExample/Services/Reachability.swift " ,
44
45
" RxCocoaTests/RxTests- "
45
46
]
You can’t perform that action at this time.
0 commit comments