Merge pull request #23 from xflagstudio/feature/bump_to_1.0.0

Bump to ver 1.0.0 (RxSwift 6 対応)

Example/Podfile.lock

@@ -1,36 +1,36 @@
 PODS:
- - Differentiator (4.0.1)
- - Fakery (4.1.1)
+ - Differentiator (5.0.0)
+ - Fakery (5.0.0)
  - 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.11.1):
- - RxCocoa (~> 5)
- - RxFlow (~> 2.9)
- - RxSwift (~> 5)
- - RxDataSources (4.0.1):
- - Differentiator (~> 4.0)
- - RxCocoa (~> 5.0)
- - RxSwift (~> 5.0)
- - RxDataSourcesSingleSection (0.2.1):
+ - RxBinding (0.5):
+ - RxCocoa (~> 6)
+ - RxSwift (~> 6)
+ - RxCocoa (6.0.0):
+ - RxRelay (= 6.0.0)
+ - RxSwift (= 6.0.0)
+ - RxController (1.0.0):
+ - RxCocoa (~> 6)
+ - RxFlow (~> 2.12.0)
+ - RxSwift (~> 6)
+ - RxDataSources (5.0.0):
+ - Differentiator (~> 5.0)
+ - RxCocoa (~> 6.0)
+ - RxSwift (~> 6.0)
+ - RxDataSourcesSingleSection (0.3):
  - Reusable (~> 4)
- - RxCocoa (~> 5)
- - RxDataSources (~> 4)
- - RxSwift (~> 5)
- - RxFlow (2.9.1):
- - RxCocoa (>= 5.1.1)
- - RxSwift (>= 5.1.1)
- - RxRelay (5.1.1):
- - RxSwift (~> 5)
- - RxSwift (5.1.1)
+ - RxCocoa (~> 6)
+ - RxDataSources (~> 5)
+ - RxSwift (~> 6)
+ - RxFlow (2.12.0):
+ - RxCocoa (>= 6.0.0)
+ - RxSwift (>= 6.0.0)
+ - RxRelay (6.0.0):
+ - RxSwift (= 6.0.0)
+ - RxSwift (6.0.0)
  - SnapKit (5.0.1)
 
 DEPENDENCIES:
@@ -59,17 +59,17 @@ EXTERNAL SOURCES:
  :path: "../"
 
 SPEC CHECKSUMS:
- Differentiator: 886080237d9f87f322641dedbc5be257061b0602
- Fakery: d3380c4aa1efe7631c0831d7e26aa9db4491f014
+ Differentiator: e8497ceab83c1b10ca233716d547b9af21b9344d
+ Fakery: 8146918b8dd6df98564dca10cbe8bd05354b8cc4
  Reusable: 53a9acf5c536f229b31b5865782414b508252ddb
- RxBinding: da433c012633802a72c2a5bec8775b86f4cddeb8
- RxCocoa: 32065309a38d29b5b0db858819b5bf9ef038b601
- RxController: 720eb1f44a69aa00e70c3fff2767665ffdabd41d
- RxDataSources: efee07fa4de48477eca0a4611e6d11e2da9c1114
- RxDataSourcesSingleSection: 4394e57ae097f33e3845cf3a57bdf7826eca2d38
- RxFlow: 029e260333ef843b349ba9cb9265929941830aee
- RxRelay: d77f7d771495f43c556cbc43eebd1bb54d01e8e9
- RxSwift: 81470a2074fa8780320ea5fe4102807cb7118178
+ RxBinding: e3c76d02d0ee3f1a306a0fb8e8ef6f2eda65a375
+ RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
+ RxController: 2590220770cc46f7918a399b46468fd06574c06c
+ RxDataSources: aa47cc1ed6c500fa0dfecac5c979b723542d79cf
+ RxDataSourcesSingleSection: e646e523ad92109293b22e745b55dcb38bea7a58
+ RxFlow: b407eb6b5d956041a9e0930469346e104911a470
+ RxRelay: 8d593be109c06ea850df027351beba614b012ffb
+ RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
  SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
 
 PODFILE CHECKSUM: ba6283578e076eb1e1d926dfc1c2610458f4d335

Example/RxController.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
  objects = {
 
 /* Begin PBXBuildFile section */
- 331551C1D0089C012D69FDF8 /* README.md in Sources */ = {isa = PBXBuildFile; fileRef = 33155353CE40FBB35400AA25 /* README.md */; };
+ 06F8283425B95C49001597ED /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 33155353CE40FBB35400AA25 /* README.md */; };
  51250CABAD21E9150BC9E5E5 /* Pods_RxController_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E9B7364AF4E4CEC90176D8BC /* Pods_RxController_Example.framework */; };
  607FACD61AFB9204008FA782 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD51AFB9204008FA782 /* AppDelegate.swift */; };
  607FACD81AFB9204008FA782 /* InfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* InfoViewController.swift */; };
