Skip to content

Commit cdb046a

Browse files
authored
Merge pull request #10 from RxSwiftCommunity/update/rx
Update RxSwift to 6.0+
2 parents 667fe04 + 0b863f1 commit cdb046a

File tree

3 files changed

+44
-44
lines changed

3 files changed

+44
-44
lines changed

Example/Podfile.lock

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
PODS:
2-
- Differentiator (4.0.1)
3-
- Fakery (4.1.1)
2+
- Differentiator (5.0.0)
3+
- Fakery (5.0.0)
44
- Reusable (4.1.1):
55
- Reusable/Storyboard (= 4.1.1)
66
- Reusable/View (= 4.1.1)
77
- Reusable/Storyboard (4.1.1)
88
- Reusable/View (4.1.1)
9-
- RxBinding (0.4):
10-
- RxCocoa (< 6.0.0, >= 5.0.0)
11-
- RxSwift (< 6.0.0, >= 5.0.0)
12-
- RxCocoa (5.1.1):
13-
- RxRelay (~> 5)
14-
- RxSwift (~> 5)
15-
- RxController (1.1.2):
16-
- RxCocoa (~> 5)
17-
- RxFlow (~> 2.7)
18-
- RxSwift (~> 5)
19-
- RxDataSources (4.0.1):
20-
- Differentiator (~> 4.0)
21-
- RxCocoa (~> 5.0)
22-
- RxSwift (~> 5.0)
23-
- RxDataSourcesSingleSection (0.2.1):
9+
- RxBinding (0.5):
10+
- RxCocoa (~> 6)
11+
- RxSwift (~> 6)
12+
- RxCocoa (6.0.0):
13+
- RxRelay (= 6.0.0)
14+
- RxSwift (= 6.0.0)
15+
- RxController (1.2):
16+
- RxCocoa (~> 6)
17+
- RxFlow (~> 2.12)
18+
- RxSwift (~> 6)
19+
- RxDataSources (5.0.0):
20+
- Differentiator (~> 5.0)
21+
- RxCocoa (~> 6.0)
22+
- RxSwift (~> 6.0)
23+
- RxDataSourcesSingleSection (0.3):
2424
- Reusable (~> 4)
25-
- RxCocoa (~> 5)
26-
- RxDataSources (~> 4)
27-
- RxSwift (~> 5)
28-
- RxFlow (2.9.1):
29-
- RxCocoa (>= 5.1.1)
30-
- RxSwift (>= 5.1.1)
31-
- RxRelay (5.1.1):
32-
- RxSwift (~> 5)
33-
- RxSwift (5.1.1)
25+
- RxCocoa (~> 6)
26+
- RxDataSources (~> 5)
27+
- RxSwift (~> 6)
28+
- RxFlow (2.12.0):
29+
- RxCocoa (>= 6.0.0)
30+
- RxSwift (>= 6.0.0)
31+
- RxRelay (6.0.0):
32+
- RxSwift (= 6.0.0)
33+
- RxSwift (6.0.0)
3434
- SnapKit (5.0.1)
3535

3636
DEPENDENCIES:
@@ -59,19 +59,19 @@ EXTERNAL SOURCES:
5959
:path: "../"
6060

6161
SPEC CHECKSUMS:
62-
Differentiator: 886080237d9f87f322641dedbc5be257061b0602
63-
Fakery: d3380c4aa1efe7631c0831d7e26aa9db4491f014
62+
Differentiator: e8497ceab83c1b10ca233716d547b9af21b9344d
63+
Fakery: 8146918b8dd6df98564dca10cbe8bd05354b8cc4
6464
Reusable: 53a9acf5c536f229b31b5865782414b508252ddb
65-
RxBinding: da433c012633802a72c2a5bec8775b86f4cddeb8
66-
RxCocoa: 32065309a38d29b5b0db858819b5bf9ef038b601
67-
RxController: 07302707b1044b28de6ee3207a482f91f47c894f
68-
RxDataSources: efee07fa4de48477eca0a4611e6d11e2da9c1114
69-
RxDataSourcesSingleSection: 4394e57ae097f33e3845cf3a57bdf7826eca2d38
70-
RxFlow: 029e260333ef843b349ba9cb9265929941830aee
71-
RxRelay: d77f7d771495f43c556cbc43eebd1bb54d01e8e9
72-
RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178
65+
RxBinding: e3c76d02d0ee3f1a306a0fb8e8ef6f2eda65a375
66+
RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
67+
RxController: a002facc8ef4fa3a5fccb58c79219a933b03c905
68+
RxDataSources: aa47cc1ed6c500fa0dfecac5c979b723542d79cf
69+
RxDataSourcesSingleSection: e646e523ad92109293b22e745b55dcb38bea7a58
70+
RxFlow: b407eb6b5d956041a9e0930469346e104911a470
71+
RxRelay: 8d593be109c06ea850df027351beba614b012ffb
72+
RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
7373
SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
7474

7575
PODFILE CHECKSUM: 0e048f42166325ac7ea57547d12ebbc2fc47fb5f
7676

77-
COCOAPODS: 1.9.3
77+
COCOAPODS: 1.10.1

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import PackageDescription
55
let package = Package(
66
name: "RxController",
77
platforms: [
8-
.iOS(.v9)
8+
.iOS(.v10)
99
],
1010
products: [
1111
.library(name: "RxController", targets: ["RxController"])
1212
],
1313
dependencies: [
14-
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0")),
15-
.package(url: "https://github.com/RxSwiftCommunity/RxFlow.git", .upToNextMajor(from: "2.7.0"))
14+
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.0.0")),
15+
.package(url: "https://github.com/RxSwiftCommunity/RxFlow.git", .upToNextMajor(from: "2.12.0"))
1616
],
1717
targets: [
1818
.target(name: "RxController", dependencies: ["RxSwift", "RxCocoa", "RxFlow"], path: "RxController")

RxController.podspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'RxController'
11-
s.version = '1.1.2'
11+
s.version = '1.2'
1212
s.summary = 'A library for developing with MVVM-C based on RxFlow and RxSwift.'
1313

1414
# This description is used to generate tags and improve search results.
@@ -33,8 +33,8 @@ These classes make it easy to transfer data among the flows, the parent view mod
3333
s.source_files = 'RxController/Classes/**/*'
3434
s.preserve_paths = 'rxtree/**/*'
3535

36-
s.dependency 'RxSwift', '~> 5'
37-
s.dependency 'RxCocoa', '~> 5'
38-
s.dependency 'RxFlow', '~> 2.7'
36+
s.dependency 'RxSwift', '~> 6'
37+
s.dependency 'RxCocoa', '~> 6'
38+
s.dependency 'RxFlow', '~> 2.12'
3939

4040
end

0 commit comments

Comments
 (0)