Fix OTHER_CFLAGS in zip build. #3497
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
ryanwilson
commented
Aug 2, 2019
| @@ -418,7 +419,7 @@ struct FrameworkBuilder { | |||
|
|
|||
| // Verify Firebase headers include an explicit umbrella header for Firebase.h. | |||
| let headersDir = podsDir.appendingPathComponents(["Headers", "Public", framework]) | |||
| if framework.hasPrefix("Firebase") && framework != "FirebaseCoreDiagnostics" { | |||
| if framework.hasPrefix("Firebase"), framework != "FirebaseCoreDiagnostics" { | |||
There was a problem hiding this comment.
This was from running style.sh
There was a problem hiding this comment.
That seems a lot less readable to me! A comma operator instead of &&?!
There was a problem hiding this comment.
Yeah, I'll have to look into why that's the preferred one there. I think some guard statements make sense with , but this is less readable I'd say.
paulb777
approved these changes
Aug 2, 2019
| @@ -418,7 +419,7 @@ struct FrameworkBuilder { | |||
|
|
|||
| // Verify Firebase headers include an explicit umbrella header for Firebase.h. | |||
| let headersDir = podsDir.appendingPathComponents(["Headers", "Public", framework]) | |||
| if framework.hasPrefix("Firebase") && framework != "FirebaseCoreDiagnostics" { | |||
| if framework.hasPrefix("Firebase"), framework != "FirebaseCoreDiagnostics" { | |||
There was a problem hiding this comment.
That seems a lot less readable to me! A comma operator instead of &&?!
| @@ -23,12 +23,12 @@ private enum Architecture: String, CaseIterable { | |||
| case device = "iphoneos" | |||
| case simulator = "iphonesimulator" | |||
|
|
|||
| /// Arguments that should be included as part of the build process for each target platform. | |||
| func extraArguments() -> [String] { | |||
There was a problem hiding this comment.
Is there a reason for calling it "extra" instead of "other"?
There was a problem hiding this comment.
Nope, no particular reason. I can change to other.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.