Skip to content

Commit

Permalink
Update Rx to 4.0.0-rc.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sergdort committed Oct 10, 2017
1 parent c2fdccf commit 0b58e03
Show file tree
Hide file tree
Showing 89 changed files with 1,698 additions and 1,211 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "ReactiveX/RxSwift" ~> 4.0.0
github "ReactiveX/RxSwift" ~> 4.0.0-rc.0
github "Alamofire/Alamofire" ~> 4.5.1
6 changes: 3 additions & 3 deletions RxAlamofire.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ Pod::Spec.new do |s|

s.subspec "Core" do |ss|
ss.source_files = "Sources/*.swift"
ss.dependency "RxSwift", '~> 4.0.0-beta.0'
ss.dependency "Alamofire", '~> 4.5.1'
ss.dependency "RxSwift", '~> 4.0.0-rc.0'
ss.dependency "Alamofire", '~> 4.5'
ss.framework = "Foundation"
end

s.subspec "RxCocoa" do |ss|
ss.source_files = "Sources/Cocoa/*.swift"
ss.dependency "RxCocoa", '~> 4.0.0-alpha.1'
ss.dependency "RxCocoa", '~> 4.0.0-rc.0'
ss.dependency "RxAlamofire/Core"
end

Expand Down
6 changes: 3 additions & 3 deletions RxAlamofire/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use_frameworks!

def common
pod 'Alamofire', '~> 4.5.1'
pod 'RxSwift', :git => 'https://github.com/ReactiveX/RxSwift.git', :tag => '4.0.0-beta.0'
pod 'RxCocoa', :git => 'https://github.com/ReactiveX/RxSwift.git', :tag => '4.0.0-alpha.1'
pod 'RxSwift', :git => 'https://github.com/ReactiveX/RxSwift.git', :tag => '4.0.0-rc.0'
pod 'RxCocoa', :git => 'https://github.com/ReactiveX/RxSwift.git', :tag => '4.0.0-rc.0'
end

target 'RxAlamofire-iOS-Example' do
Expand All @@ -26,7 +26,7 @@ target 'RxAlamofireTests' do
common
pod 'OHHTTPStubs', '~> 5.0'
pod 'OHHTTPStubs/Swift', '~> 5.0'
pod 'RxBlocking', :git => 'https://github.com/ReactiveX/RxSwift.git', :tag => '4.0.0-beta.0'
pod 'RxBlocking', :git => 'https://github.com/ReactiveX/RxSwift.git', :tag => '4.0.0-rc.0'
end

target 'RxAlamofire-tvOS' do
Expand Down
6 changes: 3 additions & 3 deletions RxAlamofire/Pods/Local Podspecs/RxBlocking.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions RxAlamofire/Pods/Local Podspecs/RxCocoa.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions RxAlamofire/Pods/Local Podspecs/RxSwift.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions RxAlamofire/Pods/RxBlocking/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions RxAlamofire/Pods/RxCocoa/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 61 additions & 0 deletions RxAlamofire/Pods/RxCocoa/RxCocoa/Common/Binder.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0b58e03

Please sign in to comment.