Change project.buildDir in standalone `subprojects` property #91030

littleGnAl · 2021-09-30T14:42:56Z

If there is a plugin project whose name is before 'app' (in lexicographical order), the project ':app' buildDir is not set correctly.

This PR revert the changes made by #77942, I'm not sure it's the right way to fix this issue, but I add a test for this case to ensure it works as expected.

List which issues are fixed by this PR. You must list at least one issue.

Fixed #91018

If you had to change anything in the flutter/tests repo, include a link to the migration guide as per the breaking change policy.

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.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

jmagman · 2021-09-30T23:56:36Z

@blasten

blasten · 2021-10-01T00:38:41Z

we need a test for this. would you be able to wire a plugin in the test that has the desired name?

The code below has an example about how to create a plugin in a test:

flutter/packages/flutter_tools/test/integration.shard/generated_plugin_registrant_test.dart

Line 76 in 34059ee

'--template=plugin',

littleGnAl · 2021-10-01T01:29:05Z

Hello @blasten, I have reused the android_plugin_example_app_build_test.dart, should I add a standalone integration.shard for this case?
https://github.com/flutter/flutter/pull/91030/files#diff-0a03b0a0c8e091b09635cd4d75bd08462084a15c4333fbc9fa95eab9bf2537e1R129-R130

littleGnAl · 2021-10-01T01:38:38Z

packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart

+    _createAndBuildPlugin('plugin_test');
+  });
+
+  test('plugin example android/app/build should not exists after flutter build', () async {


@blasten I have added a new test case here, should I move it to a standalone test file?

blasten · 2021-10-01T01:46:54Z

ah - that should work. does the test fail if you revert the changes to the template?

littleGnAl · 2021-10-01T01:50:49Z

ah - that should work. does the test fail if you revert the changes to the template?

@blasten It seems no

blasten

I see. Please verify the test fail without the fix

littleGnAl · 2021-10-01T02:17:00Z

@blasten The test fails without the fix.

➜  flutter_tools git:(littlegnal/fix-subprojects-builddir-not-correct-2) ../../bin/cache/dart-sdk/bin/pub run test /Users/fenglang/codes/source/flutter/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart
The top level `pub` command is deprecated. Use `dart pub` instead.
01:49 +1 -1: plugin example android/app/build should not exists after flutter build [E]
  Expected: false
    Actual: <true>

  package:test_api                                                          expect
  test/integration.shard/android_plugin_example_app_build_test.dart 72:5    main._createAndBuildPlugin
  test/integration.shard/android_plugin_example_app_build_test.dart 130:5   main.<fn>
  test/integration.shard/android_plugin_example_app_build_test.dart 129:82  main.<fn>
  test/src/common.dart 163:18                                               test.<fn>
  test/src/common.dart 159:5                                                test.<fn>

01:49 +1 -1: loading /Users/fenglang/codes/source/flutter/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart
Consider enabling the flag chain-stack-traces to receive more detailed exceptions.
For example, 'dart test --chain-stack-traces'.
01:49 +1 -1: Some tests failed.

diff --git a/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/build.gradle b/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/build.gradle
index 24047dce5d..ed45c65885 100644
--- a/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/build.gradle
+++ b/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/build.gradle
@@ -21,8 +21,6 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
     project.evaluationDependsOn(':app')
 }

littleGnAl · 2021-10-01T03:20:11Z

@blasten I finally move the test to a standalone file to fill more test cases, pls take a look again, thanks.

littleGnAl · 2021-10-01T03:29:48Z

The tests fail without this fix.

➜  flutter_tools git:(littlegnal/fix-subprojects-builddir-not-correct-2) ✗ ../../bin/cache/dart-sdk/bin/pub run test /Users/fenglang/codes/source/flutter/packages/flutter_tools/test/integration.shard/flutter_build_android_app_project_builddir_test.dart
The top level `pub` command is deprecated. Use `dart pub` instead.
01:08 +0 -1: android/app/build should not exists after flutter build apk [E]
  Expected: not a file system entity that exists
    Actual: LocalDirectory:<LocalDirectory: '/private/var/folders/gk/3g8dn2ys3nv01yxsd0j_1cz00000gr/T/flutter_flutter_plugin_test.tUCf5b/aaa/example/android/app/build'>

  package:test_api                                                                  expect
  test/integration.shard/flutter_build_android_app_project_builddir_test.dart 55:5  main._checkBuildDir
  test/integration.shard/flutter_build_android_app_project_builddir_test.dart 68:7  main.<fn>
  test/integration.shard/flutter_build_android_app_project_builddir_test.dart 60:5  main.<fn>
  test/src/common.dart 163:18                                                       test.<fn>
  test/src/common.dart 159:5                                                        test.<fn>

01:08 +0 -1: loading /Users/fenglang/codes/source/flutter/packages/flutter_tools/test/integration.shard/flutter_build_android_app_project_builddir_test.dart
Consider enabling the flag chain-stack-traces to receive more detailed exceptions.
For example, 'dart test --chain-stack-traces'.
01:47 +0 -2: android/app/build should not exists after flutter build appbundle [E]
  Expected: not a file system entity that exists
    Actual: LocalDirectory:<LocalDirectory: '/private/var/folders/gk/3g8dn2ys3nv01yxsd0j_1cz00000gr/T/flutter_flutter_plugin_test.D0m6sd/aaa/example/android/app/build'>

  package:test_api                                                                  expect
  test/integration.shard/flutter_build_android_app_project_builddir_test.dart 55:5  main._checkBuildDir
  test/integration.shard/flutter_build_android_app_project_builddir_test.dart 82:7  main.<fn>
  test/integration.shard/flutter_build_android_app_project_builddir_test.dart 74:5  main.<fn>
  test/src/common.dart 163:18                                                       test.<fn>
  test/src/common.dart 159:5                                                        test.<fn>

01:47 +0 -2: loading /Users/fenglang/codes/source/flutter/packages/flutter_tools/test/integration.shard/flutter_build_android_app_project_builddir_test.dart
Consider enabling the flag chain-stack-traces to receive more detailed exceptions.
For example, 'dart test --chain-stack-traces'.
01:47 +0 -2: Some tests failed.

diff --git a/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/build.gradle b/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/build.gradle
index 24047dce5d..ed45c65885 100644
--- a/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/build.gradle
+++ b/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/build.gradle
@@ -21,8 +21,6 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
     project.evaluationDependsOn(':app')
 }