@@ -317,7 +317,7 @@
  isa = PBXProject;
  attributes = {
  LastSwiftUpdateCheck = 0830;
- LastUpgradeCheck = 1020;
+ LastUpgradeCheck = 1220;
  ORGANIZATIONNAME = CocoaPods;
  TargetAttributes = {
  607FACCF1AFB9204008FA782 = {
@@ -355,6 +355,7 @@
  isa = PBXResourcesBuildPhase;
  buildActionMask = 2147483647;
  files = (
+ 06F8283425B95C49001597ED /* README.md in Resources */,
  607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */,
  607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */,
  );
@@ -504,7 +505,6 @@
  77EE851D22656EC400F06394 /* NameViewModel.swift in Sources */,
  77EE851F22656EEB00F06394 /* NumberViewController.swift in Sources */,
  771FB71F22A4C48600E4F6B6 /* LastNameViewModel.swift in Sources */,
- 331551C1D0089C012D69FDF8 /* README.md in Sources */,
  );
  runOnlyForDeploymentPostprocessing = 0;
  };
@@ -561,6 +561,7 @@
  CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
  CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
  CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
  CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
  CLANG_WARN_STRICT_PROTOTYPES = YES;
  CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -586,7 +587,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
  MTL_ENABLE_DEBUG_INFO = YES;
  ONLY_ACTIVE_ARCH = YES;
  SDKROOT = iphoneos;
@@ -617,6 +618,7 @@
  CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
  CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
  CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
  CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
  CLANG_WARN_STRICT_PROTOTYPES = YES;
  CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -635,7 +637,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
  MTL_ENABLE_DEBUG_INFO = NO;
  SDKROOT = iphoneos;
  SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -649,7 +651,7 @@
  buildSettings = {
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  INFOPLIST_FILE = RxController/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  MODULE_NAME = ExampleApp;
  PRODUCT_BUNDLE_IDENTIFIER = "com.xflag.RxController-Example";
@@ -664,7 +666,7 @@
  buildSettings = {
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  INFOPLIST_FILE = RxController/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  MODULE_NAME = ExampleApp;
  PRODUCT_BUNDLE_IDENTIFIER = "com.xflag.RxController-Example";

Example/RxController.xcodeproj/xcshareddata/xcschemes/RxController-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1020"
+ LastUpgradeVersion = "1220"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
  shouldUseLaunchSchemeArgsEnv = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "607FACCF1AFB9204008FA782"
+ BuildableName = "RxController_Example.app"
+ BlueprintName = "RxController_Example"
+ ReferencedContainer = "container:RxController.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
  <Testables>
  <TestableReference
  skipped = "NO">
@@ -53,17 +62,6 @@
  </BuildableReference>
  </TestableReference>
  </Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "607FACCF1AFB9204008FA782"
- BuildableName = "RxController_Example.app"
- BlueprintName = "RxController_Example"
- ReferencedContainer = "container:RxController.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
  </TestAction>
  <LaunchAction
  buildConfiguration = "Debug"
@@ -85,8 +83,6 @@
  ReferencedContainer = "container:RxController.xcodeproj">
  </BuildableReference>
  </BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
  </LaunchAction>
  <ProfileAction
  buildConfiguration = "Release"

Example/RxController/Flow/AppFlow.swift

@@ -35,7 +35,7 @@ class AppFlow: Flow {
  switch appStep {
  case .main:
  let mainFlow = MainFlow()
- Flows.whenReady(flow1: mainFlow) { [unowned self] in
+ Flows.use(mainFlow, when: .ready) { [unowned self] in
  self.navigationController.viewControllers = [$0]
  }
  return .flow(mainFlow, with: MainStep.start)

Example/RxController/Flow/FriendsFlow.swift

@@ -38,7 +38,7 @@ class FriendsFlow: Flow {
  return .viewController(friendsViewController)
  case .profile(let name):
  let profileFlow = ProfileFlow(name: name)
- Flows.whenReady(flow1: profileFlow) {
+ Flows.use(profileFlow, when: .ready) {
  self.navigationController?.pushViewController($0, animated: true)
  }
  return .flow(profileFlow, with: ProfileStep.start)

Example/RxController/Flow/MainFlow.swift

@@ -33,7 +33,7 @@ class MainFlow: Flow {
  case .start:
  let childFlow = ChildFlow()
  let profileFlow = ProfileFlow()
- Flows.whenReady(flow1: childFlow, flow2: profileFlow) {
+ Flows.use(childFlow, profileFlow, when: .ready) {
  self.mainViewController.viewControllers = [$0, $1]
  }
  return .multiple(flowContributors: [

Example/RxController/Flow/ProfileFlow.swift

@@ -38,7 +38,7 @@ class ProfileFlow: Flow {
  return .viewController(profileViewController)
  case .friends(let name):
  let friendsFlow = FriendsFlow(name: name)
- Flows.whenReady(flow1: friendsFlow) {
+ Flows.use(friendsFlow, when: .ready) {
  self.navigationController?.pushViewController($0, animated: true)
  }
  return .flow(friendsFlow, with: FriendsStep.start)

RxController.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
  s.name = 'RxController'
- s.version = '0.11.1'
+ s.version = '1.0.0'
  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.
@@ -33,8 +33,8 @@ These classes make it easy to transfer data among the flows, the parent view mod
  s.source_files = 'RxController/Classes/**/*'
  s.preserve_paths = 'rxtree/**/*'
 
- s.dependency 'RxSwift', '~> 5'
- s.dependency 'RxCocoa', '~> 5'
- s.dependency 'RxFlow', '~> 2.9'
+ s.dependency 'RxSwift', '~> 6'
+ s.dependency 'RxCocoa', '~> 6'
+ s.dependency 'RxFlow', '~> 2.12.0'
 
 end

RxController/Classes/RxControllerEvent.swift

@@ -62,7 +62,7 @@ public struct RxControllerEvent {
 extension ObservableType where Element == RxControllerEvent {
 
  public func value<T>(of identifier: RxControllerEvent.Identifier, type: T.Type = T.self) -> Observable<T?> {
- observeOn(MainScheduler.asyncInstance).filter {
+ observe(on: MainScheduler.asyncInstance).filter {
  $0.identifier.id == identifier.id
  }.map {
  $0.value as? T