From eb68a0de478c445b6ac91683218f77713c31976a Mon Sep 17 00:00:00 2001 From: Vyacheslav Karpukhin Date: Mon, 16 Mar 2020 23:46:38 +0100 Subject: [PATCH] Android import: simplify the check for android plugin version --- .../targets/android/internal/AndroidDependencyResolver.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d0a1322f7ff..cace337f57a 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 @@ -12,7 +12,6 @@ import com.android.build.gradle.internal.publishing.AndroidArtifacts import com.android.sdklib.IAndroidTarget import com.android.sdklib.repository.AndroidSdkHandler import com.android.sdklib.repository.LoggerProgressIndicatorWrapper -import com.intellij.openapi.util.Version import org.gradle.api.Project import org.gradle.api.artifacts.* import org.gradle.api.artifacts.component.ModuleComponentIdentifier @@ -70,7 +69,8 @@ object AndroidDependencyResolver { return false } } ?: return false - return Version.parseVersion(version)?.isOrGreaterThan(3, 6) ?: false + val versions = version.split('.') + return versions[0].toInt() >= 3 && versions[1].toInt() >= 6 } fun getAndroidSourceSetDependencies(project: Project): Map?> {