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

Android import: simplify the check for android plugin version

Browse Source
This commit is contained in:
Vyacheslav Karpukhin
2020-03-16 23:46:38 +01:00
parent 45cba7b408
commit eb68a0de47
1 changed files with 2 additions and 2 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
+2 -2
View File
@@ -12,7 +12,6 @@ import com.android.build.gradle.internal.publishing.AndroidArtifacts
import com.android.sdklib.IAndroidTarget import com.android.sdklib.IAndroidTarget
import com.android.sdklib.repository.AndroidSdkHandler import com.android.sdklib.repository.AndroidSdkHandler
import com.android.sdklib.repository.LoggerProgressIndicatorWrapper import com.android.sdklib.repository.LoggerProgressIndicatorWrapper
import com.intellij.openapi.util.Version
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.artifacts.* import org.gradle.api.artifacts.*
import org.gradle.api.artifacts.component.ModuleComponentIdentifier import org.gradle.api.artifacts.component.ModuleComponentIdentifier
@@ -70,7 +69,8 @@ object AndroidDependencyResolver {
return false return false
} }
} ?: 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<String, List<AndroidDependency>?> { fun getAndroidSourceSetDependencies(project: Project): Map<String, List<AndroidDependency>?> {