blasten

nice! LGTM

gspencergoog · 2021-10-02T02:15:26Z

This appears to have broken the build. I'm going to try and revert and see if it fixes this.

…lutter#91030)" This reverts commit 1b73a35 because it appears to have broken the build.

gspencergoog · 2021-10-02T02:27:32Z

Actually, it doesn't appear to be the case: the revert PR failed too. Probably an infra issue.

…lutter#91030)" This reverts commit 1b73a35.

…1030)

google-cla bot added the cla: yes label Sep 30, 2021

littleGnAl commented Oct 1, 2021

View reviewed changes

blasten approved these changes Oct 1, 2021

View reviewed changes

blasten suggested changes Oct 1, 2021

View reviewed changes

Change project.buildDir in standalone subprojects property

4b5df4a

littleGnAl force-pushed the littlegnal/fix-subprojects-builddir-not-correct-2 branch from a6b5f9f to 4b5df4a Compare October 1, 2021 03:18

blasten approved these changes Oct 1, 2021

View reviewed changes

blasten added the waiting for tree to go green label Oct 1, 2021

fluttergithubbot merged commit 1b73a35 into flutter:master Oct 2, 2021

gspencergoog added a commit to gspencergoog/flutter that referenced this pull request Oct 2, 2021

Revert "Change project.buildDir in standalone subprojects property (f…

646ba1e

…lutter#91030)" This reverts commit 1b73a35 because it appears to have broken the build.

gspencergoog added a commit to gspencergoog/flutter that referenced this pull request Oct 2, 2021

Revert "Change project.buildDir in standalone subprojects property (f…

4af1bd6

…lutter#91030)" This reverts commit 1b73a35.

littleGnAl deleted the littlegnal/fix-subprojects-builddir-not-correct-2 branch October 7, 2021 04:41

clocksmith pushed a commit to clocksmith/flutter that referenced this pull request Oct 29, 2021

Change project.buildDir in standalone subprojects property (flutter#9…

1955246

…1030)

bartekpacia mentioned this pull request May 6, 2024

android/build.gradle template: merge subprojects {} blocks together #147868

Closed

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Change project.buildDir in standalone `subprojects` property #91030

Change project.buildDir in standalone `subprojects` property #91030

Uh oh!

littleGnAl commented Sep 30, 2021 •

edited by bartekpacia

Loading

Uh oh!

jmagman commented Sep 30, 2021

Uh oh!

blasten commented Oct 1, 2021

Uh oh!

littleGnAl commented Oct 1, 2021

Uh oh!

littleGnAl Oct 1, 2021

Uh oh!

blasten commented Oct 1, 2021

Uh oh!

littleGnAl commented Oct 1, 2021

Uh oh!

blasten left a comment

Uh oh!

littleGnAl commented Oct 1, 2021

Uh oh!

littleGnAl commented Oct 1, 2021

Uh oh!

littleGnAl commented Oct 1, 2021

Uh oh!

blasten left a comment

Uh oh!

gspencergoog commented Oct 2, 2021

Uh oh!

gspencergoog commented Oct 2, 2021

Uh oh!

Uh oh!

Change project.buildDir in standalone subprojects property #91030

Change project.buildDir in standalone subprojects property #91030

Uh oh!

Conversation

littleGnAl commented Sep 30, 2021 • edited by bartekpacia Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

jmagman commented Sep 30, 2021

Uh oh!

blasten commented Oct 1, 2021

Uh oh!

littleGnAl commented Oct 1, 2021

Uh oh!

littleGnAl Oct 1, 2021

Choose a reason for hiding this comment

Uh oh!

blasten commented Oct 1, 2021

Uh oh!

littleGnAl commented Oct 1, 2021

Uh oh!

blasten left a comment

Choose a reason for hiding this comment

Uh oh!

littleGnAl commented Oct 1, 2021

Uh oh!

littleGnAl commented Oct 1, 2021

Uh oh!

littleGnAl commented Oct 1, 2021

Uh oh!

blasten left a comment

Choose a reason for hiding this comment

Uh oh!

gspencergoog commented Oct 2, 2021

Uh oh!

gspencergoog commented Oct 2, 2021

Uh oh!

Uh oh!

Change project.buildDir in standalone `subprojects` property #91030

Change project.buildDir in standalone `subprojects` property #91030

littleGnAl commented Sep 30, 2021 •

edited by bartekpacia

Loading