From 2d425d4e0a401f1ddaef5dfe5e547fd3d0e26892 Mon Sep 17 00:00:00 2001 From: Ivan Gavrilovic Date: Fri, 21 Sep 2018 14:03:57 +0100 Subject: [PATCH] Fix null checks in the flow --- .../kotlin/gradle/plugin/android/Android25ProjectHandler.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/agp25/kotlin/org/jetbrains/kotlin/gradle/plugin/android/Android25ProjectHandler.kt b/libraries/tools/kotlin-gradle-plugin/src/agp25/kotlin/org/jetbrains/kotlin/gradle/plugin/android/Android25ProjectHandler.kt index 56208ac3c93..928bcc9a780 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/agp25/kotlin/org/jetbrains/kotlin/gradle/plugin/android/Android25ProjectHandler.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/agp25/kotlin/org/jetbrains/kotlin/gradle/plugin/android/Android25ProjectHandler.kt @@ -92,9 +92,9 @@ class Android25ProjectHandler(kotlinConfigurationTools: KotlinConfigurationTools @Suppress("DEPRECATION") // There is always a Java compile task -- the deprecation was for Jack return variantData::class.java.methods.firstOrNull { it.name == "getJavaCompileProvider" } ?.invoke(variantData) - .let { taskProvider -> + ?.let { taskProvider -> // 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 }