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

AndroidDependencyResolver: fixed AAR import on modern AGP plugins

Browse Source
This commit is contained in:
Vyacheslav Karpukhin
2021-02-11 23:17:37 +01:00
parent 7eb5fc7778
commit f33cad54c5
1 changed files with 8 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/internal/AndroidDependencyResolver.kt
+8 -1
View File
@@ -146,7 +146,7 @@ object AndroidDependencyResolver {
compileClasspathConf: Configuration compileClasspathConf: Configuration
): List<AndroidDependency> { ): List<AndroidDependency> {
val viewConfig: (ArtifactView.ViewConfiguration) -> Unit = { config -> val viewConfig: (ArtifactView.ViewConfiguration) -> Unit = { config ->
config.attributes { it.attribute(AndroidArtifacts.ARTIFACT_TYPE, AndroidArtifacts.ArtifactType.JAR.type) } config.attributes { it.attribute(AndroidArtifacts.ARTIFACT_TYPE, PROCESSED_JAR_ARTIFACT_TYPE.type) }
config.isLenient = true config.isLenient = true
} }
@@ -189,4 +189,11 @@ object AndroidDependencyResolver {
result.addAll(configs.flatMap { it.dependencies }) result.addAll(configs.flatMap { it.dependencies })
doFindDependencies(implConfigs, configs.flatMap { it.extendsFrom }.filter { it !in implConfigs && visited.add(it) }, result) doFindDependencies(implConfigs, configs.flatMap { it.extendsFrom }.filter { it !in implConfigs && visited.add(it) }, result)
} }
private val PROCESSED_JAR_ARTIFACT_TYPE: AndroidArtifacts.ArtifactType =
try {
AndroidArtifacts.ArtifactType.valueOf("PROCESSED_JAR")
} catch (e: IllegalArgumentException) {
AndroidArtifacts.ArtifactType.JAR
}
} }