-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[extension_google_sign_in_as_googleapis_auth][google_maps_flutter_ios] Manual roll with fixes to example and skipping some native tests #7571
Merged
Merged
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
6339d87
update examples
bparrishMines 8de6287
Merge branch 'main' of github.com:flutter/packages into update_examples
bparrishMines 1f46aec
undo specific changes
bparrishMines 9ecfc12
raise jvm limit
bparrishMines 83ef738
manual roll
bparrishMines bb8d313
Merge branch 'main' of github.com:flutter/packages into update_examples
bparrishMines bc6bd3d
Merge branch 'main' into update_examples
gmackall 6039ea8
Merge branch 'main' of github.com:flutter/packages into update_examples
bparrishMines 4d0e113
try manual roll
bparrishMines a4fe594
Merge branch 'update_examples' of github.com:bparrishMines/packages i…
bparrishMines 39d73c4
skip tests and later flutter version
bparrishMines 55ee1fd
skip the correct test
bparrishMines c3b0bc3
Merge branch 'main' of github.com:flutter/packages into update_examples
bparrishMines 56f2b1d
check for macos
bparrishMines File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
2 changes: 1 addition & 1 deletion
2
packages/extension_google_sign_in_as_googleapis_auth/example/android/gradle.properties
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| org.gradle.jvmargs=-Xmx1536M | ||
| org.gradle.jvmargs=-Xmx4G | ||
| android.useAndroidX=true | ||
| android.enableJetifier=true | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I recall there are actually 2 parameters you need to set here. Let me see if I can find an example.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found the commit for this one I think: 0814a3b
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/flutter/flutter/blob/28a91243049938251c718afe678f8ca177ba8b3f/examples/layers/android/gradle.properties#L2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm it builds locally but not on CI
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, this is the same issue as flutter/flutter#154489. It seems like upgrading the guava version in
6.1.25ofgoogle_sign_in_androidhas caused some issues with our use of R8 (I verified that reverting back to usingmakes this example app build successfully).
I think perhaps we should revert back to that guava version to unblock the roller (and also to unblock
google_sign_in_androidbeing broken on flutter's latest master), and then investigate what it will take to unblock that upgradeThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done, and updated branch
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like it builds successfully now!