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

Android Import: Search for Android SDK using public API instead of reflection

Browse Source
This commit is contained in:
Vyacheslav Karpukhin
2020-02-26 19:03:12 +01:00
parent ec23c25286
commit a01b840eab
1 changed files with 1 additions and 7 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
+1 -7
View File
@@ -23,7 +23,6 @@ import org.gradle.api.provider.Provider
import org.jetbrains.kotlin.gradle.plugin.forEachVariant import org.jetbrains.kotlin.gradle.plugin.forEachVariant
import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
import java.io.File import java.io.File
import kotlin.reflect.full.findParameterByName
data class AndroidDependency( data class AndroidDependency(
val name: String? = null, val name: String? = null,
@@ -38,12 +37,7 @@ 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.SdkLocator")?.let { sdkLocatorClass -> val sdkHandler = AndroidSdkHandler.getInstance(androidExtension.sdkDirectory)
val sdkLocation =
sdkLocatorClass.getMethodOrNull("getSdkLocation", File::class.java)?.invoke(sdkLocatorClass, project.rootDir)
sdkLocation?.javaClass?.getMethodOrNull("getDirectory")?.invoke(sdkLocation) as? File
} ?: return null
val sdkHandler = AndroidSdkHandler.getInstance(sdkLocation)
val logger = LoggerProgressIndicatorWrapper(LoggerWrapper(project.logger)) val logger = LoggerProgressIndicatorWrapper(LoggerWrapper(project.logger))
val androidTarget = val androidTarget =
sdkHandler.getAndroidTargetManager(logger).getTargetFromHashString(androidExtension.compileSdkVersion, logger) ?: return null sdkHandler.getAndroidTargetManager(logger).getTargetFromHashString(androidExtension.compileSdkVersion, logger) ?: return null