From 5be446899a8b42b65b373c81d94f8be965a6fd95 Mon Sep 17 00:00:00 2001
From: Suresh G <sureshg.g@gmail.com>
Date: Thu, 29 Jun 2017 22:44:09 -0700
Subject: [PATCH 1/2] Optimize imports

---
 buildSrc/src/main/kotlin/BuildExtns.kt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/kotlin/BuildExtns.kt b/buildSrc/src/main/kotlin/BuildExtns.kt
index a9d9651..e7e4551 100644
--- a/buildSrc/src/main/kotlin/BuildExtns.kt
+++ b/buildSrc/src/main/kotlin/BuildExtns.kt
@@ -5,10 +5,7 @@ import org.gradle.api.plugins.MavenPluginConvention
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.api.tasks.wrapper.Wrapper.DistributionType
-import org.gradle.kotlin.dsl.embeddedKotlinVersion
-import org.gradle.kotlin.dsl.extra
-import org.gradle.kotlin.dsl.get
-import org.gradle.kotlin.dsl.the
+import org.gradle.kotlin.dsl.*
 import term.bold
 import term.cyan
 import term.fg256
@@ -119,7 +116,7 @@ fun MavenPluginConvention.mvnpom(config: MavenPom.() -> Unit) = pom().apply(conf
 fun Project.sourceSets(block: SourceSetContainer.() -> Unit) = the<JavaPluginConvention>().sourceSets.apply(block)
 
 /**
- * Main and test source config extensions.
+ * Main and test source set extensions.
  */
 val SourceSetContainer.main: SourceSet get() = this["main"]
 val SourceSetContainer.test: SourceSet get() = this["test"]

From 74b8c7ed3d0655469c616c533ecfdd957e51871b Mon Sep 17 00:00:00 2001
From: Suresh G <sureshg.g@gmail.com>
Date: Fri, 30 Jun 2017 15:17:38 -0700
Subject: [PATCH 2/2] Polish the scripts

---
 build.gradle.kts                       | 4 +---
 buildSrc/src/main/kotlin/BuildExtns.kt | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6f216bb..fa1db98 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -75,9 +75,7 @@ apply {
     }.forEach {
         from(it.name)
     }
-    kotlinPlugins.forEach {
-        plugin("org.jetbrains.kotlin.$it")
-    }
+    kotlinPlugins.forEach { plugin(it) }
     plugin<BookPlugin>()
     plugin<JUnitPlatformPlugin>()
     plugin<DependencyManagementPlugin>()
diff --git a/buildSrc/src/main/kotlin/BuildExtns.kt b/buildSrc/src/main/kotlin/BuildExtns.kt
index e7e4551..c136dbf 100644
--- a/buildSrc/src/main/kotlin/BuildExtns.kt
+++ b/buildSrc/src/main/kotlin/BuildExtns.kt
@@ -42,7 +42,7 @@ val kotlinxRepoSysProp = sysProp("kotlinx.repo")
 /**
  * Visit the [plugin portal](https://plugins.gradle.org/search?term=org.jetbrains.kotlin) to see the list of available plugins.
  */
-val kotlinPlugins = listOf("jvm", "kapt", "plugin.allopen", "plugin.noarg", "plugin.spring", "plugin.jpa")
+val kotlinPlugins = listOf("jvm", "kapt", "plugin.allopen", "plugin.noarg", "plugin.spring", "plugin.jpa").map { "org.jetbrains.kotlin.$it" }
 
 fun gradleKotlinDslUrl(version: String, type: DistributionType = DistributionType.ALL) = "$GradleSnapShotURL/$version-${type.name.toLowerCase()}.zip"