Skip to content

Commit c47818d

Browse files
author
Bobby Sudekum
committed
Update to swift 4
1 parent af49b43 commit c47818d

8 files changed

Lines changed: 49 additions & 14 deletions

File tree

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
4.0

‎Cartfile.resolved‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "mapbox/MapboxDirections.swift" "v0.11.0"
1+
github "mapbox/MapboxDirections.swift" "v0.11.2"
22
github "raphaelmor/Polyline" "v4.1.1"

‎OSRMTextInstructions.xcodeproj/project.pbxproj‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,17 +412,18 @@
412412
isa = PBXProject;
413413
attributes = {
414414
LastSwiftUpdateCheck = 0820;
415-
LastUpgradeCheck = 0820;
415+
LastUpgradeCheck = 0910;
416416
TargetAttributes = {
417417
352BBC281E5E4D4200703DF1 = {
418418
CreatedOnToolsVersion = 8.2.1;
419419
DevelopmentTeam = GJZR2MEM28;
420+
LastSwiftMigration = 0910;
420421
ProvisioningStyle = Automatic;
421422
};
422423
35EBDB5C1E5E1572006EB3CD = {
423424
CreatedOnToolsVersion = 8.2.1;
424425
DevelopmentTeam = GJZR2MEM28;
425-
LastSwiftMigration = 0830;
426+
LastSwiftMigration = 0910;
426427
ProvisioningStyle = Automatic;
427428
};
428429
DA5F58921E85A32C00BA4D0A = {
@@ -738,6 +739,7 @@
738739
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
739740
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.OSRMTextInstructionsTests;
740741
PRODUCT_NAME = "$(TARGET_NAME)";
742+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
741743
SWIFT_VERSION = 3.0;
742744
};
743745
name = Debug;
@@ -754,6 +756,7 @@
754756
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
755757
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.OSRMTextInstructionsTests;
756758
PRODUCT_NAME = "$(TARGET_NAME)";
759+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
757760
SWIFT_VERSION = 3.0;
758761
};
759762
name = Release;
@@ -768,15 +771,21 @@
768771
CLANG_CXX_LIBRARY = "libc++";
769772
CLANG_ENABLE_MODULES = YES;
770773
CLANG_ENABLE_OBJC_ARC = YES;
774+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
771775
CLANG_WARN_BOOL_CONVERSION = YES;
776+
CLANG_WARN_COMMA = YES;
772777
CLANG_WARN_CONSTANT_CONVERSION = YES;
773778
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
774779
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
775780
CLANG_WARN_EMPTY_BODY = YES;
776781
CLANG_WARN_ENUM_CONVERSION = YES;
777782
CLANG_WARN_INFINITE_RECURSION = YES;
778783
CLANG_WARN_INT_CONVERSION = YES;
784+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
785+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
779786
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
787+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
788+
CLANG_WARN_STRICT_PROTOTYPES = YES;
780789
CLANG_WARN_SUSPICIOUS_MOVE = YES;
781790
CLANG_WARN_UNREACHABLE_CODE = YES;
782791
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -825,15 +834,21 @@
825834
CLANG_CXX_LIBRARY = "libc++";
826835
CLANG_ENABLE_MODULES = YES;
827836
CLANG_ENABLE_OBJC_ARC = YES;
837+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
828838
CLANG_WARN_BOOL_CONVERSION = YES;
839+
CLANG_WARN_COMMA = YES;
829840
CLANG_WARN_CONSTANT_CONVERSION = YES;
830841
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
831842
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
832843
CLANG_WARN_EMPTY_BODY = YES;
833844
CLANG_WARN_ENUM_CONVERSION = YES;
834845
CLANG_WARN_INFINITE_RECURSION = YES;
835846
CLANG_WARN_INT_CONVERSION = YES;
847+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
848+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
836849
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
850+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
851+
CLANG_WARN_STRICT_PROTOTYPES = YES;
837852
CLANG_WARN_SUSPICIOUS_MOVE = YES;
838853
CLANG_WARN_UNREACHABLE_CODE = YES;
839854
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -886,6 +901,7 @@
886901
PRODUCT_NAME = "$(TARGET_NAME)";
887902
SKIP_INSTALL = YES;
888903
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
904+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
889905
SWIFT_VERSION = 3.0;
890906
};
891907
name = Debug;
@@ -910,6 +926,7 @@
910926
PRODUCT_BUNDLE_IDENTIFIER = "org.project-osrm.OSRMTextInstructions";
911927
PRODUCT_NAME = "$(TARGET_NAME)";
912928
SKIP_INSTALL = YES;
929+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
913930
SWIFT_VERSION = 3.0;
914931
};
915932
name = Release;
@@ -938,6 +955,7 @@
938955
SDKROOT = macosx;
939956
SKIP_INSTALL = YES;
940957
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
958+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
941959
SWIFT_VERSION = 3.0;
942960
};
943961
name = Debug;
@@ -965,6 +983,7 @@
965983
PRODUCT_NAME = OSRMTextInstructions;
966984
SDKROOT = macosx;
967985
SKIP_INSTALL = YES;
986+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
968987
SWIFT_VERSION = 3.0;
969988
};
970989
name = Release;
@@ -985,6 +1004,7 @@
9851004
PRODUCT_BUNDLE_IDENTIFIER = "org.project-osrm.OSRMTextInstructionsTests";
9861005
PRODUCT_NAME = OSRMTextInstructionsTests;
9871006
SDKROOT = macosx;
1007+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
9881008
SWIFT_VERSION = 3.0;
9891009
};
9901010
name = Debug;
@@ -1005,6 +1025,7 @@
10051025
PRODUCT_BUNDLE_IDENTIFIER = "org.project-osrm.OSRMTextInstructionsTests";
10061026
PRODUCT_NAME = OSRMTextInstructionsTests;
10071027
SDKROOT = macosx;
1028+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
10081029
SWIFT_VERSION = 3.0;
10091030
};
10101031
name = Release;
@@ -1031,6 +1052,7 @@
10311052
SDKROOT = appletvos;
10321053
SKIP_INSTALL = YES;
10331054
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1055+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
10341056
SWIFT_VERSION = 3.0;
10351057
TARGETED_DEVICE_FAMILY = 3;
10361058
};
@@ -1057,6 +1079,7 @@
10571079
PRODUCT_NAME = OSRMTextInstructions;
10581080
SDKROOT = appletvos;
10591081
SKIP_INSTALL = YES;
1082+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
10601083
SWIFT_VERSION = 3.0;
10611084
TARGETED_DEVICE_FAMILY = 3;
10621085
};
@@ -1076,6 +1099,7 @@
10761099
PRODUCT_BUNDLE_IDENTIFIER = "org.project-osrm.OSRMTextInstructionsTests";
10771100
PRODUCT_NAME = OSRMTextInstructionsTests;
10781101
SDKROOT = appletvos;
1102+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
10791103
SWIFT_VERSION = 3.0;
10801104
};
10811105
name = Debug;
@@ -1094,6 +1118,7 @@
10941118
PRODUCT_BUNDLE_IDENTIFIER = "org.project-osrm.OSRMTextInstructionsTests";
10951119
PRODUCT_NAME = OSRMTextInstructionsTests;
10961120
SDKROOT = appletvos;
1121+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
10971122
SWIFT_VERSION = 3.0;
10981123
};
10991124
name = Release;
@@ -1121,6 +1146,7 @@
11211146
SDKROOT = watchos;
11221147
SKIP_INSTALL = YES;
11231148
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1149+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
11241150
SWIFT_VERSION = 3.0;
11251151
TARGETED_DEVICE_FAMILY = 4;
11261152
WATCHOS_DEPLOYMENT_TARGET = 3.1;
@@ -1149,6 +1175,7 @@
11491175
PRODUCT_NAME = OSRMTextInstructions;
11501176
SDKROOT = watchos;
11511177
SKIP_INSTALL = YES;
1178+
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
11521179
SWIFT_VERSION = 3.0;
11531180
TARGETED_DEVICE_FAMILY = 4;
11541181
WATCHOS_DEPLOYMENT_TARGET = 3.1;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎OSRMTextInstructions.xcodeproj/xcshareddata/xcschemes/OSRMTextInstructions macOS.xcscheme‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES"
3031
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -56,6 +57,7 @@
5657
buildConfiguration = "Debug"
5758
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5859
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
5961
launchStyle = "0"
6062
useCustomWorkingDirectory = "NO"
6163
ignoresPersistentStateOnLaunch = "NO"

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎OSRMTextInstructions.xcodeproj/xcshareddata/xcschemes/OSRMTextInstructions watchOS.xcscheme‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0910"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎OSRMTextInstructions/OSRMTextInstructions.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ protocol Tokenized {
1515

