Revert "Reland: "Fix how Gradle resolves Android plugin" (#137115)"#142464
Merged
auto-submit[bot] merged 6 commits intoflutter:masterfrom Jan 29, 2024
Merged
Revert "Reland: "Fix how Gradle resolves Android plugin" (#137115)"#142464auto-submit[bot] merged 6 commits intoflutter:masterfrom
auto-submit[bot] merged 6 commits intoflutter:masterfrom
Conversation
)" This reverts commit f5ac225.
github-actions
bot
added
the
tool
8 tasks
Contributor
Author
|
@bartekpacia This seems to be conflicting with #141417. Was planning to undo the changes to the example apps here, but not sure if this is caused by something I did in the merge. |
This reverts commit 67e1202.
bartekpacia
reviewed
Jan 29, 2024
Comment on lines
-262
to
-282
| FlutterExtension extension = project.extensions.create("flutter", FlutterExtension) | ||
| Properties localProperties = new Properties() | ||
| File localPropertiesFile = rootProject.file("local.properties") | ||
| if (localPropertiesFile.exists()) { | ||
| localPropertiesFile.withReader("UTF-8") { reader -> | ||
| localProperties.load(reader) | ||
| } | ||
| } | ||
|
|
||
| Object flutterVersionCode = localProperties.getProperty("flutter.versionCode") | ||
| if (flutterVersionCode == null) { | ||
| flutterVersionCode = "1" | ||
| } | ||
| extension.flutterVersionCode = flutterVersionCode | ||
|
|
||
| Object flutterVersionName = localProperties.getProperty("flutter.versionName") | ||
| if (flutterVersionName == null) { | ||
| flutterVersionName = "1.0" | ||
| } | ||
| extension.flutterVersionName = flutterVersionName | ||
|
|
Member
Contributor
Author
There was a problem hiding this comment.
Ok adding this back
Contributor
Author
|
Before merging, I will file an issue to add back functionality to support #140744! |
reidbaker
approved these changes
Jan 29, 2024
2 tasks
Contributor
Author
camsim99
added
the
autosubmit
camsim99
added a commit
to camsim99/flutter
that referenced
this pull request
Jan 29, 2024
)" (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
8 tasks
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Jan 30, 2024
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Jan 30, 2024
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Jan 30, 2024
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Jan 30, 2024
stuartmorgan-g
pushed a commit
to flutter/packages
that referenced
this pull request
Feb 1, 2024
flutter/flutter@ace9181...75a2e5b 2024-01-30 [email protected] Reset framesEnabled to default value at the end of each test (flutter/flutter#141844) 2024-01-30 [email protected] Fix SliverMainAxisGroup geometry cacheExtent (flutter/flutter#142482) 2024-01-30 [email protected] Roll Flutter Engine from 0e586d1c28c8 to f02a4a80a77e (3 revisions) (flutter/flutter#142528) 2024-01-30 [email protected] Roll Packages from 516648a to 25abb5d (6 revisions) (flutter/flutter#142527) 2024-01-30 [email protected] Roll Flutter Engine from 438e9b4d7d4e to 0e586d1c28c8 (4 revisions) (flutter/flutter#142515) 2024-01-30 [email protected] Using `initExpensiveAndroidView` for Android Hybrid Composition Mode (flutter/flutter#142399) 2024-01-30 [email protected] Roll Flutter Engine from ed73d40a8c93 to 438e9b4d7d4e (1 revision) (flutter/flutter#142508) 2024-01-30 [email protected] Organize leak tracking TODOs. (flutter/flutter#142460) 2024-01-30 [email protected] Roll Flutter Engine from 5584a78a439b to ed73d40a8c93 (1 revision) (flutter/flutter#142504) 2024-01-30 [email protected] Roll Flutter Engine from df5f1afd4991 to 5584a78a439b (2 revisions) (flutter/flutter#142503) 2024-01-30 [email protected] Roll Flutter Engine from 65bf8b1db4d1 to df5f1afd4991 (1 revision) (flutter/flutter#142501) 2024-01-30 [email protected] Roll Flutter Engine from c9268c7db03c to 65bf8b1db4d1 (1 revision) (flutter/flutter#142496) 2024-01-30 [email protected] Roll Flutter Engine from e21208583956 to c9268c7db03c (1 revision) (flutter/flutter#142492) 2024-01-29 [email protected] Roll Flutter Engine from bedafa8794b6 to e21208583956 (1 revision) (flutter/flutter#142483) 2024-01-29 [email protected] Revert "Reland: "Fix how Gradle resolves Android plugin" (#137115)" (flutter/flutter#142464) 2024-01-29 [email protected] Marks Mac_pixel_7pro native_assets_android to be unflaky (flutter/flutter#141675) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Gustl22
added a commit
to Gustl22/flutter
that referenced
this pull request
Feb 2, 2024
…tter#137115)" (flutter#142464)" This reverts commit 995e3fa.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This reverts commit f5ac225, i.e. #137115.
This is a continuation of #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:
and Expose versionCode and versionName from local.properties in FlutterExtension #141417(fixed my merge to avoid the second PR from being affected)packages/flutter_tools/test/integration.shard/android_plugin_skip_unsupported_test.dartas this was added in the commit noted abovecc @Gustl22 since I couldn't tag as a reviewer
Pre-launch Checklist
///).