Skip to content

Commit f153c92

Browse files
committed
Merge branch 'CI'
2 parents 5108eae + 30bbe62 commit f153c92

File tree

298 files changed

+28457
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+28457
-110
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ timeline.xctimeline
2626
# you should judge for yourself, the pros and cons are mentioned at:
2727
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
2828
#
29-
Pods/
3029

3130
# Carthage
3231
#

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
language: objective-c
22

3-
osx_image: xcode7.3
3+
osx_image: xcode8
44

55
notifications:
66
slack: rxswift:3ykt2Z61f8GkdvhCZTYPduOL
77
email: false
88

9+
install: true
10+
911
script:
10-
- . ./scripts/common.sh ; rx "Tests" Release "${DEFAULT_IOS_SIMULATOR}" test
12+
- mkdir -p build && . ./scripts/common.sh && rx "Tests" Release "${DEFAULT_IOS_SIMULATOR}" test && set +e
13+
14+
after_success:
15+
- sleep 5 # workaround https://github.com/travis-ci/travis-ci/issues/4725

Pods/Local Podspecs/RxCocoa.podspec.json

Lines changed: 49 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Local Podspecs/RxSwift.podspec.json

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Manifest.lock

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 2035 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/RxCocoa/LICENSE.md

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/RxCocoa/Platform/DataStructures/Bag.swift

Lines changed: 213 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/RxCocoa/Platform/DataStructures/InfiniteSequence.swift

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)