Fix flavored build with subproject and configure kotlin for sample su…

Fix flavored build with subproject and configure kotlin for sample su… · deepmedia/Grease@125230a

4 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,6 @@ gradle-android = ["gradle-android-sdk-common", "gradle-android-build", "gradle-a`
`19`	`19`
`20`	`20`	`[plugins]`
`21`	`21`	`kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }`
	`22`	`+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }`
`22`	`23`	`publisher = { id = "io.deepmedia.tools.deployer", version.ref = "publisher" }`
`23`	`24`	`android-library = { id = "com.android.library", version.ref = "agp" }`

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,11 @@ internal fun Project.createProductFlavorConfigurations(`
`118`	`118`	`val buildTypedSubFlavor = nameOf(subFlavor, variant.buildType.orEmpty())`
`119`	`119`	`log.d { "Creating buildTyped sub product flavor configuration ${buildTypedSubFlavor.greasify()}..." }`
`120`	`120`	`val config = createGrease(buildTypedSubFlavor, isTransitive)`
	`121`	`+ config.attributes {`
	`122`	`+ attribute(BuildTypeAttr.ATTRIBUTE, objects.named(BuildTypeAttr::class, variant.buildType.orEmpty()))`
	`123`	`+ }`
`121`	`124`	`config.extendsFromSafely(grease(isTransitive), log)`
	`125`	`+ config.extendsFromSafely(greaseOf(variant.buildType.orEmpty(), isTransitive), log)`
`122`	`126`	`config.extendsFromSafely(greaseOf(subFlavor, isTransitive), log)`
`123`	`127`	`config.extendsFromSafely(flavorConfiguration, log)`
`124`	`128`	`}`
`@@ -153,6 +157,9 @@ internal fun Project.createVariantConfigurations(`
`153`	`157`	`) = androidComponent.onVariants { variant ->`
`154`	`158`	`log.d { "Creating variant configuration ${variant.name.greasify()}..." }`
`155`	`159`	`val config = createGrease(variant.name, isTransitive)`
	`160`	`+ config.attributes {`
	`161`	`+ attribute(BuildTypeAttr.ATTRIBUTE, objects.named(BuildTypeAttr::class, variant.buildType.orEmpty()))`
	`162`	`+ }`
`156`	`163`	`config.extendsFromSafely(grease(isTransitive), log)`
`157`	`164`	`config.extendsFromSafely(greaseOf(variant.buildType.orEmpty(), isTransitive), log)`
`158`	`165`	`variant.flavorName?.let { flavor ->`

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`	`}`