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

Fix null checks in the flow

Browse Source
This commit is contained in:
Ivan Gavrilovic
2018-09-21 14:03:57 +01:00
committed by Sergey Igushkin
parent bb53a1c3d2
commit 2d425d4e0a
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/agp25/kotlin/org/jetbrains/kotlin/gradle/plugin/android/Android25ProjectHandler.kt
+2 -2
View File
@@ -92,9 +92,9 @@ class Android25ProjectHandler(kotlinConfigurationTools: KotlinConfigurationTools
@Suppress("DEPRECATION") // There is always a Java compile task -- the deprecation was for Jack @Suppress("DEPRECATION") // There is always a Java compile task -- the deprecation was for Jack
return variantData::class.java.methods.firstOrNull { it.name == "getJavaCompileProvider" } return variantData::class.java.methods.firstOrNull { it.name == "getJavaCompileProvider" }
?.invoke(variantData) ?.invoke(variantData)
.let { taskProvider -> ?.let { taskProvider ->
// org.gradle.api.tasks.TaskProvider is added in Gradle 4.8 // org.gradle.api.tasks.TaskProvider is added in Gradle 4.8
taskProvider!!::class.java.methods.firstOrNull { it.name == "get" }?.invoke(taskProvider) as AbstractCompile? taskProvider::class.java.methods.firstOrNull { it.name == "get" }?.invoke(taskProvider) as AbstractCompile?
} ?: variantData.javaCompile } ?: variantData.javaCompile
} }