From 5ffb45bf78ccdf234d502a8f001bd3d304aba8c7 Mon Sep 17 00:00:00 2001 From: Mohellebi abdessalem Date: Tue, 21 Jan 2025 20:05:45 +0100 Subject: [PATCH] fix failing lint : findByPath requires a specific ordering of project evaluation in `aar_init_script.gradle` (#159301) android studio linter is prompting this lint: ![388711888-61ab84da-4941-4aa4-a42e-fac4c140f4bd](https://github.com/user-attachments/assets/e031c231-8a7e-4b3b-a4a1-1aed3d461ac7) ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] 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 `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md --------- Co-authored-by: Gray Mackall <34871572+gmackall@users.noreply.github.com> --- packages/flutter_tools/gradle/aar_init_script.gradle | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/flutter_tools/gradle/aar_init_script.gradle b/packages/flutter_tools/gradle/aar_init_script.gradle index d2c47259e4..c30e27cc77 100644 --- a/packages/flutter_tools/gradle/aar_init_script.gradle +++ b/packages/flutter_tools/gradle/aar_init_script.gradle @@ -47,7 +47,7 @@ void configureProject(Project project, String outputDir) { String engineRealm = Paths.get(getFlutterRoot(project), "bin", "internal", "engine.realm") .toFile().text.trim() if (engineRealm) { - engineRealm = engineRealm + "/" + engineRealm += "/" } // This is a Flutter plugin project. Plugin projects don't apply the Flutter Gradle plugin, @@ -179,8 +179,12 @@ projectsEvaluated { // Configure the `assembleAar` task for each plugin's projects and make // the module's equivalent task depend on the plugin's task. String variantName = variant.name.capitalize() - moduleProject.tasks.findByPath("assembleAar$variantName") - .dependsOn(pluginProject.tasks.findByPath("assembleAar$variantName")) + + Task moduleProjectTask = moduleProject.tasks.named("assembleAar$variantName").get() + assert(moduleProjectTask != null) + Task pluginProjectTask = pluginProject.tasks.named("assembleAar$variantName").get() + assert(pluginProjectTask != null) + moduleProjectTask.dependsOn(pluginProjectTask) } } }