From 70a44ccc679c5bda8b81c8aa12bf48e04a2c3def Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Thu, 16 Feb 2023 10:19:44 +0100 Subject: [PATCH] [Gradle] ExtraPropertiesExtension.getOrPut: Use `castIsolatedKotlinPluginClassLoaderAware` To provide better error messages for users when this function fails due to isolated classpaths ... for KT-56712 --- .../org/jetbrains/kotlin/gradle/utils/extraProperties.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/extraProperties.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/extraProperties.kt index 2e60c296fea..fffe948550d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/extraProperties.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/extraProperties.kt @@ -13,7 +13,8 @@ internal inline fun ExtraPropertiesExtension.getOrPut(key: Str if (!has(key)) { set(key, provideValue()) } - get(key) as T + val value = get(key) ?: throw NullPointerException("Null extra in for $key") + value.castIsolatedKotlinPluginClassLoaderAware() } }