Skip to content

Commit ae8275d

Browse files
committed
project: release 2.12.3
1 parent e85a544 commit ae8275d

File tree

14 files changed

+49
-21
lines changed

14 files changed

+49
-21
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
** Version 2.12.3 **:
2+
3+
- fix "Unhandled files" warnings in the Package.swift file
4+
- fix re-entrancy issue in the FlowCoordinator file
5+
- revert to a strong retain policy in the Reactive+UIViewController file (see version 2.12.0)
6+
17
** Version 2.12.2 **:
28

39
- ensure the navigate function is called on the main thread (regression introduced in 2.12.1)

Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "6.0.0"
1+
github "ReactiveX/RxSwift" "6.2.0"

Package.swift

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.3
1+
// swift-tools-version:5.4
22

33
import PackageDescription
44

@@ -18,7 +18,8 @@ let package = Package(
1818
"RxSwift",
1919
.product(name: "RxCocoa", package: "RxSwift")
2020
],
21-
path: "RxFlow"
21+
path: "RxFlow",
22+
exclude: ["Info.plist"]
2223
),
2324
.testTarget(
2425
name: "RxFlowTests",
@@ -27,7 +28,8 @@ let package = Package(
2728
.product(name: "RxBlocking", package: "RxSwift"),
2829
.product(name: "RxTest", package: "RxSwift")
2930
],
30-
path: "RxFlowTests"
31+
path: "RxFlowTests",
32+
exclude: ["Info.plist"]
3133
),
3234
],
3335
swiftLanguageVersions: [.v5]

RxFlow.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "RxFlow"
3-
s.version = "2.12.2"
4-
s.swift_version = '5.3'
3+
s.version = "2.12.3"
4+
s.swift_version = '5.4'
55
s.summary = "RxFlow is a navigation framework for iOS applications, based on a Reactive Coordinator pattern."
66

77
s.description = <<-DESC

