From 44bc37881e82b0cf13d48bf7dbf533b3c837d7fd Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Thu, 4 Feb 2016 22:38:49 +0400
Subject: [PATCH] Turning on project{} (and warnings for
 javaProject/kotlinProject).

---
 kobalt/src/Build.kt                              |  8 ++++----
 .../main/kotlin/com/beust/kobalt/Directives.kt   | 16 ++++++++++++++++
 .../beust/kobalt/internal/JvmCompilerPlugin.kt   |  9 ---------
 .../com/beust/kobalt/plugin/java/JavaPlugin.kt   |  1 +
 .../beust/kobalt/plugin/kotlin/KotlinPlugin.kt   |  1 +
 5 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Directives.kt

diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt
index 51f55985..1abdfef8 100644
--- a/kobalt/src/Build.kt
+++ b/kobalt/src/Build.kt
@@ -1,5 +1,5 @@
 
-import com.beust.kobalt.TaskResult
+import com.beust.kobalt.*
 import com.beust.kobalt.api.License
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.api.Scm
@@ -22,7 +22,7 @@ import java.nio.file.StandardCopyOption
 
 val r = repos("http://dl.bintray.com/kotlin/kotlinx.dom")
 
-val wrapper = javaProject {
+val wrapper = project {
     name = "kobalt-wrapper"
     version = readVersion()
     directory = "modules/wrapper"
@@ -46,7 +46,7 @@ val wrapper = javaProject {
 }
 
 
-val kobaltPluginApi = kotlinProject {
+val kobaltPluginApi = project {
     name = "kobalt-plugin-api"
     group = "com.beust"
     artifactId = name
@@ -103,7 +103,7 @@ val kobaltPluginApi = kotlinProject {
     }
 }
 
-val kobaltApp = kotlinProject(kobaltPluginApi, wrapper) {
+val kobaltApp = project(kobaltPluginApi, wrapper) {
     name = "kobalt"
     group = "com.beust"
     artifactId = name
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Directives.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Directives.kt
new file mode 100644
index 00000000..a655325a
--- /dev/null
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Directives.kt
@@ -0,0 +1,16 @@
+package com.beust.kobalt
+
+import com.beust.kobalt.api.Kobalt
+import com.beust.kobalt.api.Project
+import com.beust.kobalt.api.annotation.Directive
+import com.beust.kobalt.internal.JvmCompilerPlugin
+
+@Directive
+public fun project(vararg projects: Project, init: Project.() -> Unit): Project {
+    return Project("").apply {
+        init()
+        (Kobalt.findPlugin(JvmCompilerPlugin.PLUGIN_NAME) as JvmCompilerPlugin)
+                .addDependentProjects(this, projects.toList())
+    }
+}
+
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
index 22982667..9480342b 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
@@ -308,12 +308,3 @@ open class JvmCompilerPlugin @Inject constructor(
 
     open val compiler: ICompilerContributor? = null
 }
-
-@Directive
-public fun project(vararg projects: Project, init: Project.() -> Unit): Project {
-    return Project("").apply {
-        init()
-        (Kobalt.findPlugin(JvmCompilerPlugin.PLUGIN_NAME) as JvmCompilerPlugin)
-                .addDependentProjects(this, projects.toList())
-    }
-}
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
index e94f1f7b..9618caf7 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt
@@ -76,6 +76,7 @@ class JavaPlugin @Inject constructor(val javaCompiler: JavaCompiler)
 @Directive
 public fun javaProject(vararg projects: Project, init: JavaProject.() -> Unit): JavaProject {
     return JavaProject().apply {
+        warn("javaProject{} is deprecated, please use project{}")
         init()
         (Kobalt.findPlugin(JvmCompilerPlugin.PLUGIN_NAME) as JvmCompilerPlugin)
                 .addDependentProjects(this, projects.toList())
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
index 733c2186..90fb73e4 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
@@ -142,6 +142,7 @@ class KotlinPlugin @Inject constructor(val executors: KobaltExecutors)
 @Directive
 fun kotlinProject(vararg projects: Project, init: KotlinProject.() -> Unit): KotlinProject {
     return KotlinProject().apply {
+        warn("kotlinProject{} is deprecated, please use project{}")
         init()
         (Kobalt.findPlugin(JvmCompilerPlugin.PLUGIN_NAME) as JvmCompilerPlugin)
                 .addDependentProjects(this, projects.toList())