Migrate template to Gradle 6.7 and AGP 4.1.0 #70808

blasten · 2020-11-19T02:42:52Z

Description

Makes the plugin and the tool compatible with the latest release of AGP version, and Gradle.
Migrates the template files for apps, plugins and modules.
Migrates files in the Flutter repo.

Related Issues

Fixes #58247
Fixes #49438

Tests

I added the following tests: unit & e2e tests

Checklist

Before you create this PR, confirm that it meets all requirements listed below by checking the relevant checkboxes ([x]). This will ensure a smooth and quick review process.

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I signed the CLA.
I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I updated/added relevant documentation (doc comments with ///).
All existing and new tests are passing.
The analyzer (flutter analyze --flutter-repo) does not report any problems on my PR.
I am willing to follow-up on review comments in a timely manner.

Breaking Change

Did any tests fail when you ran them? Please read Handling breaking changes.

No, no existing tests failed, so this is not a breaking change.
Yes, this is a breaking change. If not, delete the remainder of this section.
- I wrote a design doc: https://flutter.dev/go/template Replace this with a link to your design doc's short link
- I got input from the developer relations team, specifically from: Replace with the names of who gave advice
- I wrote a migration guide: https://flutter.dev/go/breaking-changes-template Replace this with a link to a pull request that adds the migration guide to https://flutter.dev/docs/release/breaking-changes

Zazo032 · 2020-11-19T08:45:21Z

@blasten latest available versions right now are 6.7.1 for Gradle and 4.1.1 for AGP, just in case you want to update it to latest available patch

xster · 2020-11-20T05:46:51Z

dev/benchmarks/complex_layout/android/app/build.gradle

-    lintOptions {
-        disable 'InvalidPackage'
-    }
+    compileSdkVersion 30


this is ok but just for my understanding, this is orthogonal to a agp move right?

that's true

xster · 2020-11-20T05:47:22Z

dev/benchmarks/complex_layout/android/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8=true


can you elaborate? Or is this just to save time since no one is shipping it?

R8 has become the default in this AGP version. Having this causes a warning.

got it, thanks

xster · 2020-11-20T05:48:11Z

...adle_deprecated_settings/android/app/src/main/java/com/yourcompany/flavors/MainActivity.java

 import io.flutter.plugins.GeneratedPluginRegistrant;

 public class MainActivity extends FlutterActivity {
  @Override
  protected void onCreate(Bundle savedInstanceState) {
    super.onCreate(savedInstanceState);
    GeneratedPluginRegistrant.registerWith(this);
-    new MethodChannel(getFlutterView(), "flavor").setMethodCallHandler(new MethodChannel.MethodCallHandler() {


it's a small clean up. This isn't used by the test, and was causing some warnings.

xster

woohoo! Amazing

xster · 2020-11-20T05:56:13Z

packages/flutter_tools/gradle/flutter.gradle

-                    // This way, custom Proguard rules can be configured as needed.
-                    proguardFiles project.android.getDefaultProguardFile("proguard-android.txt"), flutterProguardRules, "proguard-rules.pro"
-                }
+        String flutterProguardRules = Paths.get(flutterRoot.absolutePath, "packages", "flutter_tools",


is that what the enable r8 thing is? We're just making it unconditional?

This is one is about removing the need to make this conditional via a Flutter tool flag. That isn't needed. Users shouldn't disable this in release, but if they really want, they can always do it in build.gradle.

xster · 2020-11-20T05:58:12Z

packages/flutter_tools/gradle/flutter.gradle

+        String flutterProguardRules = Paths.get(flutterRoot.absolutePath, "packages", "flutter_tools",
+                "gradle", "flutter_proguard_rules.pro")
+        project.android.buildTypes {
+            release {


what levers are we giving for custom build types?

when users create custom types, we should document what the right approach is to have the correct default settings associated. e.g. recommend

production { initWith release }

rather than making one from scratch

I don't think we are doing anything special, other than profile.

release is an official build type provided by the Android plugin. I think the Flutter docs can link to https://developer.android.com/studio/build/build-variants.

xster · 2020-11-20T05:59:31Z

packages/flutter_tools/gradle/flutter.gradle

+        return target
+    }
+
+    // In AGP 4.0, the Android linter task depends on all the JAR tasks containing `libapp.so`.


Didn't understand this sentence :)

I changed the sentence a bit. #58247 (comment)

xster · 2020-11-20T06:01:04Z

packages/flutter_tools/gradle/flutter.gradle

+                    // 3. Otherwise, the equivalent Flutter variant is `release`.
+                    String variantBuildMode = buildModeFor(libraryVariant.buildType)
+                    if (buildModeFor(appProjectVariant.buildType) != variantBuildMode) {
+                        return


Can we print a message here? I always found the mismatch error a bit cryptic.

This is during configuration phase. It could be quite spammy, and not very meaningful for debugging. What's the user story?

Maybe I'm thinking of something else. In Android Studio, open build variants tab in case of gradle subproject integration, pick one variant for the app and another variant for the flutter module.

xster · 2020-11-20T06:01:55Z

packages/flutter_tools/lib/src/runner/flutter_command.dart

-            'To learn more, see: https://developer.android.com/studio/build/shrink-code',
-      );
+      hide: true,
+      help: 'This flag is deprecated.'


Describe a bit more what now happens

xster · 2020-11-20T06:02:37Z

packages/integration_test/example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip


can we add another test to make sure the whole thing builds with gradle 5 / agp 3?

that is already the case in the customer tests

which customer tests are you referring to?

https://github.com/flutter/tests/tree/master/registry - Although, it looks like we don't build apk in any of those. I will add one that does it.

Filed #70964. Gradle 5.* is currently tested by building the Flutter Gallery demo app.

xster · 2020-11-20T06:04:36Z

@csells could be worth calling this out on the next stable blog

xster

LGTM 🤞

amirh · 2020-11-23T18:51:51Z

This broke flutter/plugins, see: https://cirrus-ci.com/task/6538283054268416

This reverts commit 8e73bab.

gustav3d · 2020-11-23T22:34:42Z

So instead of fiximg the boken plugin https://cirrus-ci.com/task/6538283054268416, you revert this?!

amirh · 2020-11-23T22:46:18Z

@gustav3d per https://github.com/flutter/flutter/wiki/Tree-hygiene if a commit breaks a tree it should be first reverted, no questions asked, then it should be re-landed with the issue figured.

This reverts commit 7df04fd.

Migrate template to Gradle 6.7 and AGP 4.1.0

79dc4e1

google-cla bot added the cla: yes label Nov 19, 2020

Default version

803e5c0

Emmanuel Garcia added 12 commits November 19, 2020 10:46

Review with the AGP team

2c841f1

R8 is now enabled by default in AGP

b474d5e

Remove trailing blank line

cf71916

registerPreJavacGeneratedBytecode does not include libapp.so

f0dd051

Plugin configuration needs afterEvaluate

21ada1f

Target SDK version 30

aa49c71

AGP doesn't include precise error

fb12968

Merge branch 'master' into gradle_6_0

a82575c

Remove tests

a9e3090

Fix tests

9894b7c

Fix modules

b6aeb2b

Address flavors in add-to-app host app

af65492

blasten force-pushed the gradle_6_0 branch from 1828721 to 5b04a4a Compare November 20, 2020 03:59

Fix custom build types in add-to-app

7059c8c

blasten force-pushed the gradle_6_0 branch from 5b04a4a to 7059c8c Compare November 20, 2020 04:39

blasten requested review from xster and jason-simmons November 20, 2020 05:36

xster reviewed Nov 20, 2020

View reviewed changes

Comments

efb59bb

blasten requested a review from xster November 20, 2020 16:41

Add comment about 7.0

b600e63

xster approved these changes Nov 20, 2020

View reviewed changes

blasten merged commit 8e73bab into flutter:master Nov 20, 2020

blasten deleted the gradle_6_0 branch November 20, 2020 21:05

amirh added a commit that referenced this pull request Nov 23, 2020

Revert "Migrate template to Gradle 6.7 and AGP 4.1.0 (#70808)"

760049e

This reverts commit 8e73bab.

amirh mentioned this pull request Nov 23, 2020

Revert "Migrate template to Gradle 6.7 and AGP 4.1.0" #71096

Merged

amirh added a commit that referenced this pull request Nov 23, 2020

Revert "Migrate template to Gradle 6.7 and AGP 4.1.0 (#70808)" (#71096)

7df04fd

This reverts commit 8e73bab.

This was referenced Nov 24, 2020

flutter build apk fails on an app using Android Gradle plugin 4.0 #58247

Closed

Upgrade the Gradle version in the project template #49438

Closed

pedromassangocode mentioned this pull request Nov 25, 2020

add new version gradle to gradle-wrapper #71226

Closed

blasten pushed a commit to blasten/flutter that referenced this pull request Nov 30, 2020

Reland "Migrate template to Gradle 6.7 and AGP 4.1.0 (flutter#70808)"

aa04d01

This reverts commit 7df04fd.

blasten mentioned this pull request Nov 30, 2020

Relands: Migrate template to Gradle 6.7 and AGP 4.1.0 #71446

Merged

13 tasks

Migrate template to Gradle 6.7 and AGP 4.1.0 #70808

Migrate template to Gradle 6.7 and AGP 4.1.0 #70808

Uh oh!

Conversation

blasten commented Nov 19, 2020

Description

Related Issues

Tests

Checklist

Breaking Change

Uh oh!

Zazo032 commented Nov 19, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xster left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

blasten Nov 20, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

blasten Nov 20, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xster commented Nov 20, 2020

Uh oh!

xster left a comment

Choose a reason for hiding this comment

Uh oh!

amirh commented Nov 23, 2020

Uh oh!

gustav3d commented Nov 23, 2020

blasten Nov 20, 2020 •

edited

Loading

blasten Nov 20, 2020 •

edited

Loading