Skip to content

Commit 8748aaa

Browse files
Updated to Swift 5, project settings. Fixed warnings & errors.
Signed-off-by: Daniel Meachum <daniel.meachum@gmail.com>
1 parent 09af98e commit 8748aaa

File tree

6 files changed

+35
-9
lines changed

6 files changed

+35
-9
lines changed

GraphHopperRouting.xcodeproj/project.pbxproj

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
isa = PBXProject;
164164
attributes = {
165165
LastSwiftUpdateCheck = 0830;
166-
LastUpgradeCheck = 0830;
166+
LastUpgradeCheck = 1020;
167167
ORGANIZATIONNAME = rmnblm;
168168
TargetAttributes = {
169169
30DEA4811E94064100D2A137 = {
@@ -181,7 +181,7 @@
181181
};
182182
buildConfigurationList = 30DEA47C1E94064100D2A137 /* Build configuration list for PBXProject "GraphHopperRouting" */;
183183
compatibilityVersion = "Xcode 3.2";
184-
developmentRegion = English;
184+
developmentRegion = en;
185185
hasScannedForEncodings = 0;
186186
knownRegions = (
187187
en,
@@ -257,21 +257,30 @@
257257
isa = XCBuildConfiguration;
258258
buildSettings = {
259259
ALWAYS_SEARCH_USER_PATHS = NO;
260+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
260261
CLANG_ANALYZER_NONNULL = YES;
261262
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
262263
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
263264
CLANG_CXX_LIBRARY = "libc++";
264265
CLANG_ENABLE_MODULES = YES;
265266
CLANG_ENABLE_OBJC_ARC = YES;
267+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
266268
CLANG_WARN_BOOL_CONVERSION = YES;
269+
CLANG_WARN_COMMA = YES;
267270
CLANG_WARN_CONSTANT_CONVERSION = YES;
271+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
268272
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
269273
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
270274
CLANG_WARN_EMPTY_BODY = YES;
271275
CLANG_WARN_ENUM_CONVERSION = YES;
272276
CLANG_WARN_INFINITE_RECURSION = YES;
273277
CLANG_WARN_INT_CONVERSION = YES;
278+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
279+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
280+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
274281
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
282+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
283+
CLANG_WARN_STRICT_PROTOTYPES = YES;
275284
CLANG_WARN_SUSPICIOUS_MOVE = YES;
276285
CLANG_WARN_UNREACHABLE_CODE = YES;
277286
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -311,21 +320,30 @@
311320
isa = XCBuildConfiguration;
312321
buildSettings = {
313322
ALWAYS_SEARCH_USER_PATHS = NO;
323+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
314324
CLANG_ANALYZER_NONNULL = YES;
315325
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
316326
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
317327
CLANG_CXX_LIBRARY = "libc++";
318328
CLANG_ENABLE_MODULES = YES;
319329
CLANG_ENABLE_OBJC_ARC = YES;
330+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
320331
CLANG_WARN_BOOL_CONVERSION = YES;
332+
CLANG_WARN_COMMA = YES;
321333
CLANG_WARN_CONSTANT_CONVERSION = YES;
334+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
322335
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
323336
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
324337
CLANG_WARN_EMPTY_BODY = YES;
325338
CLANG_WARN_ENUM_CONVERSION = YES;
326339
CLANG_WARN_INFINITE_RECURSION = YES;
327340
CLANG_WARN_INT_CONVERSION = YES;
341+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
342+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
343+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
328344
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
345+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
346+
CLANG_WARN_STRICT_PROTOTYPES = YES;
329347
CLANG_WARN_SUSPICIOUS_MOVE = YES;
330348
CLANG_WARN_UNREACHABLE_CODE = YES;
331349
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -371,7 +389,7 @@
371389
PRODUCT_NAME = "$(TARGET_NAME)";
372390
SKIP_INSTALL = YES;
373391
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
374-
SWIFT_VERSION = 3.0;
392+
SWIFT_VERSION = 5.0;
375393
};
376394
name = Debug;
377395
};
@@ -391,7 +409,7 @@
391409
PRODUCT_BUNDLE_IDENTIFIER = com.rmnblm.GraphHopperRouting;
392410
PRODUCT_NAME = "$(TARGET_NAME)";
393411
SKIP_INSTALL = YES;
394-
SWIFT_VERSION = 3.0;
412+
SWIFT_VERSION = 5.0;
395413
};
396414
name = Release;
397415
};
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>

GraphHopperRouting/GHBoundingBox.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import CoreLocation
44
A `BoundingBox` object is an area defined by two coordinates, top-left and bottom-right.
55
*/
66
open class BoundingBox {
7-
open let topLeft: CLLocationCoordinate2D
8-
open let bottomRight: CLLocationCoordinate2D
7+
public let topLeft: CLLocationCoordinate2D
8+
public let bottomRight: CLLocationCoordinate2D
99

1010
/**
1111
Initializes a new bounding box object with the two coordinates, top-left and bottom-right.

GraphHopperRouting/GHRouteOptions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ open class RouteOptions: NSObject {
9494
}
9595

9696
internal func response(_ json: JSONDictionary) -> ([RoutePath]?) {
97-
return (json["paths"] as? [JSONDictionary])?.flatMap({ jsonPath in
97+
return (json["paths"] as? [JSONDictionary])?.compactMap({ jsonPath in
9898
return RoutePath(json: jsonPath, withOptions: self)
9999
})
100100
}

GraphHopperRouting/GHRoutePath.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ open class RoutePath {
3535
Contains information about the instructions for this route. The last instruction is always the Finish instruction and takes 0ms and 0meter.
3636
*/
3737
open lazy var instructions: [Instruction] = {
38-
return (self.json["instructions"] as? [JSONDictionary])?.flatMap({ Instruction(json: $0) }) ?? []
38+
return (self.json["instructions"] as? [JSONDictionary])?.compactMap({ Instruction(json: $0) }) ?? []
3939
}()
4040

4141
/**

GraphHopperRouting/GHRouting.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ open class Routing: NSObject {
2525

2626
If this object is used, the GraphHopper Access Token must be specified in the Info.plist of the application's main bundle with the key `GraphHopperAccessToken`.
2727
*/
28-
open static let shared = Routing(accessToken: nil)
28+
public static let shared = Routing(accessToken: nil)
2929

3030
internal let accessToken: String
3131
internal let baseURL: URL

0 commit comments

Comments
 (0)