From 6c24d164123b74e8d623ad68869467b0a5c6b4e6 Mon Sep 17 00:00:00 2001 From: Thibault Wittemberg Date: Thu, 17 Sep 2020 16:56:51 -0400 Subject: [PATCH 1/3] project: remove Reusable as a dep --- RxFlowTests/FlowCoordinatorTests.swift | 8 ++++---- RxFlowTests/TestData/TestUIViewController.swift | 3 +-- RxFlowTests/UIViewController+PresentableTests.swift | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/RxFlowTests/FlowCoordinatorTests.swift b/RxFlowTests/FlowCoordinatorTests.swift index 0937d3a..07e54b0 100644 --- a/RxFlowTests/FlowCoordinatorTests.swift +++ b/RxFlowTests/FlowCoordinatorTests.swift @@ -29,7 +29,7 @@ final class TestOneAndMultipleFlowCoordinatorFlow: Flow { let rxDismissed = Single.never() } - private let rootViewController = TestUIViewController.instantiate() + private let rootViewController = TestUIViewController() let recordedSteps = ReplaySubject.create(bufferSize: 10) var stepOneCalled = false @@ -68,7 +68,7 @@ final class TestAllowStepWhenPresentableNotPresentedFlow: Flow { let rxDismissed = Single.never() } - private let rootViewController = TestUIViewController.instantiate() + private let rootViewController = TestUIViewController() let recordedSteps = ReplaySubject.create(bufferSize: 10) var root: Presentable { @@ -99,7 +99,7 @@ final class TestFilterStepFlow: Flow { let rxDismissed = Single.never() } - private let rootViewController = TestUIViewController.instantiate() + private let rootViewController = TestUIViewController() private let replacementStepInFilter: TestSteps let recordedSteps = ReplaySubject.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 index 5dc7402..ca99021 100644 --- 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 index e7ba34d..e858ab4 100644 --- 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() From 5f5b2bd6093f0817ac9dbf1269a342f0b58bba36 Mon Sep 17 00:00:00 2001 From: Thibault Wittemberg Date: Sun, 27 Sep 2020 15:16:47 -0400 Subject: [PATCH 2/3] project: remove Reusable + bump Swift 5.3 --- Cartfile.private | 1 - Cartfile.resolved | 1 - RxFlow.xcodeproj/project.pbxproj | 6 ++---- xcarthage.sh | 19 +++++++++++++++++++ 4 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 Cartfile.private create mode 100755 xcarthage.sh diff --git a/Cartfile.private b/Cartfile.private deleted file mode 100644 index e2f161d..0000000 --- a/Cartfile.private +++ /dev/null @@ -1 +0,0 @@ -github "AliSoftware/Reusable" ~> 4.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 97f300a..ec14f25 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1 @@ -github "AliSoftware/Reusable" "4.1.1" github "ReactiveX/RxSwift" "5.1.1" diff --git a/RxFlow.xcodeproj/project.pbxproj b/RxFlow.xcodeproj/project.pbxproj index 62e45e2..30c85c4 100644 --- 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; 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; PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlow; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/xcarthage.sh b/xcarthage.sh new file mode 100755 index 0000000..f3bc14e --- /dev/null +++ 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 "$@" From 8f37fcb603a75a8e93372713320bf349b81578cf Mon Sep 17 00:00:00 2001 From: Thibault Wittemberg Date: Sun, 27 Sep 2020 15:18:31 -0400 Subject: [PATCH 3/3] project: add CHANGELOG.md --- CHANGELOG.md | 4 ++++ Package.swift | 2 +- README.md | 2 +- RxFlow.podspec | 4 ++-- RxFlow.xcodeproj/project.pbxproj | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..b738623 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,4 @@ +** Version 2.10 **: + +- remove Reusable as a private dependency +- update to Swift 5.3 diff --git a/Package.swift b/Package.swift index 6e6e21f..52e1184 100644 --- 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 index 28906cb..6981f23 100644 --- 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 index 7210215..bcb2fdd 100644 --- 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 index 30c85c4..81bcf65 100644 --- a/RxFlow.xcodeproj/project.pbxproj +++ b/RxFlow.xcodeproj/project.pbxproj @@ -585,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.10; + MARKETING_VERSION = 2.10.0; PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlow; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -616,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.10; + MARKETING_VERSION = 2.10.0; PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlow; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = "";