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

Simplified SdkLocator usage in AndroidDependencyResolver

Browse Source
This commit is contained in:
Vyacheslav Karpukhin
2020-02-13 16:24:08 +01:00
parent d9f9c93dc8
commit 4462ecb280
1 changed files with 2 additions and 9 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 -9
View File
@@ -38,16 +38,9 @@ data class AndroidDependency(
object AndroidDependencyResolver { object AndroidDependencyResolver {
private fun getAndroidSdkJar(project: Project): AndroidDependency? { private fun getAndroidSdkJar(project: Project): AndroidDependency? {
val androidExtension = project.extensions.findByName("android") as BaseExtension? ?: return null val androidExtension = project.extensions.findByName("android") as BaseExtension? ?: return null
val sdkLocation = getClassOrNull("com.android.build.gradle.internal.SdkLocationSourceSet")?.let { sdkLocationSourceSetClass -> val sdkLocation = getClassOrNull("com.android.build.gradle.internal.SdkLocator")?.let { sdkLocatorClass ->
val sdkLocationSourceSet = sdkLocationSourceSetClass.kotlin.constructors.firstOrNull()?.let { callable ->
callable.findParameterByName("projectRoot")?.let { param ->
callable.callBy(mapOf(param to project.rootDir))
}
}
val sdkLocatorClass = getClassOrNull("com.android.build.gradle.internal.SdkLocator")
val sdkLocation = val sdkLocation =
sdkLocatorClass?.getMethodOrNull("getSdkLocation", sdkLocationSourceSetClass)?.invoke(sdkLocatorClass, sdkLocationSourceSet) sdkLocatorClass.getMethodOrNull("getSdkLocation", File::class.java)?.invoke(sdkLocatorClass, project.rootDir)
sdkLocation?.javaClass?.getMethodOrNull("getDirectory")?.invoke(sdkLocation) as? File sdkLocation?.javaClass?.getMethodOrNull("getDirectory")?.invoke(sdkLocation) as? File
} ?: return null } ?: return null
val sdkHandler = AndroidSdkHandler.getInstance(sdkLocation) val sdkHandler = AndroidSdkHandler.getInstance(sdkLocation)