Skip to content

Commit 56a7696

Browse files
committed
Fixes CI
1 parent dd1e1d2 commit 56a7696

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ notifications:
99
install: true
1010

1111
env:
12-
- BUILD="pod repo update; pod update && set -o pipefail && (xcodebuild -workspace RxDataSources.xcworkspace -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -workspace RxDataSources.xcworkspace -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -workspace RxDataSources.xcworkspace -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
12+
- BUILD="pod repo update && pod update && set -o pipefail && (xcodebuild -workspace RxDataSources.xcworkspace -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -workspace RxDataSources.xcworkspace -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -workspace RxDataSources.xcworkspace -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
1313
- BUILD="./dependencies.sh && set -o pipefail && (xcodebuild -project RxDataSources.xcodeproj -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project RxDataSources.xcodeproj -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project RxDataSources.xcodeproj -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
1414
- BUILD="carthage update --platform ios && set -o pipefail && (xcodebuild -project RxDataSources.xcodeproj -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project RxDataSources.xcodeproj -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project RxDataSources.xcodeproj -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
1515
- BUILD="pod repo update && pod lib lint RxDataSources.podspec --verbose && pod lib lint Differentiator.podspec --verbose "

Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ platform :ios, '8.0'
22
use_frameworks!
33

44
def common
5-
pod 'RxSwift', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'master'
6-
pod 'RxCocoa', :git => '[email protected]:ReactiveX/RxSwift.git', :branch => 'master'
5+
pod 'RxSwift', '~> 4.0'
6+
pod 'RxCocoa', '~> 4.0'
77
end
88

99
target 'RxDataSources' do

0 commit comments

Comments
 (0)