From 19d96ca218df6980720a034119ee7c1052a4f1f8 Mon Sep 17 00:00:00 2001 From: Econa77 Date: Sat, 2 Jan 2021 15:55:06 +0900 Subject: [PATCH] Add support for RxSwift 6 --- Cartfile | 2 +- Cartfile.resolved | 2 +- Example/Podfile | 8 ++++---- Example/Podfile.lock | 36 ++++++++++++++++++------------------ Package.resolved | 4 ++-- Package.swift | 2 +- RxAnimated.podspec | 4 ++-- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Cartfile b/Cartfile index 7d1b8f2..976686e 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "ReactiveX/RxSwift" ~> 5.1 +github "ReactiveX/RxSwift" ~> 6.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index ec14f25..c07923a 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1 @@ -github "ReactiveX/RxSwift" "5.1.1" +github "ReactiveX/RxSwift" "6.0.0" diff --git a/Example/Podfile b/Example/Podfile index 9efbdfb..a548f8e 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -2,16 +2,16 @@ use_frameworks! target 'RxAnimated_Example' do - pod 'RxSwift', '~> 5.1.0' - pod 'RxCocoa', '~> 5.1.0' + pod 'RxSwift', '~> 6.0.0' + pod 'RxCocoa', '~> 6.0.0' pod 'RxAnimated', :path => '../' end target 'RxAnimated-Example-AppleTV' do - pod 'RxSwift', '~> 5.1.0' - pod 'RxCocoa', '~> 5.1.0' + pod 'RxSwift', '~> 6.0.0' + pod 'RxCocoa', '~> 6.0.0' pod 'RxAnimated', :path => '../' end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index be41a95..3842d35 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,22 +1,22 @@ PODS: - RxAnimated (0.8.1): - RxAnimated/Core (= 0.8.1) - - RxCocoa (~> 5.1) - - RxSwift (~> 5.1) + - RxCocoa (~> 6.0) + - RxSwift (~> 6.0) - RxAnimated/Core (0.8.1): - - RxCocoa (~> 5.1) - - RxSwift (~> 5.1) - - RxCocoa (5.1.1): - - RxRelay (~> 5) - - RxSwift (~> 5) - - RxRelay (5.1.1): - - RxSwift (~> 5) - - RxSwift (5.1.1) + - RxCocoa (~> 6.0) + - RxSwift (~> 6.0) + - RxCocoa (6.0.0): + - RxRelay (= 6.0.0) + - RxSwift (= 6.0.0) + - RxRelay (6.0.0): + - RxSwift (= 6.0.0) + - RxSwift (6.0.0) DEPENDENCIES: - RxAnimated (from `../`) - - RxCocoa (~> 5.1.0) - - RxSwift (~> 5.1.0) + - RxCocoa (~> 6.0.0) + - RxSwift (~> 6.0.0) SPEC REPOS: trunk: @@ -29,11 +29,11 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - RxAnimated: 5181b7b8369e8cb7ecd66d91110d84f1bb0edb64 - RxCocoa: 32065309a38d29b5b0db858819b5bf9ef038b601 - RxRelay: d77f7d771495f43c556cbc43eebd1bb54d01e8e9 - RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178 + RxAnimated: 438f2f3882b221bd6fd5942fde149135a550ea75 + RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e + RxRelay: 8d593be109c06ea850df027351beba614b012ffb + RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295 -PODFILE CHECKSUM: 0fde4b5914dec89a7a84760211a9ae5223a647e6 +PODFILE CHECKSUM: 7d22d4ad81fb04dc7cf36be978beb43332a3b5d0 -COCOAPODS: 1.9.1 +COCOAPODS: 1.10.0 diff --git a/Package.resolved b/Package.resolved index 4be0569..c620799 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/ReactiveX/RxSwift.git", "state": { "branch": null, - "revision": "c1bd31b397d87a54467af4161dde9d6b27720c19", - "version": "5.1.0" + "revision": "c8742ed97fc2f0c015a5ea5eddefb064cd7532d2", + "version": "6.0.0" } } ] diff --git a/Package.swift b/Package.swift index b3e46f2..608bfe2 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "RxCocoaRuntime", targets: ["RxAnimated"]), ], dependencies: [ - .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.1.1")), + .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.0.0")), ], targets: [ .target( diff --git a/RxAnimated.podspec b/RxAnimated.podspec index 3b1c295..f051285 100644 --- a/RxAnimated.podspec +++ b/RxAnimated.podspec @@ -27,8 +27,8 @@ Pod::Spec.new do |s| # end s.frameworks = 'UIKit' - s.dependency 'RxSwift', '~> 5.1' - s.dependency 'RxCocoa', '~> 5.1' + s.dependency 'RxSwift', '~> 6.0' + s.dependency 'RxCocoa', '~> 6.0' s.swift_version = "5.2"