[CP][Android] Revert "Reland: "Fix how Gradle resolves Android plugin" (#137115)" #142491
Conversation
)" (flutter#142464) This reverts commit f5ac225, i.e. flutter#137115. This is a continuation of flutter#142266 that was redone based on feedback to make this easier to revert in the future. The exact steps I took to create this revert: 1. Revert commit noted above 2. Fix merge conflicts, that notably involved reverting some changes in flutter#140744 ~and flutter#141417 (fixed my merge to avoid the second PR from being affected) 3. Delete `packages/flutter_tools/test/integration.shard/android_plugin_skip_unsupported_test.dart` as this was added in the commit noted above cc @Gustl22 since I couldn't tag as a reviewer
|
This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter. Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed. |
github-actions
bot
added
the
tool
There was a problem hiding this comment.
Should this file be deleted? Same with packages/flutter_tools/test/integration.shard/test_data/plugin_each_settings_gradle_project.dart
There was a problem hiding this comment.
These were both added (along with packages/flutter_tools/test/integration.shard/android_plugin_skip_unsupported_test.dart) in #137115
| private void configurePluginProject(Map<String, Object> pluginObject) { | ||
| assert(pluginObject.name instanceof String) | ||
| Project pluginProject = project.rootProject.findProject(":${pluginObject.name}") | ||
| private void configurePluginProject(String pluginName, String _) { |
There was a problem hiding this comment.
As per a recommendation from @reidbaker, I downloaded a Groovy extension in VSCode to see if there were any issues and the only relevant one to lines modified here are lint warnings that the String _ variable should be named and that it's not referenced in the method. However, this was how it was before until it was changed in the original PR, so should be fine!
FWIW the other errors/warnings are also lints.
There was a problem hiding this comment.
As per a recommendation from @reidbaker, I downloaded a Groovy extension in VSCode to see if there were any issues and the only relevant one to lines modified here are lint warnings that the
String _variable should be named and that it's not referenced in the method. However, this was how it was before until it was changed in the original PR, so should be fine!FWIW the other errors/warnings are also lints.
Thanks for checking this was the last thing I could think of to help us gain confidence in the revert not creating more issues.
|
Can I submit a PR for "Add support for Gradle Kotlin DSL" again now? |
Sure! So are you going to take on #142487? |
|
Yes🙌 |
itsjustkevin
added
platform-android
…oid plugin" (#137115)" (flutter/flutter#142491)
4 participants
Cherry-pick for #137115 to fix #141940. Steps taken to create this cherry-pick:
flutter.groovythat I accidentally kept in the merge but was added in Reland: "Fix how Gradle resolves Android plugin" #137115android_plugin_skip_unsupported_test.dartthat was left incorrectly by merge.Pre-launch Checklist
///).