From 2b41d1eb1116aab20f08755361f623bb0d914a2e Mon Sep 17 00:00:00 2001 From: Hovak Davtyan Date: Fri, 26 Mar 2021 14:09:52 +0400 Subject: [PATCH] -Update to RxSwift 6 --- Example/Podfile.lock | 28 ++++++++++++++-------------- Package.swift | 4 ++-- README.md | 2 +- STDevRxExt.podspec | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 30dafa5..d846b4b 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,13 +1,13 @@ PODS: - - RxCocoa (5.1.1): - - RxRelay (~> 5) - - RxSwift (~> 5) - - RxRelay (5.1.1): - - RxSwift (~> 5) - - RxSwift (5.1.1) - - STDevRxExt (0.2.0): - - RxCocoa (~> 5.1) - - RxSwift (~> 5.1) + - RxCocoa (6.1.0): + - RxRelay (= 6.1.0) + - RxSwift (= 6.1.0) + - RxRelay (6.1.0): + - RxSwift (= 6.1.0) + - RxSwift (6.1.0) + - STDevRxExt (1.1.0): + - RxCocoa (~> 6) + - RxSwift (~> 6) DEPENDENCIES: - STDevRxExt (from `../`) @@ -23,11 +23,11 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - RxCocoa: 32065309a38d29b5b0db858819b5bf9ef038b601 - RxRelay: d77f7d771495f43c556cbc43eebd1bb54d01e8e9 - RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178 - STDevRxExt: 57d7368115b81b92e06728276504ece2c52fda2b + RxCocoa: 5c51f02d562cbd94629f6c26cf0c80fe4ab8d343 + RxRelay: 483e1a19fad961b41f0b0c0bee506f46c1ae14fe + RxSwift: a834e5c538e89eca0cae86f403f4fbf0336786ce + STDevRxExt: fc33083a285fcca497728d17250436679015cdd5 PODFILE CHECKSUM: 83769abc0b7bdc83a928dcac34cf2b1154077760 -COCOAPODS: 1.9.3 +COCOAPODS: 1.10.1 diff --git a/Package.swift b/Package.swift index 982abb3..323b110 100644 --- a/Package.swift +++ b/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "STDevRxExt", platforms: [ - .macOS(.v10_10), .iOS(.v8), .tvOS(.v9), .watchOS(.v3), + .macOS(.v10_10), .iOS(.v9), .tvOS(.v9), .watchOS(.v3), ], products: [ .library( @@ -14,7 +14,7 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.1.0")), + .package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "6.0.0")), ], targets: [ .target( diff --git a/README.md b/README.md index 4d8c766..9920ace 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ To run the [Example.playground](Example/Example.playground), clone the repo, and ## Requirements -* iOS 8.0+ +* iOS 9.0+ * tvOS 9.0+ * macOS 10.10+ * watchOS 3.0+ diff --git a/STDevRxExt.podspec b/STDevRxExt.podspec index 2f91862..2a88b12 100644 --- a/STDevRxExt.podspec +++ b/STDevRxExt.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'STDevRxExt' - s.version = '1.0.0' + s.version = '1.1.0' s.summary = 'STDevRxExt contains some extension functions for RxSwift and RxCoca which makes our live easy.' s.swift_version = '5.0' @@ -17,13 +17,13 @@ STDevRxExt contains following 3 type of extensions for RxSwift and RxCocoa: s.author = { 'Tigran Hambardzumyan' => 'tigran@stdevmail.com' } s.source = { :git => 'https://github.com/STDevTM/STDevRxExt.git', :tag => s.version.to_s } - s.ios.deployment_target = '8.0' + s.ios.deployment_target = '9.0' s.osx.deployment_target = '10.9' s.watchos.deployment_target = '3.0' s.tvos.deployment_target = '9.0' s.source_files = 'Sources/STDevRxExt/**/*' - s.dependency 'RxSwift', '~> 5.1' - s.dependency 'RxCocoa', '~> 5.1' + s.dependency 'RxSwift', '~> 6' + s.dependency 'RxCocoa', '~> 6' end