[various] Adds Android namespace #3791

stuartmorgan-g · 2023-04-21T19:07:57Z

Adds a namespace attribute to the Android build.gradle, for compatibility with Android Gradle Plugin 8.0, and adds tooling to enforce that it's there.

This is necessary for plugins now; for examples this isn't needed yet, but since it will be needed to eventually update the apps to AGP 8.0 anyway, it's easiest to just enforce it everywhere now.

Pre-launch Checklist

reidbaker · 2023-04-24T17:26:19Z

script/tool/lib/src/gradle_check_command.dart

+    final Directory parentDir =
+        isExample ? androidDir.childDirectory('app') : androidDir;
+    final File gradleFile = parentDir.childFile('build.gradle');


Nonblocking: Can you extract this into a method that gives you the gradle file? parentDir makes sense as a concept when getting a build.gradle file but I think will make this code harder to reason about when we end up doing validations on multiple build.gradle files in a single example app.

It is way more refactoring than I would want to ask from you but I think the right structure of this validation in the long term will be a top line _validateBuildGradle method that passe the contents of build.gradle files into 3 different validators depending on what the project has. One for plugins, one for the root of an application and one for android/app/build.gradle. Then if we need to validate something specific like namespace there is a method for that called in every sub validator.

Nonblocking: Can you extract this into a method that gives you the gradle file?

Good idea, done.

It is way more refactoring than I would want to ask from you but I think the right structure of this validation [...]

https://xkcd.com/356/ 😁

reidbaker · 2023-04-24T17:29:58Z

script/tool/lib/src/gradle_check_command.dart

+        namespace 'dev.flutter.foo'
+    }
+
+The value must match the "package" attribute in AndroidManifest.xml.


I think this line is only true while we have both and this error will not make sense if the AndroidManifest does not have a package value which should be the case in the future. For futher guidance maybe we link users to https://developer.android.com/build/publish-library/prep-lib-release#choose-namespace?

FWIW the AGP updater removes the package line from all the manifests that are used.

I added a "if one is present" caveat, like I had below.

FWIW the AGP updater removes the package line from all the manifests that are used.

That makes sense for apps; we definitely won't want that for plugins since it will presumably break people on old versions of AGP.

Let me know if you also want me to make this match check non-example only.

If one is present I think is the correct change here.

reidbaker · 2023-04-24T17:33:31Z

script/tool/test/gradle_check_command_test.dart

    );
  });
