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

Nullability check

Browse Source
This commit is contained in:
Vyacheslav Karpukhin
2020-02-03 20:23:42 +01:00
parent aaf939a650
commit bdb8811f95
1 changed files with 2 additions and 1 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/dsl/AndroidDependencyResolver.kt
+2 -1
View File
@@ -51,7 +51,8 @@ object AndroidDependencyResolver {
} ?: return null } ?: return null
val sdkHandler = AndroidSdkHandler.getInstance(sdkLocation) val sdkHandler = AndroidSdkHandler.getInstance(sdkLocation)
val logger = LoggerProgressIndicatorWrapper(LoggerWrapper(project.logger)) val logger = LoggerProgressIndicatorWrapper(LoggerWrapper(project.logger))
val androidTarget = sdkHandler.getAndroidTargetManager(logger).getTargetFromHashString(androidExtension.compileSdkVersion, logger) val androidTarget =
sdkHandler.getAndroidTargetManager(logger).getTargetFromHashString(androidExtension.compileSdkVersion, logger) ?: return null
return AndroidDependency( return AndroidDependency(
androidTarget.fullName, androidTarget.fullName,
File(androidTarget.getPath(IAndroidTarget.ANDROID_JAR)), File(androidTarget.getPath(IAndroidTarget.ANDROID_JAR)),