Skip to content

Commit ede578e

Browse files
committed
Migrate to Swift 4.1 / XCode 9.3
1 parent 6760b8e commit ede578e

File tree

7 files changed

+24
-10
lines changed

7 files changed

+24
-10
lines changed

Cartfile.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "4.1.0"
1+
github "ReactiveX/RxSwift" "4.1.2"

RxFlow.xcodeproj/project.pbxproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
isa = PBXProject;
212212
attributes = {
213213
LastSwiftUpdateCheck = 0920;
214-
LastUpgradeCheck = 0920;
214+
LastUpgradeCheck = 0930;
215215
ORGANIZATIONNAME = RxSwiftCommunity;
216216
TargetAttributes = {
217217
1A8FBE741FF9783100389464 = {
@@ -359,13 +359,15 @@
359359
CLANG_WARN_BOOL_CONVERSION = YES;
360360
CLANG_WARN_COMMA = YES;
361361
CLANG_WARN_CONSTANT_CONVERSION = YES;
362+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
362363
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
363364
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
364365
CLANG_WARN_EMPTY_BODY = YES;
365366
CLANG_WARN_ENUM_CONVERSION = YES;
366367
CLANG_WARN_INFINITE_RECURSION = YES;
367368
CLANG_WARN_INT_CONVERSION = YES;
368369
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
370+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
369371
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
370372
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
371373
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -419,13 +421,15 @@
419421
CLANG_WARN_BOOL_CONVERSION = YES;
420422
CLANG_WARN_COMMA = YES;
421423
CLANG_WARN_CONSTANT_CONVERSION = YES;
424+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
422425
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
423426
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
424427
CLANG_WARN_EMPTY_BODY = YES;
425428
CLANG_WARN_ENUM_CONVERSION = YES;
426429
CLANG_WARN_INFINITE_RECURSION = YES;
427430
CLANG_WARN_INT_CONVERSION = YES;
428431
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
432+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
429433
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
430434
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
431435
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

RxFlow.xcodeproj/xcshareddata/xcschemes/RxFlow.xcscheme

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0920"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,14 +26,13 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
3332
skipped = "NO">
3433
<BuildableReference
3534
BuildableIdentifier = "primary"
36-
BlueprintIdentifier = "1AF854941FF8328D00271B52"
35+
BlueprintIdentifier = "1A8FBE741FF9783100389464"
3736
BuildableName = "RxFlowTests.xctest"
3837
BlueprintName = "RxFlowTests"
3938
ReferencedContainer = "container:RxFlow.xcodeproj">
@@ -56,7 +55,6 @@
5655
buildConfiguration = "Debug"
5756
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5857
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6058
launchStyle = "0"
6159
useCustomWorkingDirectory = "NO"
6260
ignoresPersistentStateOnLaunch = "NO"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

RxFlow/Flow.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class Flows {
5959
public static func whenReady<RootType: UIViewController>(flows: [Flow],
6060
block: @escaping ([RootType]) -> Void) {
6161
let flowObservables = flows.map { $0.rxFlowReady.asObservable() }
62-
let roots = flows.flatMap { $0.root as? RootType }
62+
let roots = flows.compactMap { $0.root as? RootType }
6363
guard roots.count == flows.count else {
6464
fatalError ("Type mismatch, Flows roots types do not match the types awaited in the block")
6565
}

RxFlowDemo/Cartfile.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "AliSoftware/Reusable" "4.0.1"
2-
github "ReactiveX/RxSwift" "4.1.0"
1+
github "AliSoftware/Reusable" "4.0.2"
2+
github "ReactiveX/RxSwift" "4.1.2"

RxFlowDemo/RxFlowDemo.xcodeproj/project.pbxproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@
338338
isa = PBXProject;
339339
attributes = {
340340
LastSwiftUpdateCheck = 0920;
341-
LastUpgradeCheck = 0920;
341+
LastUpgradeCheck = 0930;
342342
ORGANIZATIONNAME = RxSwiftCommunity;
343343
TargetAttributes = {
344344
1AF854AE1FF832AE00271B52 = {
@@ -492,13 +492,15 @@
492492
CLANG_WARN_BOOL_CONVERSION = YES;
493493
CLANG_WARN_COMMA = YES;
494494
CLANG_WARN_CONSTANT_CONVERSION = YES;
495+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
495496
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
496497
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
497498
CLANG_WARN_EMPTY_BODY = YES;
498499
CLANG_WARN_ENUM_CONVERSION = YES;
499500
CLANG_WARN_INFINITE_RECURSION = YES;
500501
CLANG_WARN_INT_CONVERSION = YES;
501502
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
503+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
502504
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
503505
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
504506
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -549,13 +551,15 @@
549551
CLANG_WARN_BOOL_CONVERSION = YES;
550552
CLANG_WARN_COMMA = YES;
551553
CLANG_WARN_CONSTANT_CONVERSION = YES;
554+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
552555
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
553556
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
554557
CLANG_WARN_EMPTY_BODY = YES;
555558
CLANG_WARN_ENUM_CONVERSION = YES;
556559
CLANG_WARN_INFINITE_RECURSION = YES;
557560
CLANG_WARN_INT_CONVERSION = YES;
558561
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
562+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
559563
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
560564
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
561565
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

0 commit comments

Comments
 (0)