From 37ed8e2617e9a55527ccbcf1bac071cb785baf86 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Thu, 14 Jun 2018 17:19:18 +0300 Subject: [PATCH] Build: Reformat CommonUtil.kt --- buildSrc/src/main/kotlin/CommonUtil.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/CommonUtil.kt b/buildSrc/src/main/kotlin/CommonUtil.kt index 63dc9d3e720..a46f5284662 100644 --- a/buildSrc/src/main/kotlin/CommonUtil.kt +++ b/buildSrc/src/main/kotlin/CommonUtil.kt @@ -1,4 +1,5 @@ -@file:Suppress("unused") // usages in build scripts are not tracked properly +// usages in build scripts are not tracked properly +@file:Suppress("unused") import groovy.lang.Closure import org.gradle.api.Project @@ -6,7 +7,6 @@ import org.gradle.api.Task import org.gradle.api.file.CopySourceSpec import org.gradle.api.file.SourceDirectorySet import org.gradle.api.plugins.JavaPluginConvention -import org.gradle.api.tasks.JavaExec import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.SourceSetOutput import org.gradle.kotlin.dsl.creating @@ -22,7 +22,7 @@ fun Project.callGroovy(name: String, vararg args: Any?): Any? { return (property(name) as Closure<*>).call(*args) } -inline fun Project.withJavaPlugin(crossinline body: () -> T?): T? { +inline fun Project.withJavaPlugin(crossinline body: () -> T?): T? { var res: T? = null pluginManager.withPlugin("java") { res = body() @@ -47,11 +47,15 @@ fun File(root: String, vararg children: String): File = children.fold(File(root) var Project.jvmTarget: String? get() = extra.takeIf { it.has("jvmTarget") }?.get("jvmTarget") as? String - set(v) { extra["jvmTarget"] = v } + set(v) { + extra["jvmTarget"] = v + } var Project.javaHome: String? get() = extra.takeIf { it.has("javaHome") }?.get("javaHome") as? String - set(v) { extra["javaHome"] = v } + set(v) { + extra["javaHome"] = v + } fun Project.generator(fqName: String, sourceSet: SourceSet? = null) = smartJavaExec { classpath = (sourceSet ?: javaPluginConvention().sourceSets["test"]).runtimeClasspath