Delete conflicting files to fix jazzy docset generation #2076
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There were two Date.swift files in the merged, CocoaPods-generated target that jazzy uses to calculate USRs.
1ec5
added
topic: documentation
build
1ec5
changed the title
frederoni
reviewed
Apr 4, 2019
| @@ -1977,6 +1971,7 @@ | |||
| developmentRegion = English; | |||
| hasScannedForEncodings = 0; | |||
| knownRegions = ( | |||
| English, | |||
There was a problem hiding this comment.
Xcode 10.2 replaced English with en. I wonder if this can cause any issues. 🤔
There was a problem hiding this comment.
Xcode 10.2 adds this entry automatically upon opening the project. I’m not sure why, given that en is already in the list and we don’t have any English.lproj folders in the repository. But the project functions fine with or without this change.
There was a problem hiding this comment.
Huh, today Xcode 10.2 warned me about this entry and offered to remove it. I guess it was having a different mood today. Removed in a016c58.
frederoni
approved these changes
Apr 4, 2019
|
#2078 tracks adding a CI step so the docset doesn’t regress again. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#2013 duplicated Date.swift across the MapboxCoreNavigation and MapboxNavigation targets, so there were two Date.swift files in the merged, CocoaPods-generated target that jazzy uses to calculate USRs. A similar naming collision occurred with String.swift and Route.swift.
Fixes #1795 a second time.
/cc @mapbox/navigation-ios