+
+  test('fails when namespace does not match AndroidManifest.xml', () async {


see comment above, also I think part of the value android is trying to put forward is to separate the package from the namespace so that tests can have a custom namespace.

I've renamed this to say that it's only testing for the library, and put a TODO on the example app version of the test saying we may want to remove it in the future. (Or I can remove the example test entirely, per my comment above.)

stuartmorgan-g · 2023-04-25T13:12:33Z

script/tool/lib/src/gradle_check_command.dart

+      RepositoryPackage package, File gradleFile) {
+    print('${indentation}Validating '
+        '${getRelativePosixPath(gradleFile, from: package.directory)}.');
+    // TODO(stuartmorgan): Move the -Xlint validation from lint_android_command


I have a follow-up PR to address this TODO once this one lands; I started to do it as part of the refactoring, but it added a lot of changes that weren't related to the purpose of this PR so I split it out.

script/tool/lib/src/gradle_check_command.dart

Co-authored-by: Reid Baker <[email protected]>

Roll Packages from 7e3f5da to de6131d (41 revisions) flutter/packages@7e3f5da...de6131d 2023-05-01 [email protected] I122213 update non examples (flutter/packages#3846) 2023-04-29 [email protected] [go_router] Cleans up route match API and introduces dart fix (flutter/packages#3819) 2023-04-29 [email protected] [camerax] Add `LifecycleOwner` Proxy (flutter/packages#3837) 2023-04-29 [email protected] [file_selector] Add getDirectoryPaths implementation for Windows (flutter/packages#3704) 2023-04-29 [email protected] [various] Update Android example min SDKs (flutter/packages#3847) 2023-04-28 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 2.2.12 to 2.3.2 (flutter/packages#3838) 2023-04-28 [email protected] [camerax] Implement Image Streaming (flutter/packages#3454) 2023-04-28 [email protected] [various] update agp and gradle for all examples in packages (flutter/packages#3822) 2023-04-28 [email protected] Update xcode to 14c18 (flutter/packages#3774) 2023-04-28 [email protected] [camera_android] Add NV21 as an image stream format #3277 (flutter/packages#3639) 2023-04-28 [email protected] [go_router] Remove unused navigator keys (flutter/packages#3708) 2023-04-28 [email protected] [image_picker] Move I/O operations to a separate thread (flutter/packages#3506) 2023-04-28 49699333+dependabot[bot]@users.noreply.github.com [pigeon]: Bump org.jetbrains.kotlin:kotlin-gradle-plugin from 1.8.20 to 1.8.21 in /packages/pigeon/platform_tests/test_plugin/android (flutter/packages#3824) 2023-04-28 [email protected] [pigeon] Reland: Add an initial example app (flutter/packages#3832) 2023-04-28 [email protected] Roll Flutter from c9004ff to 66fa4c5 (68 revisions) (flutter/packages#3830) 2023-04-28 [email protected] [various] Conditionalize the namespace in all Android plugins (flutter/packages#3836) 2023-04-27 49699333+dependabot[bot]@users.noreply.github.com [in_app_pur]: Bump com.android.billingclient:billing from 5.1.0 to 5.2.0 in /packages/in_app_purchase/in_app_purchase_android/android (flutter/packages#3672) 2023-04-27 [email protected] [auick_action_ios] Retries multiple times to not fail ci when there is a flake (flutter/packages#3823) 2023-04-26 [email protected] Swap some iOS package CODEOWNERS (flutter/packages#3793) 2023-04-26 [email protected] [various] Add `targetCompatibility` to build.gradle (flutter/packages#3825) 2023-04-26 [email protected] [various] Set cmake_policy versions (flutter/packages#3828) 2023-04-26 [email protected] [path_provider] Allow `win32` up to version 4.x (flutter/packages#3820) 2023-04-26 [email protected] [tool] Move Android lint checks (flutter/packages#3816) 2023-04-25 [email protected] [google_maps_flutter_android] Fix Android lint warnings (flutter/packages#3751) 2023-04-25 49699333+dependabot[bot]@users.noreply.github.com [in_app_pur]: Bump androidx.annotation:annotation from 1.5.0 to 1.6.0 in /packages/in_app_purchase/in_app_purchase_android/android (flutter/packages#3381) 2023-04-25 [email protected] Update test golden images for the latest Skia roll (flutter/packages#3787) 2023-04-25 [email protected] [various] Adds Android namespace (flutter/packages#3791) 2023-04-25 [email protected] [shared_preferences] Update gradle/agp in example apps (flutter/packages#3809) 2023-04-24 [email protected] [go_router] Adds name to TypedGoRoute (flutter/packages#3702) 2023-04-22 [email protected] [webview_flutter] Adds support to receive permission requests (flutter/packages#3543) 2023-04-21 [email protected] [google_sign_in] Fix Android Java warnings (flutter/packages#3762) 2023-04-21 [email protected] [local_auth] Fix enum return on Android (flutter/packages#3780) 2023-04-21 [email protected] [pigeon] Warn when trying to use enums in collections (flutter/packages#3782) 2023-04-21 [email protected] [webview_flutter_android] [webview_flutter_wkwebview] Platform implementations for supporting permission requests (flutter/packages#3792) 2023-04-21 [email protected] [pigeon] Update for compatibility with a future change to the analyzer. (flutter/packages#3789) 2023-04-21 [email protected] [camera_android] Fix Android lint warnings (flutter/packages#3716) 2023-04-21 [email protected] [webview_flutter_platform_interface] Adds method to receive permission requests (flutter/packages#3767) 2023-04-21 [email protected] [image_picker_ios] In unit test write and read kCGImagePropertyExifUserComment property (flutter/packages#3783) 2023-04-21 [email protected] [go_router_builder] Fixed the return value of the generated push method (flutter/packages#3650) 2023-04-21 [email protected] [image_picker] Mention `launchMode: singleInstance` in README (flutter/packages#3759) 2023-04-21 [email protected] Revert "[pigeon] Add an initial example app" (flutter/packages#3785) 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-flutter-autoroll Please CC [email protected],[email protected] on the revert to ensure that a human ...

Adds a `namespace` attribute to the Android build.gradle, for compatibility with Android Gradle Plugin 8.0, and adds tooling to enforce that it's there. This is necessary for plugins now; for examples this isn't needed yet, but since it will be needed to eventually update the apps to AGP 8.0 anyway, it's easiest to just enforce it everywhere now.

stuartmorgan-g added 5 commits April 21, 2023 11:45

Add tooling support for namespace validation

ec36196

Tooling to validate matching values

6ac6a25

Fix example app paths

dd0c671

Add namespaces to everything

881ae7d

Version bumps

79bdaed

stuartmorgan-g requested review from Hixie, Piinks, bparrishMines, camsim99, gmackall, goderbauer, reidbaker and tarrinneal as code owners April 21, 2023 19:07

github-actions bot added p: webview_flutter platform-android labels Apr 21, 2023

stuartmorgan-g added 2 commits April 21, 2023 16:28

Update rfw example Gradle

86bcaff

Merge branch 'main' into android-gradle-namespace

73790dd

reidbaker reviewed Apr 24, 2023

View reviewed changes

Review comments

110d90d

stuartmorgan-g commented Apr 25, 2023

View reviewed changes

reidbaker reviewed Apr 25, 2023

View reviewed changes

script/tool/lib/src/gradle_check_command.dart Outdated Show resolved Hide resolved

reidbaker approved these changes Apr 25, 2023

View reviewed changes

stuartmorgan-g and others added 2 commits April 25, 2023 10:17

Typo fix

c9a63aa

Co-authored-by: Reid Baker <[email protected]>

Merge branch 'main' into android-gradle-namespace

54c1b86

stuartmorgan-g added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 25, 2023

auto-submit bot merged commit 6284c2d into flutter:main Apr 25, 2023

stuartmorgan-g deleted the android-gradle-namespace branch April 25, 2023 15:44

reidbaker mentioned this pull request Apr 25, 2023

[various] update agp and gradle for all examples in packages #3822

Merged

11 tasks

engine-flutter-autoroll mentioned this pull request May 1, 2023

Roll Packages from 7e3f5da42e81 to b01736711cc7 (40 revisions) flutter/flutter#125799

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 1, 2023

6284c2d [various] Adds Android namespace (flutter/packages#3791)

0103735

engine-flutter-autoroll mentioned this pull request May 1, 2023

Roll Packages from 7e3f5da42e81 to de6131dbe4f7 (41 revisions) flutter/flutter#125811

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 1, 2023

6284c2d [various] Adds Android namespace (flutter/packages#3791)

d3a511d

davidhsoftware mentioned this pull request Dec 27, 2023

Gradle 8 Compatibility uxcam/flutter-plugin#49

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[various] Adds Android namespace #3791

[various] Adds Android namespace #3791

Uh oh!

stuartmorgan-g commented Apr 21, 2023

Uh oh!

reidbaker Apr 24, 2023

Uh oh!

stuartmorgan-g Apr 25, 2023

Uh oh!

reidbaker Apr 24, 2023

Uh oh!

stuartmorgan-g Apr 24, 2023

Uh oh!

reidbaker Apr 25, 2023

Uh oh!

reidbaker Apr 24, 2023

Uh oh!

stuartmorgan-g Apr 24, 2023

Uh oh!

stuartmorgan-g Apr 25, 2023

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

[various] Adds Android namespace #3791

[various] Adds Android namespace #3791

Uh oh!

Conversation

stuartmorgan-g commented Apr 21, 2023

Pre-launch Checklist

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!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants