Merge pull request #177 from RxSwiftCommunity/release/2-12-3

project: release 2.12.3

CHANGELOG.md

@@ -1,3 +1,9 @@
+** Version 2.12.3 **:
+
+- fix "Unhandled files" warnings in the Package.swift file
+- fix re-entrancy issue in the FlowCoordinator file
+- revert to a strong retain policy in the Reactive+UIViewController file (see version 2.12.0)
+
 ** Version 2.12.2 **:
 
 - ensure the navigate function is called on the main thread (regression introduced in 2.12.1)

Cartfile.resolved

@@ -1 +1 @@
-github "ReactiveX/RxSwift" "6.0.0"
+github "ReactiveX/RxSwift" "6.2.0"

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.4
 
 import PackageDescription
 
@@ -18,7 +18,8 @@ let package = Package(
                 "RxSwift",
                 .product(name: "RxCocoa", package: "RxSwift")
             ],
-            path: "RxFlow"
+            path: "RxFlow",
+            exclude: ["Info.plist"]
         ),
         .testTarget(
             name: "RxFlowTests",
@@ -27,7 +28,8 @@ let package = Package(
                 .product(name: "RxBlocking", package: "RxSwift"),
                 .product(name: "RxTest", package: "RxSwift")
             ],
-            path: "RxFlowTests"
+            path: "RxFlowTests",
+            exclude: ["Info.plist"]
         ),
     ],
     swiftLanguageVersions: [.v5]

RxFlow.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name = "RxFlow"
-  s.version = "2.12.2"
-  s.swift_version = '5.3'
+  s.version = "2.12.3"
+  s.swift_version = '5.4'
   s.summary = "RxFlow is a navigation framework for iOS applications, based on a Reactive Coordinator pattern."
 
   s.description = <<-DESC

RxFlow.xcodeproj/project.pbxproj

@@ -288,7 +288,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = RxSwiftCommunity;
 				TargetAttributes = {
 					1A8FBE741FF9783100389464 = {
@@ -604,7 +604,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.12.2;
+				MARKETING_VERSION = 2.12.3;
 				PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlow;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -639,7 +639,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.12.2;
+				MARKETING_VERSION = 2.12.3;
 				PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlow;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

RxFlow.xcodeproj/xcshareddata/xcschemes/RxFlow.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

RxFlow/Extensions/Reactive+UIViewController.swift

@@ -17,7 +17,7 @@ public extension Reactive where Base: UIViewController {
     /// Rx observable, triggered when the view is being dismissed
     var dismissed: ControlEvent<Bool> {
         let dismissedSource = self.sentMessage(#selector(Base.viewDidDisappear))
-            .filter { [weak base] _ in base?.isBeingDismissed ?? true }
+            .filter { [base] _ in base.isBeingDismissed }
             .map { _ in false }
 
         let movedToParentSource = self.sentMessage(#selector(Base.didMove))

RxFlow/FlowCoordinator.swift

@@ -46,6 +46,7 @@ public final class FlowCoordinator: NSObject {
         // listen for the internal steps relay that aggregates the flow's Stepper's steps and
         // the FlowContributors's Stepper's steps
         self.stepsRelay
+            .observe(on: CurrentThreadScheduler.instance)
             .do(onDispose: { [weak self] in
                 self?.childFlowCoordinators.removeAll()
                 self?.parentFlowCoordinator?.childFlowCoordinators.removeValue(forKey: self?.identifier ?? "")
@@ -127,7 +128,7 @@ public final class FlowCoordinator: NSObject {
     private func performSideEffects(with flowContributor: FlowContributor) {
         switch flowContributor {
         case let .forwardToCurrentFlow(step):
-            stepsRelay.accept(step)
+            self.stepsRelay.accept(step)
         case let .forwardToParentFlow(step):
             parentFlowCoordinator?.stepsRelay.accept(step)
         case .contribute:

RxFlowDemo/Cartfile

@@ -1,2 +1,2 @@
 github "ReactiveX/RxSwift" ~> 6.0.0
-github "AliSoftware/Reusable" ~> 4.0.5
+github "AliSoftware/Reusable" ~> 4.1.1

RxFlowDemo/Cartfile.resolved

@@ -1,2 +1,2 @@
 github "AliSoftware/Reusable" "4.1.1"
-github "ReactiveX/RxSwift" "6.0.0"
+github "ReactiveX/RxSwift" "6.2.0"

RxFlowDemo/RxFlowDemo.xcodeproj/project.pbxproj

@@ -391,7 +391,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = RxSwiftCommunity;
 				TargetAttributes = {
 					1AF854AE1FF832AE00271B52 = {
@@ -596,7 +596,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -651,7 +651,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -673,7 +673,7 @@
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = RxFlowDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlowDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -696,7 +696,7 @@
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = RxFlowDemo/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlowDemo;
 				PRODUCT_NAME = "$(TARGET_NAME)";

RxFlowDemo/RxFlowDemo.xcodeproj/xcshareddata/xcschemes/RxFlowDemo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

RxFlowDemo/RxFlowDemo/Protocols/ViewModelBased.swift

@@ -17,7 +17,7 @@ protocol ServicesViewModel: ViewModel {
     var services: Services! { get set }
 }
 
-protocol ViewModelBased: class {
+protocol ViewModelBased: AnyObject {
     associatedtype ViewModelType: ViewModel
     var viewModel: ViewModelType! { get set }
 }

RxFlowDemo/xcarthage-update.sh

@@ -0,0 +1,19 @@
+# carthage-update.sh
+# Usage example: ./carthage-update.sh --platform iOS
+
+set -euo pipefail
+
+xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
+trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
+
+# For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise
+# the build will fail on lipo due to duplicate architectures.
+
+CURRENT_XCODE_VERSION=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3)
+echo "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$CURRENT_XCODE_VERSION = arm64 arm64e armv7 armv7s armv6 armv8" >> $xcconfig
+
+echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200__BUILD_$(XCODE_PRODUCT_BUILD_VERSION))' >> $xcconfig
+echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig
+
+export XCODE_XCCONFIG_FILE="$xcconfig"
+carthage update "$@"