From fc54ef83f00884d5605a6c5b1ec94c8379246307 Mon Sep 17 00:00:00 2001 From: edouardouvrard Date: Fri, 8 Apr 2016 21:03:02 +0200 Subject: [PATCH] Update rxswift to 2.3.1 --- Example/Podfile.lock | 54 +++++++++++++++++------------------ Moya-SwiftyJSONMapper.podspec | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index e7e9f02..2f600ef 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,7 +1,7 @@ PODS: - - Alamofire (3.2.1) - - Moya (6.2.0): - - Moya/Core (= 6.2.0) + - Alamofire (3.3.1) + - Moya (6.4.0): + - Moya/Core (= 6.4.0) - Moya-SwiftyJSONMapper (1.0.3): - Moya-SwiftyJSONMapper/Core (= 1.0.3) - Moya-SwiftyJSONMapper/Core (1.0.3): @@ -14,29 +14,29 @@ PODS: - Moya-SwiftyJSONMapper/RxSwift (1.0.3): - Moya-SwiftyJSONMapper/Core - Moya/RxSwift - - RxSwift (~> 2.0.0) - - Moya/Core (6.2.0): + - RxSwift (~> 2.3.1) + - Moya/Core (6.4.0): - Alamofire (~> 3.0) - - Result (~> 1.0) - - Moya/ReactiveCocoa (6.2.0): + - Result (~> 2.0) + - Moya/ReactiveCocoa (6.4.0): - Moya/Core - - ReactiveCocoa (= 4.0.0) - - Moya/RxSwift (6.2.0): + - ReactiveCocoa (~> 4.1) + - Moya/RxSwift (6.4.0): - Moya/Core - RxSwift (~> 2.0) - - ReactiveCocoa (4.0.0): - - ReactiveCocoa/UI (= 4.0.0) - - Result (~> 1.0.1) - - ReactiveCocoa/Core (4.0.0): + - ReactiveCocoa (4.1.0): + - ReactiveCocoa/UI (= 4.1.0) + - Result (~> 2.0) + - ReactiveCocoa/Core (4.1.0): - ReactiveCocoa/no-arc - - Result (~> 1.0.1) - - ReactiveCocoa/no-arc (4.0.0): - - Result (~> 1.0.1) - - ReactiveCocoa/UI (4.0.0): + - Result (~> 2.0) + - ReactiveCocoa/no-arc (4.1.0): + - Result (~> 2.0) + - ReactiveCocoa/UI (4.1.0): - ReactiveCocoa/Core - - Result (~> 1.0.1) - - Result (1.0.2) - - RxSwift (2.0.0) + - Result (~> 2.0) + - Result (2.0.0) + - RxSwift (2.3.1) - SwiftyJSON (2.3.2) DEPENDENCIES: @@ -46,15 +46,15 @@ DEPENDENCIES: EXTERNAL SOURCES: Moya-SwiftyJSONMapper: - :path: ../ + :path: "../" SPEC CHECKSUMS: - Alamofire: f11d8624a05f5d39e0c99309b3e600a3ba64298a - Moya: a5e57a405584177027daab240f4d47baa0722562 - Moya-SwiftyJSONMapper: 07f2386184685079a6eb06973584431151b2e0c3 - ReactiveCocoa: 69be555be30674b07a86b60a91b855063841acc0 - Result: dd3dd71af3fa2e262f1a999e14fba2c25ec14f16 - RxSwift: d83246efa6f16c50c143bec134649d045498f601 + Alamofire: 369bc67b6f5ac33ded3648d7bd21c5bfb91c2ecc + Moya: 4d526954c8afd79820991393d40d7d8af756ceee + Moya-SwiftyJSONMapper: b2614820dec3da4dbb56f6133e2f23bb1729fa19 + ReactiveCocoa: d70004d7a366a7b8e87e60ce2347182c77701949 + Result: 9e75e1111c774c6ac594e14907b15057053a7959 + RxSwift: 829b2843e9eddc77a02cb3f5117f0d55f8f646f1 SwiftyJSON: 04ccea08915aa0109039157c7974cf0298da292a COCOAPODS: 0.39.0 diff --git a/Moya-SwiftyJSONMapper.podspec b/Moya-SwiftyJSONMapper.podspec index 6e57763..c59190c 100644 --- a/Moya-SwiftyJSONMapper.podspec +++ b/Moya-SwiftyJSONMapper.podspec @@ -41,7 +41,7 @@ Pod::Spec.new do |s| ss.source_files = "Source/RxSwift/*.swift" ss.dependency "Moya/RxSwift" ss.dependency "Moya-SwiftyJSONMapper/Core" - ss.dependency "RxSwift", "~>2.0.0" + ss.dependency "RxSwift", "~>2.3.1" end s.subspec "ReactiveCocoa" do |ss|