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

Gradle: Do not inline getOrNull()

Browse Source
This commit is contained in:
Yan Zhulanow
2015-06-02 18:09:10 +03:00
parent f1b6bd5914
commit a900a424d0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+5 -4
View File
@@ -126,9 +126,9 @@ public open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments
getLogger().kotlinDebug("args.destination = ${args.destination}") getLogger().kotlinDebug("args.destination = ${args.destination}")
val extraProperties = getExtensions().getExtraProperties() val extraProperties = getExtensions().getExtraProperties()
args.pluginClasspaths = extraProperties.get("compilerPluginClasspaths") as? Array<String> args.pluginClasspaths = extraProperties.getOrNull<Array<String>>("compilerPluginClasspaths") ?: arrayOf()
getLogger().kotlinDebug("args.pluginClasspaths = ${args.pluginClasspaths.joinToString(File.pathSeparator)}") getLogger().kotlinDebug("args.pluginClasspaths = ${args.pluginClasspaths.joinToString(File.pathSeparator)}")
val basePluginOptions = (extraProperties.get("compilerPluginArguments") as? Array<String>) ?: array() val basePluginOptions = extraProperties.getOrNull<Array<String>>("compilerPluginArguments") ?: arrayOf()
val pluginOptions = arrayListOf(*basePluginOptions) val pluginOptions = arrayListOf(*basePluginOptions)
@@ -334,9 +334,10 @@ public open class KDoc() : SourceTask() {
} }
} }
private inline fun <reified T: Any> ExtraPropertiesExtension.getOrNull(id: String): T? { private fun <T: Any> ExtraPropertiesExtension.getOrNull(id: String): T? {
try { try {
return get(id) as T @suppress("UNCHECKED_CAST")
return get(id) as? T
} catch (e: ExtraPropertiesExtension.UnknownPropertyException) { } catch (e: ExtraPropertiesExtension.UnknownPropertyException) {
return null return null
} }