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

Android import: binary-compatible setting of the BuildType attribute

Browse Source
This commit is contained in:
Vyacheslav Karpukhin
2020-06-03 23:46:07 +02:00
parent 39a3f5e7d9
commit 6d6a228057
1 changed files with 2 additions and 1 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
+2 -1
View File
@@ -14,6 +14,7 @@ import com.android.build.gradle.tasks.MergeResources
import com.android.builder.model.SourceProvider import com.android.builder.model.SourceProvider
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.artifacts.component.ProjectComponentIdentifier import org.gradle.api.artifacts.component.ProjectComponentIdentifier
import org.gradle.api.attributes.Attribute
import org.gradle.api.file.FileCollection import org.gradle.api.file.FileCollection
import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.TaskProvider
import org.gradle.api.tasks.bundling.AbstractArchiveTask import org.gradle.api.tasks.bundling.AbstractArchiveTask
@@ -151,7 +152,7 @@ class Android25ProjectHandler(
val buildTypeAttrValue = project.objects.named(BuildTypeAttr::class.java, variant.buildType.name) val buildTypeAttrValue = project.objects.named(BuildTypeAttr::class.java, variant.buildType.name)
listOf(compilation.compileDependencyConfigurationName, compilation.runtimeDependencyConfigurationName).forEach { listOf(compilation.compileDependencyConfigurationName, compilation.runtimeDependencyConfigurationName).forEach {
project.configurations.findByName(it)?.attributes?.attribute(BuildTypeAttr.ATTRIBUTE, buildTypeAttrValue) project.configurations.findByName(it)?.attributes?.attribute(Attribute.of(BuildTypeAttr::class.java), 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