Skip to content

Commit 258a098

Browse files
jasljasl
authored
Merge pull request #4 from jasl/swift4.2
Migration for swift 4.2
2 parents 60d241d + 025f8bc commit 258a098

File tree

18 files changed

+129
-102
lines changed

18 files changed

+129
-102
lines changed

‎.swiftlint.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ disabled_rules:
33
- file_length
44
- function_body_length
55
- type_body_length
6-
- valid_docs
76
excluded:
87
- Carthage
98
- Pods

‎Demo.playground/Contents.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ router.registerRoutingPattern(pattern1) { (url, parameters, context) in
3838
print(string)
3939
}
4040

41-
router.registerRoutingPattern(pattern2) { _ in
41+
router.registerRoutingPattern(pattern2) { _, _, _ in
4242
// Do something here, e.g: show a UI
4343
print("call new article")
4444
}

‎Demo.playground/playground.xcworkspace/contents.xcworkspacedata‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Demo.playground/playground.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
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>

‎RouterX.xcodeproj/project.pbxproj‎

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -378,16 +378,16 @@
378378
isa = PBXProject;
379379
attributes = {
380380
LastSwiftUpdateCheck = 0720;
381-
LastUpgradeCheck = 0830;
381+
LastUpgradeCheck = 1010;
382382
ORGANIZATIONNAME = jasl;
383383
TargetAttributes = {
384384
C47B8A491C7B4EE000C2C164 = {
385385
CreatedOnToolsVersion = 7.2.1;
386-
LastSwiftMigration = 0800;
386+
LastSwiftMigration = 1010;
387387
};
388388
C47B8A531C7B4EE100C2C164 = {
389389
CreatedOnToolsVersion = 7.2.1;
390-
LastSwiftMigration = 0800;
390+
LastSwiftMigration = 1010;
391391
};
392392
C47B8A8F1C7B550200C2C164 = {
393393
CreatedOnToolsVersion = 7.2.1;
@@ -588,14 +588,22 @@
588588
CLANG_CXX_LIBRARY = "libc++";
589589
CLANG_ENABLE_MODULES = YES;
590590
CLANG_ENABLE_OBJC_ARC = YES;
591+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
591592
CLANG_WARN_BOOL_CONVERSION = YES;
593+
CLANG_WARN_COMMA = YES;
592594
CLANG_WARN_CONSTANT_CONVERSION = YES;
595+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
593596
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
594597
CLANG_WARN_EMPTY_BODY = YES;
595598
CLANG_WARN_ENUM_CONVERSION = YES;
596599
CLANG_WARN_INFINITE_RECURSION = YES;
597600
CLANG_WARN_INT_CONVERSION = YES;
601+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
602+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
603+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
598604
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
605+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
606+
CLANG_WARN_STRICT_PROTOTYPES = YES;
599607
CLANG_WARN_SUSPICIOUS_MOVE = YES;
600608
CLANG_WARN_UNREACHABLE_CODE = YES;
601609
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -624,6 +632,7 @@
624632
ONLY_ACTIVE_ARCH = YES;
625633
SDKROOT = macosx;
626634
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
635+
SWIFT_VERSION = 4.2;
627636
TARGETED_DEVICE_FAMILY = "1,2";
628637
VERSIONING_SYSTEM = "apple-generic";
629638
VERSION_INFO_PREFIX = "";
@@ -638,14 +647,22 @@
638647
CLANG_CXX_LIBRARY = "libc++";
639648
CLANG_ENABLE_MODULES = YES;
640649
CLANG_ENABLE_OBJC_ARC = YES;
650+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
641651
CLANG_WARN_BOOL_CONVERSION = YES;
652+
CLANG_WARN_COMMA = YES;
642653
CLANG_WARN_CONSTANT_CONVERSION = YES;
654+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
643655
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
644656
CLANG_WARN_EMPTY_BODY = YES;
645657
CLANG_WARN_ENUM_CONVERSION = YES;
646658
CLANG_WARN_INFINITE_RECURSION = YES;
647659
CLANG_WARN_INT_CONVERSION = YES;
660+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
661+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
662+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
648663
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
664+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
665+
CLANG_WARN_STRICT_PROTOTYPES = YES;
649666
CLANG_WARN_SUSPICIOUS_MOVE = YES;
650667
CLANG_WARN_UNREACHABLE_CODE = YES;
651668
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -667,6 +684,7 @@
667684
MTL_ENABLE_DEBUG_INFO = NO;
668685
SDKROOT = macosx;
669686
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
687+
SWIFT_VERSION = 4.2;
670688
TARGETED_DEVICE_FAMILY = "1,2";
671689
VALIDATE_PRODUCT = YES;
672690
VERSIONING_SYSTEM = "apple-generic";
@@ -691,7 +709,8 @@
691709
SDKROOT = iphoneos;
692710
SKIP_INSTALL = YES;
693711
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
694-
SWIFT_VERSION = 3.0;
712+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
713+
SWIFT_VERSION = 4.2;
695714
};
696715
name = Debug;
697716
};
@@ -711,7 +730,8 @@
711730
PRODUCT_NAME = RouterX;
712731
SDKROOT = iphoneos;
713732
SKIP_INSTALL = YES;
714-
SWIFT_VERSION = 3.0;
733+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
734+
SWIFT_VERSION = 4.2;
715735
};
716736
name = Release;
717737
};
@@ -725,7 +745,8 @@
725745
PRODUCT_NAME = RouterXTests;
726746
SDKROOT = iphoneos;
727747
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
728-
SWIFT_VERSION = 3.0;
748+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
749+
SWIFT_VERSION = 4.2;
729750
};
730751
name = Debug;
731752
};
@@ -738,7 +759,8 @@
738759
PRODUCT_BUNDLE_IDENTIFIER = me.jasl.RouterXTests;
739760
PRODUCT_NAME = RouterXTests;
740761
SDKROOT = iphoneos;
741-
SWIFT_VERSION = 3.0;
762+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
763+
SWIFT_VERSION = 4.2;
742764
};
743765
name = Release;
744766
};
@@ -758,7 +780,7 @@
758780
PRODUCT_NAME = RouterX;
759781
SDKROOT = appletvos;
760782
SKIP_INSTALL = YES;
761-
SWIFT_VERSION = 3.0;
783+
SWIFT_VERSION = 4.2;
762784
TARGETED_DEVICE_FAMILY = 3;
763785
TVOS_DEPLOYMENT_TARGET = 9.0;
764786
};
@@ -780,7 +802,7 @@
780802
PRODUCT_NAME = RouterX;
781803
SDKROOT = appletvos;
782804
SKIP_INSTALL = YES;
783-
SWIFT_VERSION = 3.0;
805+
SWIFT_VERSION = 4.2;
784806
TARGETED_DEVICE_FAMILY = 3;
785807
TVOS_DEPLOYMENT_TARGET = 9.0;
786808
};
@@ -796,7 +818,7 @@
796818
PRODUCT_NAME = RouterXTests;
797819
SDKROOT = appletvos;
798820
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
799-
SWIFT_VERSION = 3.0;
821+
SWIFT_VERSION = 4.2;
800822
};
801823
name = Debug;
802824
};
@@ -809,7 +831,7 @@
809831
PRODUCT_BUNDLE_IDENTIFIER = me.jasl.RouterXTests;
810832
PRODUCT_NAME = RouterXTests;
811833
SDKROOT = appletvos;
812-
SWIFT_VERSION = 3.0;
834+
SWIFT_VERSION = 4.2;
813835
};
814836
name = Release;
815837
};
@@ -832,7 +854,7 @@
832854
PRODUCT_NAME = RouterX;
833855
SDKROOT = macosx;
834856
SKIP_INSTALL = YES;
835-
SWIFT_VERSION = 3.0;
857+
SWIFT_VERSION = 4.2;
836858
};
837859
name = Debug;
838860
};
@@ -855,7 +877,7 @@
855877
PRODUCT_NAME = RouterX;
856878
SDKROOT = macosx;
857879
SKIP_INSTALL = YES;
858-
SWIFT_VERSION = 3.0;
880+
SWIFT_VERSION = 4.2;
859881
};
860882
name = Release;
861883
};
@@ -871,7 +893,7 @@
871893
PRODUCT_NAME = RouterXTests;
872894
SDKROOT = macosx;
873895
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
874-
SWIFT_VERSION = 3.0;
896+
SWIFT_VERSION = 4.2;
875897
};
876898
name = Debug;
877899
};
@@ -886,7 +908,7 @@
886908
PRODUCT_BUNDLE_IDENTIFIER = me.jasl.RouterXTests;
887909
PRODUCT_NAME = RouterXTests;
888910
SDKROOT = macosx;
889-
SWIFT_VERSION = 3.0;
911+
SWIFT_VERSION = 4.2;
890912
};
891913
name = Release;
892914
};

‎RouterX.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
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>

‎RouterX.xcodeproj/xcshareddata/xcschemes/RouterX OSX.xcscheme‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES"
30-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3131
<Testables>
3232
<TestableReference
3333
skipped = "NO">

‎RouterX.xcodeproj/xcshareddata/xcschemes/RouterX iOS.xcscheme‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES"
30-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3131
<Testables>
3232
<TestableReference
3333
skipped = "NO">

‎RouterX.xcodeproj/xcshareddata/xcschemes/RouterX tvOS.xcscheme‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES"
30-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3131
<Testables>
3232
<TestableReference
3333
skipped = "NO">

‎RouterX.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
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>

0 commit comments

Comments
 (0)