Internal changes

RELNOTES=N/A
PiperOrigin-RevId: 861878027

Author: trexem

java/dagger/hilt/android/plugin/main/src/main/kotlin/dagger/hilt/android/plugin/HiltGradlePlugin.kt

@@ -135,8 +135,8 @@ class HiltGradlePlugin @Inject constructor(private val providers: ProviderFactor
     androidExtension.onRootVariants { variant, testedVariant ->
       if (!isExperimentalClasspathAggregationEnabled()) {
         // Option is not enabled, don't configure compile classpath. Note that the option can't be
-        // checked earlier (before iterating over the variants) since it would have been too early for
-        // the value to be populated from the build file.
+        // checked earlier (before iterating over the variants) since it would have been too early
+        // for the value to be populated from the build file.
         return@onRootVariants
       }
 
@@ -193,16 +193,15 @@ class HiltGradlePlugin @Inject constructor(private val providers: ProviderFactor
       // javac/kotlinc compile tasks and R.jar dependencies, and tested classes if the variant is
       // androidTest. Note: These configurations should be filtered using
       // getHiltTransformedDependencies to only include what Hilt needs in the classpath.
-      val configurations =
-        buildList {
-          testedVariant?.let {
-            add(it.runtimeConfiguration)
-            add(it.compileConfiguration)
-          }
-          add(variant.runtimeConfiguration)
-          add(variant.compileConfiguration)
-          add(createHiltCompileOnlyConfiguration(variant, testedVariant))
+      val configurations = buildList {
+        testedVariant?.let {
+          add(it.runtimeConfiguration)
+          add(it.compileConfiguration)
         }
+        add(variant.runtimeConfiguration)
+        add(variant.compileConfiguration)
+        add(createHiltCompileOnlyConfiguration(variant, testedVariant))
+      }
 
       val aggregatingTask =
         configureAggregateDepsTask(
@@ -211,7 +210,7 @@ class HiltGradlePlugin @Inject constructor(private val providers: ProviderFactor
           classpath =
             project.files(
               getHiltTransformedDependencies(configurations, AGGREGATED_HILT_ARTIFACT_TYPE_VALUE)
-            )
+            ),
         )
 
       val javaCompileTask =
@@ -234,13 +233,11 @@ class HiltGradlePlugin @Inject constructor(private val providers: ProviderFactor
 
   private fun HiltPluginEnvironment.createHiltCompileOnlyConfiguration(
     variant: Component,
-    testedVariant: Component?
+    testedVariant: Component?,
   ): Configuration {
     val hiltSyncTask =
-      project.tasks.register(
-        "hiltSync${variant.name.capitalize()}",
-        HiltSyncTask::class.java
-      ) { task ->
+      project.tasks.register("hiltSync${variant.name.capitalize()}", HiltSyncTask::class.java) {
+        task ->
         task.duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         task.from(task.classesJars)
         task.from(task.classesDirectories)
@@ -255,16 +252,17 @@ class HiltGradlePlugin @Inject constructor(private val providers: ProviderFactor
       .toGet(
         type = ScopedArtifact.POST_COMPILATION_CLASSES,
         inputJars = HiltSyncTask::classesJars,
-        inputDirectories = HiltSyncTask::classesDirectories
+        inputDirectories = HiltSyncTask::classesDirectories,
       )
 
-    testedVariant?.artifacts
+    testedVariant
+      ?.artifacts
       ?.forScope(ScopedArtifacts.Scope.PROJECT)
       ?.use(hiltSyncTask)
       ?.toGet(
         type = ScopedArtifact.CLASSES,
         inputJars = HiltSyncTask::testedClassesJars,
-        inputDirectories = HiltSyncTask::testedClassesDirectories
+        inputDirectories = HiltSyncTask::testedClassesDirectories,
       )
 
     return project.configurations.create("hiltCompileOnly${variant.name.capitalize()}").apply {
@@ -274,9 +272,7 @@ class HiltGradlePlugin @Inject constructor(private val providers: ProviderFactor
 
       // Add the current variant's JavaCompile output to the configuration. This includes the
       // compiled classes from any Java/Kotlin sources (including those generated by KAPT/KSP).
-      project.dependencies.apply {
-        add(name, project.files(hiltSyncTask.map { it.outputs.files }))
-      }
+      project.dependencies.apply { add(name, project.files(hiltSyncTask.map { it.outputs.files })) }
     }
   }
 
@@ -319,7 +315,9 @@ class HiltGradlePlugin @Inject constructor(private val providers: ProviderFactor
       if (commonExtension.compileOptions.isJava9Compatible()) {
         compileTask.classpath = classpath.plus(mainBootstrapClasspath)
         //  Copies argument providers from original task, which should contain the JdkImageInput
-        variant.javaCompilation?.annotationProcessor?.argumentProviders
+        variant.javaCompilation
+          ?.annotationProcessor
+          ?.argumentProviders
           ?.filter { it is HiltCommandLineArgumentProvider || it is JdkImageInput }
           ?.forEach { compileTask.options.compilerArgumentProviders.add(it) }
         compileTask.options.compilerArgs.add("-XDstringConcat=inline")
@@ -348,7 +346,7 @@ class HiltGradlePlugin @Inject constructor(private val providers: ProviderFactor
   }
 
   private fun HiltPluginEnvironment.configureHiltAnnotationProcessorConfiguration(
-    variant: Component,
+    variant: Component
   ): Configuration {
     val configName = "hiltAnnotationProcessor${variant.name.capitalize()}"
     return project.configurations.create(configName).apply {
@@ -392,7 +390,7 @@ class HiltGradlePlugin @Inject constructor(private val providers: ProviderFactor
           forKsp = task.isKspTask(),
           projectType = projectType,
           enableAggregatingTask = isAggregatingTaskEnabled(),
-          disableCrossCompilationRootValidation = !isCrossCompilationRootValidationEnabled()
+          disableCrossCompilationRootValidation = !isCrossCompilationRootValidationEnabled(),
         )
       }
       addJavaTaskProcessorOptions(project, variant, argsProducer)
@@ -425,7 +423,7 @@ class HiltGradlePlugin @Inject constructor(private val providers: ProviderFactor
     }
     if (
       !dependencies.contains(LIBRARY_GROUP to "hilt-android-compiler") &&
-      !dependencies.contains(LIBRARY_GROUP to "hilt-compiler")
+        !dependencies.contains(LIBRARY_GROUP to "hilt-compiler")
     ) {
       error(getMissingDepMsg("$LIBRARY_GROUP:hilt-compiler"))
     }
@@ -478,7 +476,7 @@ class HiltGradlePlugin @Inject constructor(private val providers: ProviderFactor
 
 private class HiltPluginEnvironment(
   val project: Project,
-  private val hiltExtension: HiltExtension
+  private val hiltExtension: HiltExtension,
 ) {
   val androidExtension =
     project.extensions.findByType(AndroidComponentsExtension::class.java)?.also {