Revert "Reland: "Fix how Gradle resolves Android plugin" (#137115)" #142464

camsim99 · 2024-01-29T18:52:37Z

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:

Revert commit noted above
Fix merge conflicts, that notably involved reverting some changes in Add support for Gradle Kotlin DSL #140744 ~~and Expose versionCode and versionName from local.properties in FlutterExtension #141417~~ (fixed my merge to avoid the second PR from being affected)
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

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
I signed the CLA.
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is test-exempt.
All existing and new tests are passing.

)" This reverts commit f5ac225.

camsim99 · 2024-01-29T19:29:50Z

@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 · 2024-01-29T19:37:30Z

packages/flutter_tools/gradle/src/main/groovy/flutter.groovy

-        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
-


@camsim99 this code was added in #141417

Ok adding this back

camsim99 · 2024-01-29T21:31:51Z

Before merging, I will file an issue to add back functionality to support #140744!

camsim99 · 2024-01-29T22:43:34Z

Before merging, I will file an issue to add back functionality to support #140744!

#142487

@Gustl22

)" (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

…137115)" (flutter/flutter#142464)

flutter/flutter@ace9181...75a2e5b 2024-01-30 39623254+aizatazhar@users.noreply.github.com Reset framesEnabled to default value at the end of each test (flutter/flutter#141844) 2024-01-30 katelovett@google.com Fix SliverMainAxisGroup geometry cacheExtent (flutter/flutter#142482) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from 0e586d1c28c8 to f02a4a80a77e (3 revisions) (flutter/flutter#142528) 2024-01-30 engine-flutter-autoroll@skia.org Roll Packages from 516648a to 25abb5d (6 revisions) (flutter/flutter#142527) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from 438e9b4d7d4e to 0e586d1c28c8 (4 revisions) (flutter/flutter#142515) 2024-01-30 26625149+0xZOne@users.noreply.github.com Using `initExpensiveAndroidView` for Android Hybrid Composition Mode (flutter/flutter#142399) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from ed73d40a8c93 to 438e9b4d7d4e (1 revision) (flutter/flutter#142508) 2024-01-30 polinach@google.com Organize leak tracking TODOs. (flutter/flutter#142460) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from 5584a78a439b to ed73d40a8c93 (1 revision) (flutter/flutter#142504) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from df5f1afd4991 to 5584a78a439b (2 revisions) (flutter/flutter#142503) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from 65bf8b1db4d1 to df5f1afd4991 (1 revision) (flutter/flutter#142501) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from c9268c7db03c to 65bf8b1db4d1 (1 revision) (flutter/flutter#142496) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from e21208583956 to c9268c7db03c (1 revision) (flutter/flutter#142492) 2024-01-29 engine-flutter-autoroll@skia.org Roll Flutter Engine from bedafa8794b6 to e21208583956 (1 revision) (flutter/flutter#142483) 2024-01-29 43054281+camsim99@users.noreply.github.com Revert "Reland: "Fix how Gradle resolves Android plugin" (#137115)" (flutter/flutter#142464) 2024-01-29 fluttergithubbot@gmail.com 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 rmistry@google.com,stuartmorgan@google.com 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

…tter#137115)" (flutter#142464)" This reverts commit 995e3fa.

Previous PR: #137115, Revert: #142464 Fixes #141940 Closes #142487

…r#6017) flutter/flutter@ace9181...75a2e5b 2024-01-30 39623254+aizatazhar@users.noreply.github.com Reset framesEnabled to default value at the end of each test (flutter/flutter#141844) 2024-01-30 katelovett@google.com Fix SliverMainAxisGroup geometry cacheExtent (flutter/flutter#142482) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from 0e586d1c28c8 to f02a4a80a77e (3 revisions) (flutter/flutter#142528) 2024-01-30 engine-flutter-autoroll@skia.org Roll Packages from 516648a to 25abb5d (6 revisions) (flutter/flutter#142527) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from 438e9b4d7d4e to 0e586d1c28c8 (4 revisions) (flutter/flutter#142515) 2024-01-30 26625149+0xZOne@users.noreply.github.com Using `initExpensiveAndroidView` for Android Hybrid Composition Mode (flutter/flutter#142399) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from ed73d40a8c93 to 438e9b4d7d4e (1 revision) (flutter/flutter#142508) 2024-01-30 polinach@google.com Organize leak tracking TODOs. (flutter/flutter#142460) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from 5584a78a439b to ed73d40a8c93 (1 revision) (flutter/flutter#142504) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from df5f1afd4991 to 5584a78a439b (2 revisions) (flutter/flutter#142503) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from 65bf8b1db4d1 to df5f1afd4991 (1 revision) (flutter/flutter#142501) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from c9268c7db03c to 65bf8b1db4d1 (1 revision) (flutter/flutter#142496) 2024-01-30 engine-flutter-autoroll@skia.org Roll Flutter Engine from e21208583956 to c9268c7db03c (1 revision) (flutter/flutter#142492) 2024-01-29 engine-flutter-autoroll@skia.org Roll Flutter Engine from bedafa8794b6 to e21208583956 (1 revision) (flutter/flutter#142483) 2024-01-29 43054281+camsim99@users.noreply.github.com Revert "Reland: "Fix how Gradle resolves Android plugin" (#137115)" (flutter/flutter#142464) 2024-01-29 fluttergithubbot@gmail.com 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 rmistry@google.com,stuartmorgan@google.com 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

Revert "Reland: "Fix how Gradle resolves Android plugin" (flutter#137115

b27ae7f

)" This reverts commit f5ac225.

github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Jan 29, 2024

camsim99 added 3 commits January 29, 2024 10:54

Delete test added in PR

eff14aa

Merge remote-tracking branch 'upstream/master' into test_revert_137115

6cda012

fix hello world

67e1202

bartekpacia mentioned this pull request Jan 29, 2024

Migrate examples/hello_world Android app to Gradle Kotlin DSL #142300

Closed

camsim99 mentioned this pull request Jan 29, 2024

Revert "Reland: "Fix how Gradle resolves Android plugin" (#137115)" #142266

Closed

8 tasks

Revert "fix hello world"

19b57f8

This reverts commit 67e1202.

camsim99 marked this pull request as ready for review January 29, 2024 19:35

camsim99 requested review from bartekpacia and reidbaker January 29, 2024 19:36

bartekpacia reviewed Jan 29, 2024

View reviewed changes

Remove code mistakenly removed in merge

5da22f3

reidbaker approved these changes Jan 29, 2024

View reviewed changes

camsim99 mentioned this pull request Jan 29, 2024

[Android] Re-land flutter.groovy logic needed to support Gradle Kotlin DSL #142487

Closed

2 tasks

camsim99 added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 29, 2024

auto-submit bot merged commit 995e3fa into flutter:master Jan 29, 2024
118 checks passed

Gustl22 mentioned this pull request Jan 30, 2024

Reland (2): "Fix how Gradle resolves Android plugin" #142498

Merged

8 tasks

engine-flutter-autoroll mentioned this pull request Jan 30, 2024

Roll Flutter from 2f6fdf2650d4 to ccb2b4439a43 (68 revisions) flutter/packages#6014

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 30, 2024

995e3fad7 Revert "Reland: "Fix how Gradle resolves Android plugin" (#…

56d41d0

…137115)" (flutter/flutter#142464)

engine-flutter-autoroll mentioned this pull request Jan 30, 2024

Roll Flutter from 2f6fdf2650d4 to 72dc162ff052 (69 revisions) flutter/packages#6015

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 30, 2024

995e3fad7 Revert "Reland: "Fix how Gradle resolves Android plugin" (#…

a22a70a

…137115)" (flutter/flutter#142464)

engine-flutter-autoroll mentioned this pull request Jan 30, 2024

Roll Flutter from ace9181172b6 to 461f0bfb4b84 (13 revisions) flutter/packages#6016

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 30, 2024

995e3fad7 Revert "Reland: "Fix how Gradle resolves Android plugin" (#…

74af65b

…137115)" (flutter/flutter#142464)

engine-flutter-autoroll mentioned this pull request Jan 30, 2024

Roll Flutter from ace9181172b6 to 75a2e5b4932a (16 revisions) flutter/packages#6017

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 30, 2024

995e3fad7 Revert "Reland: "Fix how Gradle resolves Android plugin" (#…

c81345c

…137115)" (flutter/flutter#142464)

Gustl22 added a commit to Gustl22/flutter that referenced this pull request Feb 2, 2024

Revert "Revert "Reland: "Fix how Gradle resolves Android plugin" (flu…

309767c

…tter#137115)" (flutter#142464)" This reverts commit 995e3fa.

auto-submit bot pushed a commit that referenced this pull request Feb 19, 2024

Reland (2): "Fix how Gradle resolves Android plugin" (#142498)

9620e3f

Previous PR: #137115, Revert: #142464 Fixes #141940 Closes #142487

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revert "Reland: "Fix how Gradle resolves Android plugin" (#137115)" #142464

Revert "Reland: "Fix how Gradle resolves Android plugin" (#137115)" #142464

Revert "Reland: "Fix how Gradle resolves Android plugin" (#137115)" #142464

Revert "Reland: "Fix how Gradle resolves Android plugin" (#137115)" #142464

Conversation

Pre-launch Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment