Skip to content

Commit 35ac2e9

Browse files
committed
Merge pull request #22 from carlosypunto/master
Use RxSwift 2.1
2 parents 33653ea + edae239 commit 35ac2e9

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ Pods/
3131
# Carthage/Checkouts
3232

3333
Carthage/Build
34+
.DS_Store

Action.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Pod::Spec.new do |s|
2121
s.source_files = "*.{swift}"
2222

2323
s.frameworks = "Foundation"
24-
s.dependency "RxSwift", '~> 2.0.0'
25-
s.dependency "RxCocoa", '~> 2.0.0'
24+
s.dependency "RxSwift", '~> 2.1.0'
25+
s.dependency "RxCocoa", '~> 2.1.0'
2626

2727
s.watchos.exclude_files = "UIButton+Rx.swift", "UIBarButtonItem+Action.swift", "AlertAction.swift"
2828
s.osx.exclude_files = "UIButton+Rx.swift", "UIBarButtonItem+Action.swift", "AlertAction.swift"

Demo/Podfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ end
1717
target 'DemoTests' do
1818

1919
# Dependencies
20-
pod 'RxSwift', '~> 2.0.0'
21-
pod 'RxCocoa', '~> 2.0.0'
22-
pod 'RxBlocking', '~> 2.0.0'
20+
pod 'RxSwift', '~> 2.1'
21+
pod 'RxCocoa', '~> 2.1'
22+
pod 'RxBlocking', '~> 2.1'
2323

2424
# Testing libraries
2525
pod 'Quick'

Demo/Podfile.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
PODS:
2-
- Action (1.0.0):
3-
- RxCocoa (~> 2.0.0)
4-
- RxSwift (~> 2.0.0)
2+
- Action (1.1.0):
3+
- RxCocoa (~> 2.1.0)
4+
- RxSwift (~> 2.1.0)
55
- Nimble (3.0.0)
66
- Quick (0.8.0)
7-
- RxBlocking (2.0.0):
7+
- RxBlocking (2.1.0):
88
- RxSwift (~> 2.0)
9-
- RxCocoa (2.0.0):
9+
- RxCocoa (2.1.0):
1010
- RxSwift (~> 2.0)
11-
- RxSwift (2.0.0)
11+
- RxSwift (2.1.0)
1212

1313
DEPENDENCIES:
1414
- Action (from `../`)
1515
- Nimble
1616
- Quick
17-
- RxBlocking (~> 2.0.0)
18-
- RxCocoa (~> 2.0.0)
19-
- RxSwift (~> 2.0.0)
17+
- RxBlocking (~> 2.1)
18+
- RxCocoa (~> 2.1)
19+
- RxSwift (~> 2.1)
2020

2121
EXTERNAL SOURCES:
2222
Action:
23-
:path: "../"
23+
:path: ../
2424

2525
SPEC CHECKSUMS:
26-
Action: 6e9b1bb31f75cf7092b07d4acfaf8e217393b180
26+
Action: d313d68136ecaa8c8419fcb59d87bd26f2f80522
2727
Nimble: 4c353d43735b38b545cbb4cb91504588eb5de926
2828
Quick: 563d0f6ec5f72e394645adb377708639b7dd38ab
29-
RxBlocking: a95a10ed54eb5d116f6c9a87047ff671e181d07b
30-
RxCocoa: b0ebd70b4f7450bdb3c8987b122f8fd568dc1e2f
31-
RxSwift: d83246efa6f16c50c143bec134649d045498f601
29+
RxBlocking: fa297def258d85c5beae9ed507f94645260b3747
30+
RxCocoa: 79b5feb8378545336e756a0a33fcf5e95050b71c
31+
RxSwift: 110fb07f81c17c2c3b3254d168363057b1880d18
3232

3333
COCOAPODS: 0.39.0

0 commit comments

Comments
 (0)