diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidDependencyResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidDependencyResolver.kt index 17ef94c467f..6d2f47df3a4 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidDependencyResolver.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/android/internal/AndroidDependencyResolver.kt @@ -145,8 +145,13 @@ object AndroidDependencyResolver { module: ModuleIdentifier, compileClasspathConf: Configuration ): List { + 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 - } } \ No newline at end of file