diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index befbbef751b..fcb0aaee463 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -126,9 +126,9 @@ public open class KotlinCompile() : AbstractKotlinCompile + args.pluginClasspaths = extraProperties.getOrNull>("compilerPluginClasspaths") ?: arrayOf() getLogger().kotlinDebug("args.pluginClasspaths = ${args.pluginClasspaths.joinToString(File.pathSeparator)}") - val basePluginOptions = (extraProperties.get("compilerPluginArguments") as? Array) ?: array() + val basePluginOptions = extraProperties.getOrNull>("compilerPluginArguments") ?: arrayOf() val pluginOptions = arrayListOf(*basePluginOptions) @@ -334,9 +334,10 @@ public open class KDoc() : SourceTask() { } } -private inline fun ExtraPropertiesExtension.getOrNull(id: String): T? { +private fun ExtraPropertiesExtension.getOrNull(id: String): T? { try { - return get(id) as T + @suppress("UNCHECKED_CAST") + return get(id) as? T } catch (e: ExtraPropertiesExtension.UnknownPropertyException) { return null }