Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[ios] Backport Xcode 9 & build fixes to v3.6.x release branch #10224

Merged

Conversation

friedbunny
Copy link
Contributor

@friedbunny friedbunny commented Oct 18, 2017

Backports (cherry-picks) #10055 and #10070 to the release-ios-v3.6.0-android-v5.1.0 branch so that potential patch releases will have (mostly) passing tests.

/cc @kkaefer @frederoni

@friedbunny friedbunny added build iOS Mapbox Maps SDK for iOS labels Oct 18, 2017
@friedbunny friedbunny self-assigned this Oct 18, 2017
@@ -19,7 +19,7 @@ - (void)testTitleCasedString {

XCTAssertEqualObjects([@"Improve the map" mgl_titleCasedStringWithLocale:locale], @"Improve the Map");
XCTAssertEqualObjects([@"Improve The Map" mgl_titleCasedStringWithLocale:locale], @"Improve The Map");

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: whitespace only change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was in the original commit, so I’ve just let it be. 🤷‍♂️

@friedbunny
Copy link
Contributor Author

Node tests on Travis fail on this branch because of #9940, which we’ve decided not to fix.

@friedbunny friedbunny merged commit 9c22a0c into release-ios-v3.6.0-android-v5.1.0 Oct 18, 2017
@friedbunny friedbunny deleted the fb-backport-xcode9-to-v3.6.x branch October 18, 2017 16:10
@friedbunny friedbunny added this to the android-v5.1.5 milestone Oct 18, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
build iOS Mapbox Maps SDK for iOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants