[Android] Fix integration test to check if dev dependencies are removed from release builds + address no non-dev dependency plugin edge case #161826

camsim99 · 2025-01-17T19:25:43Z

Makes the following change to fix the case where dev dependencies are stripped in apps that only contain dev dependencies:

Changes the Flutter Gradle plugin to add the Flutter embedding as a direct dependency of a Flutter app if it contains no plugins that would include it transitively (this excludes dev dependencies in release builds)

Makes the following changes to correct + improve the integration test that checks if dev dependencies are stripped from release builds:

Fixes the plugin that was supposed to be as dev dependency to actually be a dev dependency
Changes the test structure to check the output of ./gradlew app:dependencies (see more details on this call) instead of the classes included in the APK. Checking the APK was leading us astray because it appears obfuscation occurs for release builds.
Adds more sections, comments, etc.

Fixes #161780.

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.

…sting sections, get rid of line space in flutter.groovy

camsim99 · 2025-01-22T20:24:59Z

dev/devicelab/bin/tasks/android_release_builds_exclude_dev_dependencies_test.dart

+          final RegExp regExpToMatchDevDependencyPlugin = RegExp(
+            r'--- project :dev_dependency_plugin',
+          );
+          final RegExp regExpToMatchDevDependencyPluginWithTransitiveDependencies = RegExp(
+            r'--- project :dev_dependency_plugin\n(\s)*\+--- org.jetbrains.kotlin.*\s\(\*\)\n(\s)*\\---\sio.flutter:flutter_embedding_' +
+                buildMode,
+          );


If there's any feedback on the regex I used please let me know! My intention was to make the check for release builds much looser in case the dev dependency is included in some way we don't expect. The other builds should always include the dev dependency plugin that depends on the Flutter embedding and because the default language is Kotlin (I think?), the Kotlin plugin as well.

I can include sample outputs here if helpful for review.

Seems reasonable for now.

camsim99 · 2025-01-22T23:20:19Z

Sorry didn't mean to leave this as a draft :)

matanlurey

LGTM! I did not have a chance to try this locally but I trust you did :)

camsim99 · 2025-01-27T22:48:12Z

I did test it locally :) but in an effort to catch any outstanding issued I merged this with #160289 to see what happened. There are failures. They seem unrelated, but just going to double check before I cause a regression for modules.

matanlurey · 2025-01-27T23:05:19Z

I did test it locally :) but in an effort to catch any outstanding issued I merged this with #160289 to see what happened. There are failures. They seem unrelated, but just going to double check before I cause a regression for modules.

These look like "good" failures (https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8724551273408643713/+/u/run_test.dart_for_tool_tests_shard_and_subshard_commands/stdout), that is, they would be fixed by #160289.

camsim99 · 2025-01-27T23:10:07Z

Hmm but I merged this PR with that one to get those failures? Can you elaborate on why you think it might have fixed that failure?

matanlurey · 2025-01-27T23:18:40Z

Hmm but I merged this PR with that one to get those failures? Can you elaborate on why you think it might have fixed that failure?

Shoot, I mis-remembered patching those tests to read from the right directory.

I'll send you a PR instead.

matanlurey · 2025-01-27T23:47:09Z

#162289

@camsim99

…#162289) @camsim99 discovered these would fail here: #161826 (comment). This fixes in preparation for the flag flipping, and also fixes a bug in resolving `synthetic-package` I missed (it _can't_ be true if `--explicit-package-dependencies` is set).

camsim99 · 2025-01-29T18:32:56Z

Updated #162262 to check out the state of things before landing.

Specifically wanna debug https://github.com/flutter/flutter/pull/162262/checks?check_run_id=36373107100. I tested on master a few days ago and it also failed (but different error). Just want to make sure this is not related.

Update: there are failures but I'm confident this change needs to land anyway and the ones I'm concerned about passed on this PR.

…re removed from release builds + address no non-dev dependency plugin edge case (flutter/flutter#161826)

matanlurey and others added 4 commits January 17, 2025 11:22

Dartfmt.

317a0a4

Update lockfiles.

a820883

Finish upating lockfiles at HEAD.

a46e32b

add base fixes

b5c8bd7

camsim99 marked this pull request as draft January 17, 2025 19:25

camsim99 added 2 commits January 17, 2025 11:58

undo features changes

757eb38

undo lockfile changes, change regexp to be more specific, add more te…

0bebb42

…sting sections, get rid of line space in flutter.groovy

github-actions bot removed a: tests "flutter test", flutter_test, or one of our tests framework flutter/packages/flutter repository. See also f: labels. f: integration_test The flutter/packages/integration_test plugin labels Jan 22, 2025

camsim99 added 4 commits January 22, 2025 11:46

undo more lockfiles

764ef0e

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

8fe6c89

self review

b97fca1

avoid duplicate embedding dependencies

edcd306

camsim99 commented Jan 22, 2025

View reviewed changes

camsim99 requested a review from matanlurey January 22, 2025 23:00

camsim99 marked this pull request as ready for review January 22, 2025 23:10

matanlurey approved these changes Jan 24, 2025

View reviewed changes

matanlurey mentioned this pull request Jan 27, 2025

Fix tests to prepare for --explicit-package-dependencies and a bug. #162289

Merged

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

auto-submit bot added this pull request to the merge queue Jan 29, 2025

Merged via the queue into flutter:master with commit 522eda0 Jan 29, 2025
167 checks passed

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

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

Roll Flutter from b007899d3a7a to 3e3bb9fdd586 (17 revisions) flutter/packages#8535

Closed

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

Roll Flutter from b007899d3a7a to 1dd3f5d45bff (18 revisions) flutter/packages#8536

Closed

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

Roll Flutter from b007899d3a7a to fffbf663ff34 (19 revisions) flutter/packages#8537

Closed

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

Roll Flutter from b007899d3a7a to 1eecbf12568d (20 revisions) flutter/packages#8538

Closed

sigurdm mentioned this pull request Feb 3, 2025

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

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Android] Fix integration test to check if dev dependencies are removed from release builds + address no non-dev dependency plugin edge case #161826

[Android] Fix integration test to check if dev dependencies are removed from release builds + address no non-dev dependency plugin edge case #161826

Uh oh!

camsim99 commented Jan 17, 2025 •

edited

Loading

Uh oh!

camsim99 Jan 22, 2025

Uh oh!

matanlurey Jan 22, 2025

Uh oh!

camsim99 commented Jan 22, 2025

Uh oh!

matanlurey left a comment

Uh oh!

camsim99 commented Jan 27, 2025

Uh oh!

matanlurey commented Jan 27, 2025

Uh oh!

camsim99 commented Jan 27, 2025

Uh oh!

matanlurey commented Jan 27, 2025

Uh oh!

matanlurey commented Jan 27, 2025

Uh oh!

camsim99 commented Jan 29, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

[Android] Fix integration test to check if dev dependencies are removed from release builds + address no non-dev dependency plugin edge case #161826

[Android] Fix integration test to check if dev dependencies are removed from release builds + address no non-dev dependency plugin edge case #161826

Uh oh!

Conversation

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

Uh oh!

Pre-launch Checklist

Uh oh!

camsim99 Jan 22, 2025

Choose a reason for hiding this comment

Uh oh!

matanlurey Jan 22, 2025

Choose a reason for hiding this comment

Uh oh!

camsim99 commented Jan 22, 2025

Uh oh!

matanlurey left a comment

Choose a reason for hiding this comment

Uh oh!

camsim99 commented Jan 27, 2025

Uh oh!

matanlurey commented Jan 27, 2025

Uh oh!

camsim99 commented Jan 27, 2025

Uh oh!

matanlurey commented Jan 27, 2025

Uh oh!

matanlurey commented Jan 27, 2025

Uh oh!

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

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

camsim99 commented Jan 17, 2025 •

edited

Loading

camsim99 commented Jan 29, 2025 •

edited

Loading