AndroidDependencyResolver: Don't load android-related classes on class load
This commit is contained in:
+6
-8
@@ -145,8 +145,13 @@ object AndroidDependencyResolver {
|
||||
module: ModuleIdentifier,
|
||||
compileClasspathConf: Configuration
|
||||
): List<AndroidDependency> {
|
||||
val processedJarArtifactType = try {
|
||||
AndroidArtifacts.ArtifactType.valueOf("PROCESSED_JAR")
|
||||
} catch (e: IllegalArgumentException) {
|
||||
AndroidArtifacts.ArtifactType.JAR
|
||||
}
|
||||
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
|
||||
}
|
||||
|
||||
@@ -189,11 +194,4 @@ object AndroidDependencyResolver {
|
||||
result.addAll(configs.flatMap { it.dependencies })
|
||||
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
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user