Add work around for updateLegacyAbi not updating Android API files. (#3325)

Author: colinrtwhite

build.gradle.kts

@@ -133,6 +133,7 @@ allprojects {
 
     if (project.name in publicModules) {
         configureAbiValidation()
+        configureAndroidLegacyAbiValidation()
     }
 
     // Skiko's runtime files are ESM-only so preload our shim to let Node require them during tests.
@@ -145,50 +146,80 @@ allprojects {
     }
 }
 
-fun configureAbiValidation() {
-    @OptIn(ExperimentalAbiValidation::class)
-    fun Project.configureKotlinProject() {
-        extensions.configure<KotlinProjectExtension> {
-            fun AbiValidationVariantSpec.configure() = filters {
-                excluded {
-                    annotatedWith.add("coil3.annotation.InternalCoilApi")
-                }
-            }
+@OptIn(ExperimentalAbiValidation::class)
+fun Project.configureAbiValidation() {
+    afterEvaluate {
+        val kotlinExtension = extensions.findByType<KotlinProjectExtension>() ?: return@afterEvaluate
 
-            // Unfortunately the 'enabled' property doesn't share a common interface.
-            extensions.findByType<AbiValidationExtension>()?.apply {
-                enabled = true
-                configure()
-            }
-            extensions.findByType<AbiValidationMultiplatformExtension>()?.apply {
-                enabled = true
-                configure()
+        fun AbiValidationVariantSpec.configureVariant() = filters {
+            excluded {
+                annotatedWith.add("coil3.annotation.InternalCoilApi")
             }
         }
-    }
 
-    pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
-        configureKotlinProject()
-    }
-    pluginManager.withPlugin("com.android.kotlin.multiplatform.library") {
-        pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
-            configureKotlinProject()
+        // Unfortunately the 'enabled' property doesn't share a common interface.
+        kotlinExtension.extensions.findByType<AbiValidationExtension>()?.apply {
+            enabled.set(true)
+            configureVariant()
+        }
+        kotlinExtension.extensions.findByType<AbiValidationMultiplatformExtension>()?.apply {
+            enabled.set(true)
+            configureVariant()
         }
     }
-    pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
-        configureKotlinProject()
-    }
+}
 
-    // Built-in Kotlin Android wires the Kotlin extension during Android plugin application.
-    pluginManager.withPlugin("com.android.application") {
-        configureKotlinProject()
-    }
-    pluginManager.withPlugin("com.android.library") {
-        configureKotlinProject()
+fun Project.configureAndroidLegacyAbiValidation() {
+    plugins.withId("com.android.kotlin.multiplatform.library") {
+        afterEvaluate {
+            tasks
+                .matching { it.name == "dumpLegacyAbi" || it.name.startsWith("dumpLegacyAbi") }
+                .configureEach {
+                    tasks.findByName("compileAndroidMain")?.let { dependsOn(it) }
+                    configureAndroidLegacyAbiDumpInput(this@configureAndroidLegacyAbiValidation)
+                }
+        }
     }
-    pluginManager.withPlugin("com.android.test") {
-        configureKotlinProject()
+}
+
+private fun Task.configureAndroidLegacyAbiDumpInput(project: Project) {
+    val dumpTaskClass = javaClass
+    val getJvm = runCatching { dumpTaskClass.getMethod("getJvm") }.getOrNull() ?: return
+    val jvmProperty = getJvm.invoke(this)
+
+    val propertyClass = jvmProperty.javaClass
+    val get = propertyClass.getMethod("get")
+    val set = propertyClass.getMethod("set", Iterable::class.java)
+
+    val existingEntries = mutableListOf<Any>()
+    val currentEntries = get.invoke(jvmProperty)
+    if (currentEntries is Iterable<*>) {
+        currentEntries.filterNotNullTo(existingEntries)
+    } else {
+        return
     }
+
+    val entryClass = existingEntries.firstOrNull()?.javaClass
+        ?: runCatching {
+            dumpTaskClass.classLoader.loadClass(
+                $$"org.jetbrains.kotlin.gradle.tasks.abi.KotlinLegacyAbiDumpTaskImpl$JvmTargetInfo",
+            )
+        }.getOrNull()
+        ?: return
+
+    val getSubdirectoryName = entryClass.getMethod("getSubdirectoryName")
+    if (existingEntries.any { getSubdirectoryName.invoke(it) == "android" }) return
+
+    val constructor = entryClass.getConstructor(String::class.java, FileCollection::class.java)
+    val androidClasses = project.files(
+        project.layout.buildDirectory.dir("classes/kotlin/android/main"),
+        project.layout.buildDirectory.dir("classes/java/android/main"),
+        project.layout.buildDirectory.dir("intermediates/javac/androidMain/classes"),
+    )
+    val androidEntry = constructor.newInstance("android", androidClasses)
+
+    existingEntries.add(androidEntry)
+    set.invoke(jvmProperty, existingEntries)
 }
 
 private val ktlintRules = buildMap {

coil-core/api/android/coil-core.api

@@ -360,12 +360,12 @@ public final class coil3/decode/DecodeUtils {
 	public static final field INSTANCE Lcoil3/decode/DecodeUtils;
 	public static final fun calculateInSampleSize (IIIILcoil3/size/Scale;)I
 	public static final fun computeDstSize-sEdh43o (IILcoil3/size/Size;Lcoil3/size/Scale;Lcoil3/size/Size;)J
+	public static final fun computeSizeMultiplier (DDDDLcoil3/size/Scale;)D
 	public static final fun computeSizeMultiplier (DDDDLcoil3/size/Scale;Lcoil3/size/Size;)D
+	public static final fun computeSizeMultiplier (FFFFLcoil3/size/Scale;)F
 	public static final fun computeSizeMultiplier (FFFFLcoil3/size/Scale;Lcoil3/size/Size;)F
+	public static final fun computeSizeMultiplier (IIIILcoil3/size/Scale;)D
 	public static final fun computeSizeMultiplier (IIIILcoil3/size/Scale;Lcoil3/size/Size;)D
-	public static synthetic fun computeSizeMultiplier$default (DDDDLcoil3/size/Scale;Lcoil3/size/Size;ILjava/lang/Object;)D
-	public static synthetic fun computeSizeMultiplier$default (FFFFLcoil3/size/Scale;Lcoil3/size/Size;ILjava/lang/Object;)F
-	public static synthetic fun computeSizeMultiplier$default (IIIILcoil3/size/Scale;Lcoil3/size/Size;ILjava/lang/Object;)D
 }
 
 public abstract interface class coil3/decode/Decoder {