From d4182ed028dd1139a0ef9ea0c2112dce6367f63d Mon Sep 17 00:00:00 2001 From: ryochan1101 Date: Wed, 15 Mar 2017 15:40:04 +0900 Subject: [PATCH 1/3] update RxSwift to ~> 3.3.0 --- Cartfile | 2 +- Cartfile.resolved | 2 +- Carthage/Checkouts/RxSwift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cartfile b/Cartfile index 9f2795c5..f8df1dcc 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "ReactiveX/RxSwift" ~> 3.0.0 +github "ReactiveX/RxSwift" ~> 3.3.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 9a356e4c..9442038e 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ github "Quick/Nimble" "v5.1.1" github "Quick/Quick" "v1.0.0" -github "ReactiveX/RxSwift" "3.1.0" +github "ReactiveX/RxSwift" "3.3.0" diff --git a/Carthage/Checkouts/RxSwift b/Carthage/Checkouts/RxSwift index b98fae65..84358af1 160000 --- a/Carthage/Checkouts/RxSwift +++ b/Carthage/Checkouts/RxSwift @@ -1 +1 @@ -Subproject commit b98fae65fbec38efe085002515b425e3e0a3b45a +Subproject commit 84358af11882cfd2227e03b3648d1400eed08623 From 77d587b589f2af8df88251b7ea8cfa6230fe1864 Mon Sep 17 00:00:00 2001 From: = Date: Sat, 15 Apr 2017 22:01:23 +0900 Subject: [PATCH 2/3] updated Readme --- Readme.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index b840d530..959a1558 100644 --- a/Readme.md +++ b/Readme.md @@ -100,9 +100,11 @@ Then run `pod install` and that'll be 👌 Add this to `Cartfile` ``` -github "RxSwiftCommunity/Action" ~> 2.1.1 +github "RxSwiftCommunity/Action" ~> 2.3.0 ``` +If you are using RxSwift 3.2.0 or below, Use Action `~2.2.0` instead! + then run ``` From 859e119cb58519edb0a7404863fcd78472860791 Mon Sep 17 00:00:00 2001 From: = Date: Sat, 15 Apr 2017 22:34:22 +0900 Subject: [PATCH 3/3] update package,swift for fetching RxSwift ~> 3.3.0 for travis --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index e961f84c..63699a0d 100644 --- a/Package.swift +++ b/Package.swift @@ -4,7 +4,7 @@ let package = Package( name: "Action", targets: [], dependencies: [ - .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3) + .Package(url: "https://github.com/ReactiveX/RxSwift.git", majorVersion: 3, minor: 3) ] )