RxFlow.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
isa = PBXProject;
289289
attributes = {
290290
LastSwiftUpdateCheck = 0920;
291-
LastUpgradeCheck = 1200;
291+
LastUpgradeCheck = 1250;
292292
ORGANIZATIONNAME = RxSwiftCommunity;
293293
TargetAttributes = {
294294
1A8FBE741FF9783100389464 = {
@@ -604,7 +604,7 @@
604604
"@executable_path/Frameworks",
605605
"@loader_path/Frameworks",
606606
);
607-
MARKETING_VERSION = 2.12.2;
607+
MARKETING_VERSION = 2.12.3;
608608
PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlow;
609609
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
610610
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -639,7 +639,7 @@
639639
"@executable_path/Frameworks",
640640
"@loader_path/Frameworks",
641641
);
642-
MARKETING_VERSION = 2.12.2;
642+
MARKETING_VERSION = 2.12.3;
643643
PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlow;
644644
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
645645
PROVISIONING_PROFILE_SPECIFIER = "";

RxFlow.xcodeproj/xcshareddata/xcschemes/RxFlow.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1200"
3+
LastUpgradeVersion = "1250"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

RxFlow/Extensions/Reactive+UIViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public extension Reactive where Base: UIViewController {
1717
/// Rx observable, triggered when the view is being dismissed
1818
var dismissed: ControlEvent<Bool> {
1919
let dismissedSource = self.sentMessage(#selector(Base.viewDidDisappear))
20-
.filter { [weak base] _ in base?.isBeingDismissed ?? true }
20+
.filter { [base] _ in base.isBeingDismissed }
2121
.map { _ in false }
2222

2323
let movedToParentSource = self.sentMessage(#selector(Base.didMove))

RxFlow/FlowCoordinator.swift

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public final class FlowCoordinator: NSObject {
4646
// listen for the internal steps relay that aggregates the flow's Stepper's steps and
4747
// the FlowContributors's Stepper's steps
4848
self.stepsRelay
49+
.observe(on: CurrentThreadScheduler.instance)
4950
.do(onDispose: { [weak self] in
5051
self?.childFlowCoordinators.removeAll()
5152
self?.parentFlowCoordinator?.childFlowCoordinators.removeValue(forKey: self?.identifier ?? "")
@@ -127,7 +128,7 @@ public final class FlowCoordinator: NSObject {
127128
private func performSideEffects(with flowContributor: FlowContributor) {
128129
switch flowContributor {
129130
case let .forwardToCurrentFlow(step):
130-
stepsRelay.accept(step)
131+
self.stepsRelay.accept(step)
131132
case let .forwardToParentFlow(step):
132133
parentFlowCoordinator?.stepsRelay.accept(step)
133134
case .contribute:

RxFlowDemo/Cartfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "ReactiveX/RxSwift" ~> 6.0.0
2-
github "AliSoftware/Reusable" ~> 4.0.5
2+
github "AliSoftware/Reusable" ~> 4.1.1

RxFlowDemo/Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "AliSoftware/Reusable" "4.1.1"
2-
github "ReactiveX/RxSwift" "6.0.0"
2+
github "ReactiveX/RxSwift" "6.2.0"

RxFlowDemo/RxFlowDemo.xcodeproj/project.pbxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@
391391
isa = PBXProject;
392392
attributes = {
393393
LastSwiftUpdateCheck = 0920;
394-
LastUpgradeCheck = 1200;
394+
LastUpgradeCheck = 1250;
395395
ORGANIZATIONNAME = RxSwiftCommunity;
396396
TargetAttributes = {
397397
1AF854AE1FF832AE00271B52 = {
@@ -596,7 +596,7 @@
596596
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
597597
GCC_WARN_UNUSED_FUNCTION = YES;
598598
GCC_WARN_UNUSED_VARIABLE = YES;
599-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
599+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
600600
MTL_ENABLE_DEBUG_INFO = YES;
601601
ONLY_ACTIVE_ARCH = YES;
602602
SDKROOT = iphoneos;
@@ -651,7 +651,7 @@
651651
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
652652
GCC_WARN_UNUSED_FUNCTION = YES;
653653
GCC_WARN_UNUSED_VARIABLE = YES;
654-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
654+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
655655
MTL_ENABLE_DEBUG_INFO = NO;
656656
SDKROOT = iphoneos;
657657
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -673,7 +673,7 @@
673673
"$(PROJECT_DIR)",
674674
);
675675
INFOPLIST_FILE = RxFlowDemo/Info.plist;
676-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
676+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
677677
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
678678
PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlowDemo;
679679
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -696,7 +696,7 @@
696696
"$(PROJECT_DIR)",
697697
);
698698
INFOPLIST_FILE = RxFlowDemo/Info.plist;
699-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
699+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
700700
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
701701
PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlowDemo;
702702
PRODUCT_NAME = "$(TARGET_NAME)";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1200"
3+
LastUpgradeVersion = "1250"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

RxFlowDemo/RxFlowDemo/Protocols/ViewModelBased.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ protocol ServicesViewModel: ViewModel {
1717
var services: Services! { get set }
1818
}
1919

20-
protocol ViewModelBased: class {
20+
protocol ViewModelBased: AnyObject {
2121
associatedtype ViewModelType: ViewModel
2222
var viewModel: ViewModelType! { get set }
2323
}

RxFlowDemo/xcarthage-update.sh

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# carthage-update.sh
2+
# Usage example: ./carthage-update.sh --platform iOS
3+
4+
set -euo pipefail
5+
6+
xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
7+
trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
8+
9+
# For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise
10+
# the build will fail on lipo due to duplicate architectures.
11+
12+
CURRENT_XCODE_VERSION=$(xcodebuild -version | grep "Build version" | cut -d' ' -f3)
13+
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
14+
15+
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
16+
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
17+
18+
export XCODE_XCCONFIG_FILE="$xcconfig"
19+
carthage update "$@"

0 commit comments

Comments
 (0)