[Android] Actually remove dev dependencies from release builds #161343

camsim99 · 2025-01-08T23:17:40Z

Makes a number of fixes:

Fixes Groovy logic that attempted to remove dev dependencies from release builds to use <buildType>Api versus api and loop to configure the project dependencies per build type
Adds back dependency on embedding to plugin projects since this is needed regardless (the plugin may not be included in a particularly typed build but it still needs it for where it's included)
Fixes integration test to throw and error upon failure, check right APK for the release build it's testing, and configure the flag need for .flutter-plugin-dependencies to mark plugins as dev dependencies as expected
Uses @matanlurey's patch to remove dev dependency from the GeneratedPluginRegistrant in release mode

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.
I followed the breaking change policy and added Data Driven Fixes where supported.
All existing and new tests are passing.

camsim99 · 2025-01-08T23:36:25Z

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

+            profile {
+                initWith(debug)
+                if (it.hasProperty("matchingFallbacks")) {
+                    matchingFallbacks = ["debug", "release"]


I'm not 100% confident on this. TLDR is that the profile mode has to exist in order for us to specify profileApi, but typically it's defined after this method is called. I added it redundantly here to make sure it exists before. I left the other one because I assume it needs it for the case where there are no plugins, but I'll double check.

If you intend to double check before submitting, ACK, otherwise let's add a TODO/GH issue as well before submitting.

oh ack! I checked. I think based on how other things are written in the plugin, this should be fine.

Had an idea to slightly clean this up so gonna do that before this lands. I'll also cleanup the logic below.

matanlurey

In general looks good, one required change and one change or TODO, your choice.

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

packages/flutter_tools/lib/src/flutter_plugins.dart

matanlurey

LGTM, 1 more question that can be ACK'd or TODOd.

matanlurey · 2025-01-09T00:04:12Z

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

+            profile {
+                initWith(debug)
+                if (it.hasProperty("matchingFallbacks")) {
+                    matchingFallbacks = ["debug", "release"]


If you intend to double check before submitting, ACK, otherwise let's add a TODO/GH issue as well before submitting.

auto-submit · 2025-01-09T01:12:22Z

auto label is removed for flutter/flutter/161343, due to - The status or check suite Linux mac_android_aot_engine has failed. Please fix the issues identified (or deflake) before re-applying this label.

The status or check suite Merge Queue Guard has failed. Please fix the issues identified (or deflake) before re-applying this label.

camsim99 · 2025-01-09T23:37:59Z

The Linux gradle_plugin_light_apk_tests is a legit failure that means this fix requires more work. We need to make sure the plugin dependency is added to for any custom build type a developer may specify to land this.

matanlurey · 2025-01-09T23:53:41Z

We need to make sure the plugin dependency is added to for any custom build type a developer may specify to land this.

Can you expand on that? What is a "custom build type", you mean something other than debug/profile/release?

camsim99 · 2025-01-09T23:57:36Z

Can you expand on that? What is a "custom build type", you mean something other than debug/profile/release?

Yeah. The test that is failing uses a custom local build type:

flutter/dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart

Lines 160 to 187 in 3fbabb8

    
           await runProjectTest((FlutterProject project) async { 
        
             section('gradlew assembleLocal with plugin (custom debug build)'); 
        
             final Directory tempDir = Directory.systemTemp.createTempSync('flutter_plugin.'); 
        
             final Directory pluginDir = Directory(path.join(tempDir.path, 'plugin_under_test')); 
        
             section('Create plugin'); 
        
             await inDirectory(tempDir, () async { 
        
               await flutter( 
        
                 'create', 
        
                 options: <String>[ 
        
                   '--org', 
        
                   'io.flutter.devicelab.plugin', 
        
                   '--template=plugin', 
        
                   '--platforms=android,ios', 
        
                   pluginDir.path, 
        
                 ], 
        
               ); 
        
             }); 
        
             section('Configure'); 
        
             await project.addPlugin('plugin_under_test', options: <String>['--path', pluginDir.path]); 
        
             await project.addCustomBuildType('local', initWith: 'debug'); 
        
             await project.getPackages(); 
        
             section('Build APK'); 
        
             await project.runGradleTask('assembleLocal'); 
        
           });

I believe what's happening is that we are not including the plugin dependency for the local build type. Though, the error doesn't immediately point to that:

e: file:///private/var/folders/v1/wpg85hbs16qd5b_x1c_l6nj400vh_3/T/flutter_devicelab_gradle_plugin_test.rIz5Zq/hello/android/app/src/main/kotlin/com/example/hello/MainActivity.kt:3:8 Unresolved reference: io
e: file:///private/var/folders/v1/wpg85hbs16qd5b_x1c_l6nj400vh_3/T/flutter_devicelab_gradle_plugin_test.rIz5Zq/hello/android/app/src/main/kotlin/com/example/hello/MainActivity.kt:5:22 Unresolved reference: FlutterActivity

camsim99 · 2025-01-10T00:04:20Z

I just tested my theory by including the plugin dependency for all build types and the test passed.

flutter/flutter#161343)

flutter/flutter@40c2b86...5517cc9 2025-01-15 [email protected] feat: Change default value of keyboardDismissBehavior (flutter/flutter#158580) 2025-01-15 [email protected] Roll pub packages (flutter/flutter#161680) 2025-01-15 [email protected] Revert "Autocomplete Options Width" (flutter/flutter#161666) 2025-01-15 [email protected] Update two_dimensional_scrollables triage routing (flutter/flutter#161667) 2025-01-15 [email protected] [DisplayList] Migrate from SkRSXform to Impeller RSTransform (flutter/flutter#161652) 2025-01-15 [email protected] Roll Packages from d1fd623 to f73cb00 (2 revisions) (flutter/flutter#161672) 2025-01-15 [email protected] Fix DropdownMenu isCollapsed decoration does not Reduce height (flutter/flutter#161427) 2025-01-15 [email protected] Manual roll of Skia to e7b8d078851f (flutter/flutter#161609) 2025-01-15 [email protected] Fix `TabBar` glitchy elastic `Tab` animation (flutter/flutter#161514) 2025-01-15 [email protected] Roll pub packages (flutter/flutter#161643) 2025-01-15 [email protected] Exclude the top-level `engine` directory from `generate_gradle_lockfiles`. (flutter/flutter#161635) 2025-01-15 [email protected] Roll pub packages (flutter/flutter#161632) 2025-01-15 [email protected] Refactor `android_engine_test`, make it easier to debug/deflake locally. (flutter/flutter#161534) 2025-01-15 [email protected] [Impeller] null check device buffer in image encoding. (flutter/flutter#161194) 2025-01-15 [email protected] Feature/twitter keyboard (flutter/flutter#161025) 2025-01-15 [email protected] Fixed XiaoMi statusBar Bug (flutter/flutter#161271) 2025-01-15 [email protected] Clean up engine's analysis_options.yaml (flutter/flutter#161554) 2025-01-14 [email protected] Remove `gradle_deprecated_settings` test app, and remove reference from lockfile exclusion yaml (flutter/flutter#161622) 2025-01-14 [email protected] [deps] remove no-longer-used repo deps (flutter/flutter#161605) 2025-01-14 [email protected] [DisplayList] remove obsolete use of Skia goemetry objects in DL utils (flutter/flutter#161553) 2025-01-14 [email protected] [Engine] Support asymmetrical rounded superellipses (flutter/flutter#161409) 2025-01-14 [email protected] [SwiftPM] Make 'flutter build ios-framework' generate an empty Package.swift (flutter/flutter#161464) 2025-01-14 [email protected] [canvaskit] Fix GIF decode failure (flutter/flutter#161536) 2025-01-14 [email protected] [Impeller] fixes for AHB swapchains. (flutter/flutter#161562) 2025-01-14 [email protected] Last Engine<>Framework lint sync (flutter/flutter#161560) 2025-01-14 [email protected] Check that localization files of stocks app are up-to-date (flutter/flutter#161608) 2025-01-14 [email protected] [Android] Actually remove dev dependencies from release builds (flutter/flutter#161343) 2025-01-14 [email protected] Update package revisions to latest (flutter/flutter#161525) 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] 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

flutter/flutter#161343)

flutter/flutter@40c2b86...5517cc9 2025-01-15 [email protected] feat: Change default value of keyboardDismissBehavior (flutter/flutter#158580) 2025-01-15 [email protected] Roll pub packages (flutter/flutter#161680) 2025-01-15 [email protected] Revert "Autocomplete Options Width" (flutter/flutter#161666) 2025-01-15 [email protected] Update two_dimensional_scrollables triage routing (flutter/flutter#161667) 2025-01-15 [email protected] [DisplayList] Migrate from SkRSXform to Impeller RSTransform (flutter/flutter#161652) 2025-01-15 [email protected] Roll Packages from d1fd623 to f73cb00 (2 revisions) (flutter/flutter#161672) 2025-01-15 [email protected] Fix DropdownMenu isCollapsed decoration does not Reduce height (flutter/flutter#161427) 2025-01-15 [email protected] Manual roll of Skia to e7b8d078851f (flutter/flutter#161609) 2025-01-15 [email protected] Fix `TabBar` glitchy elastic `Tab` animation (flutter/flutter#161514) 2025-01-15 [email protected] Roll pub packages (flutter/flutter#161643) 2025-01-15 [email protected] Exclude the top-level `engine` directory from `generate_gradle_lockfiles`. (flutter/flutter#161635) 2025-01-15 [email protected] Roll pub packages (flutter/flutter#161632) 2025-01-15 [email protected] Refactor `android_engine_test`, make it easier to debug/deflake locally. (flutter/flutter#161534) 2025-01-15 [email protected] [Impeller] null check device buffer in image encoding. (flutter/flutter#161194) 2025-01-15 [email protected] Feature/twitter keyboard (flutter/flutter#161025) 2025-01-15 [email protected] Fixed XiaoMi statusBar Bug (flutter/flutter#161271) 2025-01-15 [email protected] Clean up engine's analysis_options.yaml (flutter/flutter#161554) 2025-01-14 [email protected] Remove `gradle_deprecated_settings` test app, and remove reference from lockfile exclusion yaml (flutter/flutter#161622) 2025-01-14 [email protected] [deps] remove no-longer-used repo deps (flutter/flutter#161605) 2025-01-14 [email protected] [DisplayList] remove obsolete use of Skia goemetry objects in DL utils (flutter/flutter#161553) 2025-01-14 [email protected] [Engine] Support asymmetrical rounded superellipses (flutter/flutter#161409) 2025-01-14 [email protected] [SwiftPM] Make 'flutter build ios-framework' generate an empty Package.swift (flutter/flutter#161464) 2025-01-14 [email protected] [canvaskit] Fix GIF decode failure (flutter/flutter#161536) 2025-01-14 [email protected] [Impeller] fixes for AHB swapchains. (flutter/flutter#161562) 2025-01-14 [email protected] Last Engine<>Framework lint sync (flutter/flutter#161560) 2025-01-14 [email protected] Check that localization files of stocks app are up-to-date (flutter/flutter#161608) 2025-01-14 [email protected] [Android] Actually remove dev dependencies from release builds (flutter/flutter#161343) 2025-01-14 [email protected] Update package revisions to latest (flutter/flutter#161525) 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] 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

camsim99 added 2 commits December 26, 2024 07:47

debugging

156559b

Add fixes

e7c8cc1

github-actions bot added platform-android Android applications specifically tool Affects the "flutter" command-line tool. See also t: labels. labels Jan 8, 2025

camsim99 added 4 commits January 8, 2025 15:20

Cleanup

09012a3

Add helpful comment

b8fb125

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

5338345

remove line

3d6041c

camsim99 requested a review from matanlurey January 8, 2025 23:32

camsim99 commented Jan 8, 2025

View reviewed changes

matanlurey requested changes Jan 8, 2025

View reviewed changes

packages/flutter_tools/lib/src/runner/flutter_command.dart Outdated Show resolved Hide resolved

packages/flutter_tools/lib/src/flutter_plugins.dart Show resolved Hide resolved

camsim99 added 2 commits January 8, 2025 15:45

Gate config

275c277

format

7a44663

camsim99 requested a review from matanlurey January 8, 2025 23:49

camsim99 mentioned this pull request Jan 8, 2025

Remove dev_dependencys from generated plugin registrants on all platforms #161348

Closed

add todo

2900645

matanlurey approved these changes Jan 9, 2025

View reviewed changes

use flag

b953149

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

auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jan 9, 2025

camsim99 added 5 commits January 9, 2025 10:54

cleanup

f686e37

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

8776a4f

Add back context in comment

68d9c13

fix analyze

1d9914c

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

fa09ae5

This was referenced Jan 16, 2025

Roll Flutter from 40c2b86fdf65 to 5517cc9b3b3b (28 revisions) flutter/packages#8442

Closed

Roll Flutter from 40c2b86fdf65 to 5517cc9b3b3b (28 revisions) flutter/packages#8443

Closed

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

818133b [Android] Actually remove dev dependencies from release builds (

06d6ee6

flutter/flutter#161343)

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

818133b [Android] Actually remove dev dependencies from release builds (

b8a7a1e

flutter/flutter#161343)

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

818133b [Android] Actually remove dev dependencies from release builds (

f121e35

flutter/flutter#161343)

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

818133b [Android] Actually remove dev dependencies from release builds (

b767db1

flutter/flutter#161343)

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

818133b [Android] Actually remove dev dependencies from release builds (

432f180

flutter/flutter#161343)

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

818133b [Android] Actually remove dev dependencies from release builds (

703cc96

flutter/flutter#161343)

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

818133b [Android] Actually remove dev dependencies from release builds (

739bcbd

flutter/flutter#161343)

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

818133b [Android] Actually remove dev dependencies from release builds (

dd3bedd

flutter/flutter#161343)

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

818133b [Android] Actually remove dev dependencies from release builds (

bb6cf80

flutter/flutter#161343)

camsim99 mentioned this pull request Jan 17, 2025

Removes dev dependencies from generated plugin registrant for non-Android platforms #161828

Merged

9 tasks

sigurdm mentioned this pull request Feb 3, 2025

Only bundle assets and plugins from transitive closure of dependencies #160443

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 12, 2025

818133b [Android] Actually remove dev dependencies from release builds (

0497172

flutter/flutter#161343)

emakar mentioned this pull request Feb 13, 2025

Patrol is built into a release app, even when it is a dev_dependency leancodepl/patrol#681

Open

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 13, 2025

818133b [Android] Actually remove dev dependencies from release builds (

e8432c6

flutter/flutter#161343)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 13, 2025

818133b [Android] Actually remove dev dependencies from release builds (

14e3ff3

flutter/flutter#161343)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 6, 2025

818133b [Android] Actually remove dev dependencies from release builds (

22ec3ea

flutter/flutter#161343)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 7, 2025

818133b [Android] Actually remove dev dependencies from release builds (

e6c9cb3

flutter/flutter#161343)

seungsoo47 mentioned this pull request Apr 29, 2025

Remove dev dependencies from release builds flutter-tizen/flutter-tizen#621

Merged

[Android] Actually remove dev dependencies from release builds #161343

[Android] Actually remove dev dependencies from release builds #161343

Uh oh!

Conversation

camsim99 commented Jan 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

camsim99 Jan 8, 2025

Choose a reason for hiding this comment

Uh oh!

matanlurey Jan 9, 2025

Choose a reason for hiding this comment

Uh oh!

camsim99 Jan 9, 2025

Choose a reason for hiding this comment

Uh oh!

camsim99 Jan 9, 2025 • 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!

matanlurey left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

matanlurey left a comment

Choose a reason for hiding this comment

Uh oh!

matanlurey Jan 9, 2025

Choose a reason for hiding this comment

Uh oh!

auto-submit bot commented Jan 9, 2025

Uh oh!

camsim99 commented Jan 9, 2025

Uh oh!

matanlurey commented Jan 9, 2025

Uh oh!

camsim99 commented Jan 9, 2025

Uh oh!

camsim99 commented Jan 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

camsim99 commented Jan 8, 2025 •

edited

Loading

camsim99 Jan 9, 2025 •

edited

Loading