1616
extension String: Tokenized {
1717
public var sentenceCased: String {
18-
return String(characters.prefix(1)).uppercased() + String(characters.dropFirst())
18+
return String(self.prefix(1)).uppercased() + String(dropFirst())
1919
}
2020

2121
public func replacingTokens(using interpolator: ((TokenType) -> String)) -> String {
@@ -62,7 +62,7 @@ extension String: Tokenized {
6262
}
6363

6464
extension NSAttributedString: Tokenized {
65-
public func replacingTokens(using interpolator: ((TokenType) -> NSAttributedString)) -> NSAttributedString {
65+
@objc public func replacingTokens(using interpolator: ((TokenType) -> NSAttributedString)) -> NSAttributedString {
6666
let scanner = Scanner(string: string)
6767
scanner.charactersToBeSkipped = nil
6868
let result = NSMutableAttributedString()
@@ -97,13 +97,13 @@ extension NSAttributedString: Tokenized {
9797
// capitalize
9898
let meta = OSRMTextInstructionsStrings["meta"] as! [String: Any]
9999
if meta["capitalizeFirstLetter"] as? Bool ?? false {
100-
result.replaceCharacters(in: NSRange(location: 0, length: 1), with: String(result.string.characters.first!).uppercased())
100+
result.replaceCharacters(in: NSRange(location: 0, length: 1), with: String(result.string.first!).uppercased())
101101
}
102102
return result as NSAttributedString
103103
}
104104
}
105105

106-
public class OSRMInstructionFormatter: Formatter {
106+
@objc public class OSRMInstructionFormatter: Formatter {
107107
let version: String
108108
let instructions: [String: Any]
109109

@@ -116,7 +116,7 @@ public class OSRMInstructionFormatter: Formatter {
116116
return formatter
117117
}()
118118

119-
public init(version: String) {
119+
@objc public init(version: String) {
120120
self.version = version
121121
self.instructions = OSRMTextInstructionsStrings[version] as! [String: Any]
122122

@@ -155,7 +155,7 @@ public class OSRMInstructionFormatter: Formatter {
155155

156156
- returns: A format string suitable for `String.replacingTokens(using:)`.
157157
*/
158-
public func phrase(named name: PhraseName) -> String {
158+
@objc public func phrase(named name: PhraseName) -> String {
159159
let phrases = instructions["phrase"] as! [String: String]
160160
return phrases["\(name)"]!
161161
}

0 commit comments

Comments
 (0)