Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to Swift 5 #383

Merged
merged 5 commits into from
Oct 4, 2019
+21 −13
Merged

Migrate to Swift 5 #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f90424c
Upgraded CircleCI to Xcode 11
1ec5 Oct 1, 2019
6173d68
Migrated to Swift 5
1ec5 Oct 1, 2019
2308da7
Updated podspec
1ec5 Oct 1, 2019
bf92dd5
Corrected watchOS version
1ec5 Oct 1, 2019
e037e4d
Commented out crashing test
1ec5 Oct 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
type: string
device:
type: string
default: "iPhone 6 Plus"
default: "iPhone 8 Plus"
iOS:
type: string
default: "12.1"
Expand Down Expand Up @@ -99,22 +99,23 @@ jobs:
command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections Mac' clean build<<# parameters.test >> test <</ parameters.test >><<# parameters.codecoverage >>-enableCodeCoverage YES<</ parameters.codecoverage >>
- run:
name: watchOS
command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections watchOS' -destination 'platform=watchOS Simulator,name=Apple Watch Series 3 - 42mm,OS=<< parameters.watchOS >>' clean build
command: xcodebuild -project MapboxDirections.xcodeproj -scheme 'MapboxDirections watchOS' -destination 'platform=watchOS Simulator,name=Apple Watch Series 4 - 44mm,OS=<< parameters.watchOS >>' clean build

workflows:
workflow:
jobs:
- build-job:
name: "Xcode_11.1"
xcode: "11.1.0"
iOS: "13.1"
tvOS: "13.0"
watchOS: "6.0"
- build-job:
name: "Xcode_10.2"
xcode: "10.2.0"
iOS: "12.2"
tvOS: "12.2"
watchOS: "5.2"
- build-job:
name: "Xcode_10.0"
xcode: "10.0.0"
iOS: "12.0"
tvOS: "12.0"
codecoverage: true
- spm-job:
name: "SPM_build"
Expand Down
2 changes: 1 addition & 1 deletion MapboxDirections.swift.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Pod::Spec.new do |s|

s.requires_arc = true
s.module_name = "MapboxDirections"
s.swift_version = "4.0"
s.swift_version = "5.0"

s.dependency "Polyline", "~> 4.2"

Expand Down
11 changes: 9 additions & 2 deletions MapboxDirections.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,14 +1068,15 @@
};
DA6C9D871CAE442B00094FBC = {
CreatedOnToolsVersion = 7.3;
LastSwiftMigration = 1020;
LastSwiftMigration = 1100;
};
DA6C9D901CAE442B00094FBC = {
CreatedOnToolsVersion = 7.3;
LastSwiftMigration = 1020;
LastSwiftMigration = 1100;
};
DADD27B41E5AAAD800D31FAD = {
CreatedOnToolsVersion = 8.2.1;
LastSwiftMigration = 1100;
ProvisioningStyle = Automatic;
};
DADD27CF1E5AAFFD00D31FAD = {
Expand Down Expand Up @@ -1810,6 +1811,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down Expand Up @@ -1837,6 +1839,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand All @@ -1858,6 +1861,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Tests/objc/MapboxDirectionsTests-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -1875,6 +1879,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxDirectionsTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Tests/objc/MapboxDirectionsTests-Bridging-Header.h";
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -1898,6 +1903,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -1919,6 +1925,7 @@
PRODUCT_MODULE_NAME = DirectionsExampleSwift;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
6 changes: 3 additions & 3 deletions Tests/objc/BridgingTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ - (void)testRouteOptions {
NSArray<CLLocation *> *locations = @[[[CLLocation alloc] initWithLatitude:0 longitude:1],
[[CLLocation alloc] initWithLatitude:2 longitude:3]];

NSArray<NSValue *> *coordinates = @[[NSValue valueWithMKCoordinate:CLLocationCoordinate2DMake(0, 1)],
[NSValue valueWithMKCoordinate:CLLocationCoordinate2DMake(2, 3)]];
// NSArray<NSValue *> *coordinates = @[[NSValue valueWithMKCoordinate:CLLocationCoordinate2DMake(0, 1)],
// [NSValue valueWithMKCoordinate:CLLocationCoordinate2DMake(2, 3)]];

NSArray<MBWaypoint *> *waypoints = @[[[MBWaypoint alloc] initWithCoordinate:CLLocationCoordinate2DMake(0, 1) coordinateAccuracy:-1 name:nil],
[[MBWaypoint alloc] initWithCoordinate:CLLocationCoordinate2DMake(2, 3) coordinateAccuracy:-1 name:nil]];

MBRouteOptions *options = nil;

options = [[MBRouteOptions alloc] initWithLocations:locations profileIdentifier:MBDirectionsProfileIdentifierAutomobileAvoidingTraffic];
options = [[MBRouteOptions alloc] initWithCoordinates:coordinates profileIdentifier:MBDirectionsProfileIdentifierAutomobileAvoidingTraffic];
// options = [[MBRouteOptions alloc] initWithCoordinates:coordinates profileIdentifier:MBDirectionsProfileIdentifierAutomobileAvoidingTraffic];
options = [[MBRouteOptions alloc] initWithWaypoints:waypoints profileIdentifier:MBDirectionsProfileIdentifierAutomobileAvoidingTraffic];
}

Expand Down