Couple of fixes for xcode12 support #418
Merged
Conversation
This file contains hidden or 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
wtmoose
reviewed
Sep 24, 2020
SwiftMessages/NSBundle+Utils.swift
Outdated
| else { | ||
| return bundle | ||
|
|
||
| let bundleName = "SwiftMessages_SwiftMessages" |
There was a problem hiding this comment.
This isn't the right bundle name for CocoaPods, so it won't work as-is
There was a problem hiding this comment.
Ok, I was skeptical of that too 😅 I'll try if I can modify the original a little less to get the correct bundle in SPM case.
wtmoose
reviewed
Sep 24, 2020
|
How about the adjustment I pushed? I tried to streamline the implementation a bit with a nested loop. And I returned a fallback value that matches the original implementation. There's a separate issue with CocoaPods, but I can handle that after merging this into the feature branch. |
|
Looks good! I can confirm it still works on my project. 👍 |
|
Great! Gonna merge this in and try to get a release out. Thanks for helping out |
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.
Hi, sorry if I'm a bit too eager to get SPM-support for this project, but seemed like this branch missed some finishing touches. I had to fix the Bundle search function to match what the SPM generates to
Bundle.module, because it was not finding the correct bundle on my app. Hopefully this supports CocoaPods/Carthage too, but I did not test it.