azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android import: setting BuildType attribute for kotlin android compilations

Browse Source
This commit is contained in:
Vyacheslav Karpukhin
2020-05-27 22:49:53 +02:00
parent e4e70f1b5b
commit 1f638f52d5
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/Android25ProjectHandler.kt
+6
View File
@@ -6,6 +6,7 @@
@file:Suppress("PackageDirectoryMismatch") // Old package for compatibility @file:Suppress("PackageDirectoryMismatch") // Old package for compatibility
package org.jetbrains.kotlin.gradle.plugin package org.jetbrains.kotlin.gradle.plugin
import com.android.build.api.attributes.BuildTypeAttr
import com.android.build.gradle.BaseExtension import com.android.build.gradle.BaseExtension
import com.android.build.gradle.BasePlugin import com.android.build.gradle.BasePlugin
import com.android.build.gradle.api.* import com.android.build.gradle.api.*
@@ -148,6 +149,11 @@ class Android25ProjectHandler(
project.addExtendsFromRelation(name, compilation.runtimeDependencyConfigurationName) project.addExtendsFromRelation(name, compilation.runtimeDependencyConfigurationName)
} }
val buildTypeAttrValue = project.objects.named(BuildTypeAttr::class.java, variant.name)
listOf(compilation.compileDependencyConfigurationName, compilation.runtimeDependencyConfigurationName).forEach {
project.configurations.findByName(it)?.attributes?.attribute(BuildTypeAttr.ATTRIBUTE, buildTypeAttrValue)
}
// TODO this code depends on the convention that is present in the Android plugin as there's no public API // TODO this code depends on the convention that is present in the Android plugin as there's no public API
// We should request such API in the Android plugin // We should request such API in the Android plugin
val apiElementsConfigurationName = "${variant.name}ApiElements" val apiElementsConfigurationName = "${variant.name}ApiElements"