Skip to content

Use RxSwift 2.1 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashfurrow merged 1 commit into from
Jan 16, 2016
Merged

Use RxSwift 2.1 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ Pods/
# Carthage/Checkouts

Carthage/Build
.DS_Store
4 changes: 2 additions & 2 deletions Action.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Pod::Spec.new do |s|
s.source_files = "*.{swift}"

s.frameworks = "Foundation"
s.dependency "RxSwift", '~> 2.0.0'
s.dependency "RxCocoa", '~> 2.0.0'
s.dependency "RxSwift", '~> 2.1.0'
s.dependency "RxCocoa", '~> 2.1.0'

s.watchos.exclude_files = "UIButton+Rx.swift", "UIBarButtonItem+Action.swift", "AlertAction.swift"
s.osx.exclude_files = "UIButton+Rx.swift", "UIBarButtonItem+Action.swift", "AlertAction.swift"
Expand Down
6 changes: 3 additions & 3 deletions Demo/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ end
target 'DemoTests' do

# Dependencies
pod 'RxSwift', '~> 2.0.0'
pod 'RxCocoa', '~> 2.0.0'
pod 'RxBlocking', '~> 2.0.0'
pod 'RxSwift', '~> 2.1'
pod 'RxCocoa', '~> 2.1'
pod 'RxBlocking', '~> 2.1'

# Testing libraries
pod 'Quick'
Expand Down
28 changes: 14 additions & 14 deletions Demo/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
PODS:
- Action (1.0.0):
- RxCocoa (~> 2.0.0)
- RxSwift (~> 2.0.0)
- Action (1.1.0):
- RxCocoa (~> 2.1.0)
- RxSwift (~> 2.1.0)
- Nimble (3.0.0)
- Quick (0.8.0)
- RxBlocking (2.0.0):
- RxBlocking (2.1.0):
- RxSwift (~> 2.0)
- RxCocoa (2.0.0):
- RxCocoa (2.1.0):
- RxSwift (~> 2.0)
- RxSwift (2.0.0)
- RxSwift (2.1.0)

DEPENDENCIES:
- Action (from `../`)
- Nimble
- Quick
- RxBlocking (~> 2.0.0)
- RxCocoa (~> 2.0.0)
- RxSwift (~> 2.0.0)
- RxBlocking (~> 2.1)
- RxCocoa (~> 2.1)
- RxSwift (~> 2.1)

EXTERNAL SOURCES:
Action:
:path: "../"
:path: ../

SPEC CHECKSUMS:
Action: 6e9b1bb31f75cf7092b07d4acfaf8e217393b180
Action: d313d68136ecaa8c8419fcb59d87bd26f2f80522
Nimble: 4c353d43735b38b545cbb4cb91504588eb5de926
Quick: 563d0f6ec5f72e394645adb377708639b7dd38ab
RxBlocking: a95a10ed54eb5d116f6c9a87047ff671e181d07b
RxCocoa: b0ebd70b4f7450bdb3c8987b122f8fd568dc1e2f
RxSwift: d83246efa6f16c50c143bec134649d045498f601
RxBlocking: fa297def258d85c5beae9ed507f94645260b3747
RxCocoa: 79b5feb8378545336e756a0a33fcf5e95050b71c
RxSwift: 110fb07f81c17c2c3b3254d168363057b1880d18

COCOAPODS: 0.39.0