Merge branch 'develop'

Thibault Wittemberg · Thibault Wittemberg · commit ae563b47e597 · 2020-09-27T16:31:57.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,4 @@
+** Version 2.10 **:
+
+- remove Reusable as a private dependency
+- update to Swift 5.3
diff --git a/Cartfile.private b/Cartfile.private
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1 @@
-github "AliSoftware/Reusable" "4.1.1"
 github "ReactiveX/RxSwift" "5.1.1"
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.3
 
 import PackageDescription
 
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ In your Package.swift:
 let package = Package(
   name: "Example",
   dependencies: [
-    .package(url: "https://github.com/RxSwiftCommunity/RxFlow.git", from: "2.5.0")
+    .package(url: "https://github.com/RxSwiftCommunity/RxFlow.git", from: "2.10.0")
   ],
   targets: [
     .target(name: "Example", dependencies: ["RxFlow"])
diff --git a/RxFlow.podspec b/RxFlow.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name = "RxFlow"
-  s.version = "2.9.1"
-  s.swift_version = '5.2.2'
+  s.version = "2.10.0"
+  s.swift_version = '5.3'
   s.summary = "RxFlow is a navigation framework for iOS applications, based on a Reactive Coordinator pattern."
 
   s.description = <<-DESC
diff --git a/RxFlow.xcodeproj/project.pbxproj b/RxFlow.xcodeproj/project.pbxproj
@@ -31,7 +31,6 @@
 		74855A472470544500334B8F /* DeprecatedFlows.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74855A462470544500334B8F /* DeprecatedFlows.swift */; };
 		74855A492470552B00334B8F /* DeprecatedFlowCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74855A482470552B00334B8F /* DeprecatedFlowCoordinator.swift */; };
 		749B02E822066518001BEBBB /* RxBlocking.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 749B02E722066518001BEBBB /* RxBlocking.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		749B02EB22066538001BEBBB /* Reusable.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 749B02E922066537001BEBBB /* Reusable.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		749B02EC22066538001BEBBB /* RxTest.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 749B02EA22066538001BEBBB /* RxTest.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		749B02EF22066618001BEBBB /* RxCocoa.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 749B02ED22066618001BEBBB /* RxCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		749B02F022066618001BEBBB /* RxSwift.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 749B02EE22066618001BEBBB /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -65,7 +64,6 @@
 				74C6AD33227BAE7800B16A95 /* RxRelay.framework in CopyFiles */,
 				749B02EF22066618001BEBBB /* RxCocoa.framework in CopyFiles */,
 				749B02F022066618001BEBBB /* RxSwift.framework in CopyFiles */,
-				749B02EB22066538001BEBBB /* Reusable.framework in CopyFiles */,
 				749B02EC22066538001BEBBB /* RxTest.framework in CopyFiles */,
 				749B02E822066518001BEBBB /* RxBlocking.framework in CopyFiles */,
 			);
@@ -587,7 +585,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 2.9.1;
+				MARKETING_VERSION = 2.10.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlow;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -618,7 +616,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 2.9.1;
+				MARKETING_VERSION = 2.10.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlow;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/RxFlowTests/FlowCoordinatorTests.swift b/RxFlowTests/FlowCoordinatorTests.swift
@@ -29,7 +29,7 @@ final class TestOneAndMultipleFlowCoordinatorFlow: Flow {
         let rxDismissed = Single<Void>.never()
     }
 
-    private let rootViewController = TestUIViewController.instantiate()
+    private let rootViewController = TestUIViewController()
     let recordedSteps = ReplaySubject<TestSteps>.create(bufferSize: 10)
     var stepOneCalled = false
 
@@ -68,7 +68,7 @@ final class TestAllowStepWhenPresentableNotPresentedFlow: Flow {
         let rxDismissed = Single<Void>.never()
     }
 
-    private let rootViewController = TestUIViewController.instantiate()
+    private let rootViewController = TestUIViewController()
     let recordedSteps = ReplaySubject<TestSteps>.create(bufferSize: 10)
 
     var root: Presentable {
@@ -99,7 +99,7 @@ final class TestFilterStepFlow: Flow {
         let rxDismissed = Single<Void>.never()
     }
 
-    private let rootViewController = TestUIViewController.instantiate()
+    private let rootViewController = TestUIViewController()
     private let replacementStepInFilter: TestSteps
     let recordedSteps = ReplaySubject<TestSteps>.create(bufferSize: 10)
 
@@ -136,7 +136,7 @@ final class TestFilterStepFlow: Flow {
 }
 
 final class TestDeepLinkFlow: Flow {
-    private let rootViewController = TestUIViewController.instantiate()
+    private let rootViewController = TestUIViewController()
 
     var root: Presentable {
         return self.rootViewController
diff --git a/RxFlowTests/TestData/TestUIViewController.swift b/RxFlowTests/TestData/TestUIViewController.swift
@@ -9,9 +9,8 @@
 #if canImport(UIKit)
 
 import UIKit
-import Reusable
 
-final class TestUIViewController: UIViewController, StoryboardBased {
+final class TestUIViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
     }
diff --git a/RxFlowTests/UIViewController+PresentableTests.swift b/RxFlowTests/UIViewController+PresentableTests.swift
@@ -18,7 +18,7 @@ final class UIViewController_PresentableTests: XCTestCase {
 
     func testUIViewControllerVisible() {
         // Given: a UIViewController
-        let viewController = TestUIViewController.instantiate()
+        let viewController = TestUIViewController()
         let testScheduler = TestScheduler(initialClock: 0)
         let observer = testScheduler.createObserver(Bool.self)
         testScheduler.start()
@@ -44,7 +44,7 @@ final class UIViewController_PresentableTests: XCTestCase {
 
     func testUIViewControllerDismissed() {
         // Given: a UIViewController
-        let viewController = TestUIViewController.instantiate()
+        let viewController = TestUIViewController()
         let testScheduler = TestScheduler(initialClock: 0)
         let observer = testScheduler.createObserver(Void.self)
         testScheduler.start()
diff --git a/xcarthage.sh b/xcarthage.sh
@@ -0,0 +1,19 @@
+# carthage-build.sh
+# Usage example: ./carthage-build.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 build "$@"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-github "AliSoftware/Reusable" "4.1.1"`
`2`	`1`	`github "ReactiveX/RxSwift" "5.1.1"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version:5.0`
	`1`	`+// swift-tools-version:5.3`
`2`	`2`
`3`	`3`	`import PackageDescription`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,8 @@`
`9`	`9`	`#if canImport(UIKit)`
`10`	`10`
`11`	`11`	`import UIKit`
`12`		`-import Reusable`
`13`	`12`
`14`		`-final class TestUIViewController: UIViewController, StoryboardBased {`
	`13`	`+final class TestUIViewController: UIViewController {`
`15`	`14`	`override func viewDidLoad() {`
`16`	`15`	`super.viewDidLoad()`
`17`	`16`	`}`