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

AndroidDependencyResolver: Don't load android-related classes on class load

Browse Source
This commit is contained in:
Vyacheslav Karpukhin
2021-02-12 15:59:45 +01:00
parent d42cc219bf
commit 75f6780b90
1 changed files with 6 additions and 8 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
+6 -8
View File
@@ -145,8 +145,13 @@ object AndroidDependencyResolver {
module: ModuleIdentifier, module: ModuleIdentifier,
compileClasspathConf: Configuration compileClasspathConf: Configuration
): List<AndroidDependency> { ): List<AndroidDependency> {
val processedJarArtifactType = try {
AndroidArtifacts.ArtifactType.valueOf("PROCESSED_JAR")
} catch (e: IllegalArgumentException) {
AndroidArtifacts.ArtifactType.JAR
}
val viewConfig: (ArtifactView.ViewConfiguration) -> Unit = { config -> val viewConfig: (ArtifactView.ViewConfiguration) -> Unit = { config ->
config.attributes { it.attribute(AndroidArtifacts.ARTIFACT_TYPE, PROCESSED_JAR_ARTIFACT_TYPE.type) } config.attributes { it.attribute(AndroidArtifacts.ARTIFACT_TYPE, processedJarArtifactType.type) }
config.isLenient = true config.isLenient = true
} }
@@ -189,11 +194,4 @@ 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
}
} }