Merging the 6.1.0 release into master #3049
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
approved these changes
May 21, 2019
| @@ -149,6 +149,13 @@ - (void)logAnalyticsEventForType:(FIRIAMAnalyticsLogEventType)eventType | |||
| eventTimeInMs = @((long)nowInMs); | |||
| } | |||
|
|
|||
| if (!iid) { | |||
There was a problem hiding this comment.
Hmm I thought this was already in master. https://github.com/firebase/firebase-ios-sdk/blob/master/Firebase/InAppMessaging/Analytics/FIRIAMClearcutLogger.m#L152 not sure why it's showing up here.
There was a problem hiding this comment.
Looks like a GitHub diff tool bug to me... I guess, it's shown here because branch was created before the change was merged and was cherry picked later on.
There was a problem hiding this comment.
Yep GitHub diff does not properly handle cherry-pick's.
| @@ -6,7 +6,7 @@ target 'SymbolCollisionTest' do | |||
| # use_frameworks! | |||
|
|
|||
| # Firebase Pods | |||
| pod 'Firebase', '~> 6.0.0' | |||
| pod 'Firebase', '6.1.0' | |||
There was a problem hiding this comment.
Should this stick to use ~>? @paulb777
There was a problem hiding this comment.
The change is right to use the current version of Firebase.
|
Just the two quick questions. |
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.