Fix ComponentConfiguration crash

natario1 · natario1 · commit e67b5994460e · 2024-08-25T19:57:07.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 *.iml
 .gradle
 **/local.properties
-/.idea/
+**/.idea/
 .DS_Store
 /build
 /captures
diff --git a/grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt b/grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt
@@ -2,6 +2,8 @@
 
 package io.deepmedia.tools.grease
 
+import com.android.build.api.component.analytics.AnalyticsEnabledLibraryVariant
+import com.android.build.api.component.analytics.AnalyticsEnabledVariant
 import com.android.build.api.variant.AndroidComponentsExtension
 import com.android.build.api.variant.Variant
 import com.android.build.api.variant.impl.getApiString
@@ -121,7 +123,7 @@ open class GreasePlugin : Plugin<Project> {
         val log = logger.child("configureVariantManifest")
         log.d { "Configuring variant output ${variant.name}..." }
 
-        val componentConfig = variant as ComponentCreationConfig
+        val componentConfig = variant.componentCreationConfigOrThrow()
 
         target.locateTask(componentConfig.computeTaskName("process", "Manifest"))?.configure {
             val processManifestTask = this as ProcessLibraryManifest
@@ -222,7 +224,7 @@ open class GreasePlugin : Plugin<Project> {
         val log = logger.child("configureVariantJniLibs")
         log.d { "Configuring variant ${variant.name}..." }
 
-        val creationConfig = variant as ComponentCreationConfig
+        val creationConfig = variant.componentCreationConfigOrThrow()
 
         target.locateTask(creationConfig.computeTaskName("copy", "JniLibsProjectAndLocalJars"))?.configure {
             val copyJniTask = this as LibraryJniLibsTask
@@ -319,7 +321,7 @@ open class GreasePlugin : Plugin<Project> {
 
         val log = logger.child("configureVariantResources")
         log.d { "Configuring variant ${variant.name}..." }
-        val creationConfig = variant as ComponentCreationConfig
+        val creationConfig = variant.componentCreationConfigOrThrow()
 
         target.locateTask(creationConfig.computeTaskName("package", "Resources"))?.configure {
             this as MergeResources
@@ -389,7 +391,7 @@ open class GreasePlugin : Plugin<Project> {
         val log = logger.child("configureVariantSources")
         log.d { "Configuring variant ${variant.name}..." }
 
-        val creationConfig = variant as ComponentCreationConfig
+        val creationConfig = variant.componentCreationConfigOrThrow()
 
         val workdir = target.greaseBuildDir.get().dir(variant.name)
         val aarExtractWorkdir = workdir.dir("extract").dir("aar")
@@ -567,7 +569,7 @@ open class GreasePlugin : Plugin<Project> {
     ) {
         val log = logger.child("configureVariantAssets")
         log.d { "Configuring variant ${variant.name}..." }
-        val creationConfig = variant as ComponentCreationConfig
+        val creationConfig = variant.componentCreationConfigOrThrow()
         creationConfig.taskContainer.mergeAssetsTask.configure {
             val extraAssets = configurations.artifactsOf(AndroidArtifacts.ArtifactType.ASSETS)
             dependsOn(extraAssets)
@@ -621,7 +623,7 @@ open class GreasePlugin : Plugin<Project> {
     ) {
         val log = logger.child("configureVariantProguardFiles")
         log.d { "Configuring variant ${variant.name}..." }
-        val creationConfig = variant as ComponentCreationConfig
+        val creationConfig = variant.componentCreationConfigOrThrow()
         target.locateTask(creationConfig.computeTaskName("merge", "ConsumerProguardFiles"))?.configure {
             val mergeFileTask = this as MergeFileTask
             // UNFILTERED_PROGUARD_RULES, FILTERED_PROGUARD_RULES, AAPT_PROGUARD_RULES, ...
@@ -637,3 +639,11 @@ open class GreasePlugin : Plugin<Project> {
         }
     }
 }
+
+private fun Variant.componentCreationConfigOrThrow(): ComponentCreationConfig {
+    return when (this) {
+        is ComponentCreationConfig -> this
+        is AnalyticsEnabledVariant -> this.delegate.componentCreationConfigOrThrow()
+        else -> error("Could not find ComponentCreationConfig in $this.")
+    }
+}
diff --git a/grease/src/main/kotlin/io/deepmedia/tools/grease/configurations.kt b/grease/src/main/kotlin/io/deepmedia/tools/grease/configurations.kt
@@ -85,7 +85,7 @@ private fun Project.createGrease(name: String, isTransitive: Boolean): Configura
     configurations.configureEach {
         val other = this
         if (other.name == nameOf(name, "compileClasspath")) {
-            extendsFrom(configuration)
+            other.extendsFrom(configuration)
         }
     }
     return configuration
diff --git a/tests/sample/build.gradle.kts b/tests/sample/build.gradle.kts
@@ -63,10 +63,8 @@ dependencies {
     // Includes resource and some manifest changes
     implementation("androidx.lifecycle:lifecycle-runtime:2.8.4")
 
-    afterEvaluate {
-        // Includes native libraries
-        "greaseApi"("org.tensorflow:tensorflow-lite:2.3.0")
-        // Manifest changes, layout resources
-        "grease"("com.otaliastudios:cameraview:2.7.2")
-    }
+    // Includes native libraries
+    greaseApi("org.tensorflow:tensorflow-lite:2.3.0")
+    // Manifest changes, layout resources
+    grease("com.otaliastudios:cameraview:2.7.2")
 }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ private fun Project.createGrease(name: String, isTransitive: Boolean): Configura`
`85`	`85`	`configurations.configureEach {`
`86`	`86`	`val other = this`
`87`	`87`	`if (other.name == nameOf(name, "compileClasspath")) {`
`88`		`- extendsFrom(configuration)`
	`88`	`+ other.extendsFrom(configuration)`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`	`return configuration`