diff --git a/Example/Podfile b/Example/Podfile index bedd4c9..6558906 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,5 +1,5 @@ use_frameworks! -platform :ios, '10.0' +platform :ios, '11.0' target 'RxController_Example' do pod 'RxController', :path => '../' diff --git a/Example/Podfile.lock b/Example/Podfile.lock index cbdf9be..6b395ee 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,20 +1,20 @@ PODS: - Differentiator (4.0.1) - Fakery (4.1.1) - - Reusable (4.1.0): - - Reusable/Storyboard (= 4.1.0) - - Reusable/View (= 4.1.0) - - Reusable/Storyboard (4.1.0) - - Reusable/View (4.1.0) - - RxBinding (0.3.1): - - RxCocoa (~> 5) - - RxSwift (~> 5) - - RxCocoa (5.0.1): + - Reusable (4.1.1): + - Reusable/Storyboard (= 4.1.1) + - Reusable/View (= 4.1.1) + - Reusable/Storyboard (4.1.1) + - Reusable/View (4.1.1) + - RxBinding (0.4): + - RxCocoa (< 6.0.0, >= 5.0.0) + - RxSwift (< 6.0.0, >= 5.0.0) + - RxCocoa (5.1.1): - RxRelay (~> 5) - RxSwift (~> 5) - - RxController (0.9.5): + - RxController (0.10): - RxCocoa (~> 5) - - RxFlow (~> 2) + - RxFlow (~> 2.9) - RxSwift (~> 5) - RxDataSources (4.0.1): - Differentiator (~> 4.0) @@ -25,12 +25,12 @@ PODS: - RxCocoa (~> 5) - RxDataSources (~> 4) - RxSwift (~> 5) - - RxFlow (2.6.0): - - RxCocoa (>= 5.0.0) - - RxSwift (>= 5.0.0) - - RxRelay (5.0.1): + - RxFlow (2.9.1): + - RxCocoa (>= 5.1.1) + - RxSwift (>= 5.1.1) + - RxRelay (5.1.1): - RxSwift (~> 5) - - RxSwift (5.0.1) + - RxSwift (5.1.1) - SnapKit (5.0.1) DEPENDENCIES: @@ -61,17 +61,17 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Differentiator: 886080237d9f87f322641dedbc5be257061b0602 Fakery: d3380c4aa1efe7631c0831d7e26aa9db4491f014 - Reusable: 82be188f29d96dc5eff0db7b2393bcc08d2cdd5b - RxBinding: 58be2cf1311165489a66eacb4a3e33932d598a53 - RxCocoa: e741b9749968e8a143e2b787f1dfbff2b63d0a5c - RxController: 4a160b0f7f9f50d24d623d2d4c43d60860698d6b + Reusable: 53a9acf5c536f229b31b5865782414b508252ddb + RxBinding: da433c012633802a72c2a5bec8775b86f4cddeb8 + RxCocoa: 32065309a38d29b5b0db858819b5bf9ef038b601 + RxController: adeab54a3771d0f12ce66b79d448a82a2b3b5930 RxDataSources: efee07fa4de48477eca0a4611e6d11e2da9c1114 RxDataSourcesSingleSection: 4394e57ae097f33e3845cf3a57bdf7826eca2d38 - RxFlow: f89ea40232813062f5e857fbe19a680a205a15ab - RxRelay: 89d54507f4fd4d969e6ec1d4bd7f3673640b4640 - RxSwift: e2dc62b366a3adf6a0be44ba9f405efd4c94e0c4 + RxFlow: 029e260333ef843b349ba9cb9265929941830aee + RxRelay: d77f7d771495f43c556cbc43eebd1bb54d01e8e9 + RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178 SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb -PODFILE CHECKSUM: 0e048f42166325ac7ea57547d12ebbc2fc47fb5f +PODFILE CHECKSUM: ba6283578e076eb1e1d926dfc1c2610458f4d335 -COCOAPODS: 1.8.4 +COCOAPODS: 1.9.3 diff --git a/RxController.podspec b/RxController.podspec index 5aa499e..0af1961 100644 --- a/RxController.podspec +++ b/RxController.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'RxController' - s.version = '0.9.5' + s.version = '0.10' s.summary = 'A library for developing with MVVM-C based on RxFlow and RxSwift.' # This description is used to generate tags and improve search results. @@ -25,16 +25,16 @@ These classes make it easy to transfer data among the flows, the parent view mod s.homepage = 'https://github.com/xflagstudio/RxController' s.license = { :type => 'MIT', :file => 'LICENSE' } - s.author = { 'Meng Li' => 'lm2343635@126.com' } + s.author = 'xflag' s.source = { :git => 'https://github.com/xflagstudio/RxController.git', :tag => s.version.to_s } - s.ios.deployment_target = '9.0' - s.swift_versions = '5.0' + s.ios.deployment_target = '11.0' + s.swift_versions = '5.2' s.source_files = 'RxController/Classes/**/*' s.preserve_paths = 'rxtree/**/*' s.dependency 'RxSwift', '~> 5' s.dependency 'RxCocoa', '~> 5' - s.dependency 'RxFlow', '~> 2' + s.dependency 'RxFlow', '~> 2.9' end diff --git a/RxController/Classes/RxControllerEvent.swift b/RxController/Classes/RxControllerEvent.swift index dbad05a..132417c 100644 --- a/RxController/Classes/RxControllerEvent.swift +++ b/RxController/Classes/RxControllerEvent.swift @@ -62,7 +62,7 @@ public struct RxControllerEvent { extension ObservableType where Element == RxControllerEvent { public func value(of identifier: RxControllerEvent.Identifier, type: T.Type = T.self) -> Observable { - return observeOn(MainScheduler.asyncInstance).filter { + observeOn(MainScheduler.asyncInstance).filter { $0.identifier.id == identifier.id }.map { $0.value as? T @@ -70,7 +70,7 @@ extension ObservableType where Element == RxControllerEvent { } public func unwrappedValue(of identifier: RxControllerEvent.Identifier, type: T.Type = T.self) -> Observable { - return value(of: identifier).filter { $0 != nil }.map { $0! } + value(of: identifier).filter { $0 != nil }.map { $0! } } } diff --git a/RxController/Classes/RxFlow+Extension.swift b/RxController/Classes/RxFlow+Extension.swift index a04016c..9098ef9 100644 --- a/RxController/Classes/RxFlow+Extension.swift +++ b/RxController/Classes/RxFlow+Extension.swift @@ -29,15 +29,15 @@ import UIKit extension FlowContributors { public static func viewController(_ viewController: RxViewController) -> FlowContributors { - return .one(flowContributor: .viewController(viewController)) + .one(flowContributor: .viewController(viewController)) } public static func viewController(_ viewController: UIViewController, with viewModel: Stepper) -> FlowContributors { - return .one(flowContributor: .viewController(viewController, with: viewModel)) + .one(flowContributor: .viewController(viewController, with: viewModel)) } public static func flow(_ flow: Flow, with step: Step) -> FlowContributors { - return .one(flowContributor: .flow(flow, with: step)) + .one(flowContributor: .flow(flow, with: step)) } } @@ -45,15 +45,15 @@ extension FlowContributors { extension FlowContributor { public static func viewController(_ viewController: RxViewController) -> FlowContributor { - return .contribute(withNextPresentable: viewController, withNextStepper: viewController.viewModel) + .contribute(withNextPresentable: viewController, withNextStepper: viewController.viewModel) } public static func viewController(_ viewController: UIViewController, with viewModel: Stepper) -> FlowContributor { - return .contribute(withNextPresentable: viewController, withNextStepper: viewModel) + .contribute(withNextPresentable: viewController, withNextStepper: viewModel) } public static func flow(_ flow: Flow, with step: Step) -> FlowContributor { - return .contribute(withNextPresentable: flow, withNextStepper: OneStepper(withSingleStep: step)) + .contribute(withNextPresentable: flow, withNextStepper: OneStepper(withSingleStep: step)) } }