Copy R8 outputs to Compose folder when transforming obfuscation file

AGP expects all files coming from R8 to be in the same folder as the mapping.txt, which is not the case after new transform. We can manually copy the files to workaround until it is fixed in AGP.

Fixes: 469562646
Test: ComposeIT

Author: ShikaSD

libraries/tools/kotlin-compose-compiler/src/common/kotlin/org/jetbrains/kotlin/compose/compiler/gradle/internal/ComposeAgpMappingFile.kt

@@ -18,6 +18,7 @@ import org.gradle.api.file.*
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
+import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.*
 import org.gradle.kotlin.dsl.findByType
 import org.gradle.kotlin.dsl.register
@@ -26,6 +27,7 @@ import org.gradle.workers.WorkAction
 import org.gradle.workers.WorkParameters
 import org.gradle.workers.WorkerExecutor
 import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
+import java.io.File
 import java.security.MessageDigest
 import java.util.Locale.getDefault
 import java.util.zip.ZipFile
@@ -218,34 +220,45 @@ internal abstract class ReportMappingErrorsTask : DefaultTask() {
 
 
 @CacheableTask
-internal abstract class MergeMappingFileTask : DefaultTask() {
+internal abstract class MergeMappingFileTask @Inject constructor(objects: ObjectFactory) : DefaultTask() {
 
     @get:InputFile
     @get:PathSensitive(PathSensitivity.RELATIVE)
     abstract val originalFile: RegularFileProperty
 
+    @get:InputFiles
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    val r8Outputs: FileCollection = objects.fileCollection()
+        .from(originalFile.asFile.map { it.parentFile })
+        .asFileTree
+
     @get:InputFile
     @get:PathSensitive(PathSensitivity.RELATIVE)
     abstract val composeMapping: RegularFileProperty
 
     @get:OutputFile
     abstract val output: RegularFileProperty
 
+    @get:OutputFiles
+    val outputDir: Provider<File> = output.asFile.map { it.parentFile }
+
     @TaskAction
     fun taskAction() {
         /*
          * Read the proguard file generated by R8, calculate the new SHA-256 hash for the header, and append Compose mapping.
          */
         val newHeader = buildHeader()
 
+        val originalFile = originalFile.get().asFile
+
         val outputFile = output.get().asFile
-        outputFile.parentFile.mkdirs()
+        val outputDir = outputDir.get()
+        outputDir.mkdirs()
 
         outputFile.bufferedWriter().use { writer ->
             writer.append(newHeader)
 
             var skippingHeader = true
-            val originalFile = originalFile.get().asFile
             originalFile.forEachLine {
                 if (skippingHeader && it.startsWith("#")) {
                     return@forEachLine
@@ -260,6 +273,11 @@ internal abstract class MergeMappingFileTask : DefaultTask() {
                 writer.appendLine(it)
             }
         }
+
+        r8Outputs.forEach {
+            if (it == originalFile) return@forEach
+            it.copyTo(File(outputDir, it.name))
+        }
     }
 
     private fun buildHeader(): String {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ComposeIT.kt

@@ -663,6 +663,7 @@ class ComposeIT : KGPBaseTest() {
                 appExtension.beforeVariants {
                     if (it.name == "release") {
                         it.isMinifyEnabled = true
+                        it.shrinkResources = true
                     }
                 }
             }
@@ -678,7 +679,18 @@ class ComposeIT : KGPBaseTest() {
 
                 assertTasksExecuted(":mergeReleaseComposeMapping")
 
-                // validate mapping is present
+                // validate all mapping files are present
+                val expectedOutputFiles = listOf(
+                    "mapping.txt",
+                    "seeds.txt",
+                    "configuration.txt",
+                    "usage.txt",
+                    "resources.txt",
+                )
+                for (name in expectedOutputFiles) {
+                    val file = projectPath.resolve(Path("build/outputs/mapping/release/$name")).toFile()
+                    assertFileExists(file, "Missing $name from R8 outputs")
+                }
                 val outputMapping = projectPath.resolve(Path("build/outputs/mapping/release/mapping.txt")).toFile()
                 var hasComposeMapping = false
                 var hasAppFrames = false