Fix flavored build with subproject and configure kotlin for sample subproject (deepmedia#5)

0xera · web-flow · commit 125230afc7dd · 2024-08-25T23:53:32.000+02:00
* apply build type for flavored configurations

* configure kotlin for sample library
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,5 +19,6 @@ gradle-android = ["gradle-android-sdk-common", "gradle-android-build", "gradle-a
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 publisher = { id = "io.deepmedia.tools.deployer", version.ref = "publisher" }
 android-library = { id = "com.android.library", version.ref = "agp" }
diff --git a/grease/src/main/kotlin/io/deepmedia/tools/grease/configurations.kt b/grease/src/main/kotlin/io/deepmedia/tools/grease/configurations.kt
@@ -118,7 +118,11 @@ internal fun Project.createProductFlavorConfigurations(
             val buildTypedSubFlavor = nameOf(subFlavor, variant.buildType.orEmpty())
             log.d { "Creating buildTyped sub product flavor configuration ${buildTypedSubFlavor.greasify()}..." }
             val config = createGrease(buildTypedSubFlavor, isTransitive)
+            config.attributes {
+                attribute(BuildTypeAttr.ATTRIBUTE, objects.named(BuildTypeAttr::class, variant.buildType.orEmpty()))
+            }
             config.extendsFromSafely(grease(isTransitive), log)
+            config.extendsFromSafely(greaseOf(variant.buildType.orEmpty(), isTransitive), log)
             config.extendsFromSafely(greaseOf(subFlavor, isTransitive), log)
             config.extendsFromSafely(flavorConfiguration, log)
         }
@@ -153,6 +157,9 @@ internal fun Project.createVariantConfigurations(
 ) = androidComponent.onVariants { variant ->
     log.d { "Creating variant configuration ${variant.name.greasify()}..." }
     val config = createGrease(variant.name, isTransitive)
+    config.attributes {
+        attribute(BuildTypeAttr.ATTRIBUTE, objects.named(BuildTypeAttr::class, variant.buildType.orEmpty()))
+    }
     config.extendsFromSafely(grease(isTransitive), log)
     config.extendsFromSafely(greaseOf(variant.buildType.orEmpty(), isTransitive), log)
     variant.flavorName?.let { flavor ->
diff --git a/tests/sample-dependency-pure/build.gradle.kts b/tests/sample-dependency-pure/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -8,6 +9,10 @@ android {
     defaultConfig {
         minSdk = 21
     }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {
diff --git a/tests/sample-library/build.gradle.kts b/tests/sample-library/build.gradle.kts
@@ -68,7 +68,5 @@ dependencies {
     // Manifest changes, layout resources
     grease("com.otaliastudios:cameraview:2.7.2")
 
-    // Doesn't work. TODO: we need to configure grease configurations so that in case of multiple matching
-    // variants, they prefer one where com.android.build.api.attributes.BuildTypeAttr is set to release
-    // grease(project(":sample-dependency-pure"))
+    grease(project(":sample-dependency-pure"))
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`alias(libs.plugins.android.library)`
	`3`	`+ alias(libs.plugins.kotlin.android)`
`3`	`4`	`}`
`4`	`5`
`5`	`6`	`android {`
`@@ -8,6 +9,10 @@ android {`
`8`	`9`	`defaultConfig {`
`9`	`10`	`minSdk = 21`
`10`	`11`	`}`
	`12`	`+`
	`13`	`+ kotlinOptions {`
	`14`	`+ jvmTarget = "1.8"`
	`15`	`+ }`
`11`	`16`	`}`
`12`	`17`
`13`	`18`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,5 @@ dependencies {`
`68`	`68`	`// Manifest changes, layout resources`
`69`	`69`	`grease("com.otaliastudios:cameraview:2.7.2")`
`70`	`70`
`71`		`- // Doesn't work. TODO: we need to configure grease configurations so that in case of multiple matching`
`72`		`- // variants, they prefer one where com.android.build.api.attributes.BuildTypeAttr is set to release`
`73`		`- // grease(project(":sample-dependency-pure"))`
	`71`	`+ grease(project(":sample-dependency-pure"))`
`74`	`72`	`}`