Delete JavaProject/KotlinProject.

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt

@@ -9,7 +9,7 @@ import java.io.File
 import java.util.*
 
 open class Project(
-        @Directive open var name: String,
+        @Directive open var name: String = "",
         @Directive open var version: String? = null,
         @Directive open var directory: String = ".",
         @Directive open var buildDirectory: String = KFiles.KOBALT_BUILD_DIR,

src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt

@@ -74,8 +74,8 @@ class JavaPlugin @Inject constructor(val javaCompiler: JavaCompiler)
 }
 
 @Directive
-public fun javaProject(vararg projects: Project, init: JavaProject.() -> Unit): JavaProject {
+public fun javaProject(vararg projects: Project, init: Project.() -> Unit): Project {
-    return JavaProject().apply {
+    return Project().apply {
         warn("javaProject{} is deprecated, please use project{}")
         init()
         (Kobalt.findPlugin(JvmCompilerPlugin.PLUGIN_NAME) as JvmCompilerPlugin)

src/main/kotlin/com/beust/kobalt/plugin/java/JavaProject.kt

@@ -1,31 +0,0 @@
-package com.beust.kobalt.plugin.java
-
-import com.beust.kobalt.api.Dependencies
-import com.beust.kobalt.api.Project
-import com.beust.kobalt.api.annotation.Directive
-import com.beust.kobalt.misc.toString
-
-public class JavaProject(
-        @Directive
-        override var name: String = "",
-        @Directive
-        override var version: String? = null,
-        /** The absolute directory location of this project */
-        @Directive
-        override var directory: String = ".",
-        /** The build directory, relative to the project directory */
-        @Directive
-        override var buildDirectory: String = "kobaltBuild",
-        @Directive
-        override var group: String? = null,
-        @Directive
-        override var artifactId: String? = null,
-        @Directive
-        override var dependencies: Dependencies? = null,
-        @Directive
-        override var packaging: String? = null)
-    : Project(name, version, directory, buildDirectory, group, artifactId, packaging, dependencies, ".java") {
-
-    override public fun toString() = toString("JavaProject", "name", name)
-}
-

src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt

@@ -140,8 +140,8 @@ class KotlinPlugin @Inject constructor(val executors: KobaltExecutors)
  * @param project: the list of projects that need to be built before this one.
  */
 @Directive
-fun kotlinProject(vararg projects: Project, init: KotlinProject.() -> Unit): KotlinProject {
+fun kotlinProject(vararg projects: Project, init: Project.() -> Unit): Project {
-    return KotlinProject().apply {
+    return Project().apply {
         warn("kotlinProject{} is deprecated, please use project{}")
         init()
         (Kobalt.findPlugin(JvmCompilerPlugin.PLUGIN_NAME) as JvmCompilerPlugin)

src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProject.kt

@@ -1,30 +0,0 @@
-package com.beust.kobalt.plugin.kotlin
-
-import com.beust.kobalt.api.Dependencies
-import com.beust.kobalt.api.Project
-import com.beust.kobalt.api.annotation.Directive
-import com.beust.kobalt.misc.toString
-
-public class KotlinProject(
-        @Directive
-        override var name: String = "",
-        @Directive
-        override var version: String? = null,
-        /** The absolute directory location of this project */
-        @Directive
-        override var directory: String = ".",
-        /** The build directory, relative to the project directory */
-        @Directive
-        override var buildDirectory: String = "kobaltBuild",
-        @Directive
-        override var group: String? = null,
-        @Directive
-        override var artifactId: String? = name,
-        @Directive
-        override var dependencies: Dependencies? = null,
-        @Directive
-        override var packaging: String? = null)
-        : Project(name, version, directory, buildDirectory, group, artifactId, packaging, dependencies, ".kt") {
-
-    override public fun toString() = toString("KotlinProject", "name", name)
-}

src/test/kotlin/com/beust/kobalt/VariantTest.kt

@@ -1,8 +1,8 @@
 package com.beust.kobalt
 
+import com.beust.kobalt.api.Project
 import com.beust.kobalt.api.buildType
 import com.beust.kobalt.api.productFlavor
-import com.beust.kobalt.plugin.java.JavaProject
 import org.testng.Assert
 import org.testng.annotations.DataProvider
 import org.testng.annotations.Test
@@ -12,21 +12,21 @@ class VariantTest : KobaltTest() {
 
     @DataProvider(name = "projectVariants")
     fun projectVariants() = arrayOf(
-            arrayOf(emptySet<String>(), JavaProject().apply {
+            arrayOf(emptySet<String>(), Project().apply {
             }),
-            arrayOf(hashSetOf("compileDev"), JavaProject().apply {
+            arrayOf(hashSetOf("compileDev"), Project().apply {
                 productFlavor("dev") {}
             }),
-            arrayOf(hashSetOf("compileDev", "compileProd"), JavaProject().apply {
+            arrayOf(hashSetOf("compileDev", "compileProd"), Project().apply {
                 productFlavor("dev") {}
                 productFlavor("prod") {}
             }),
-            arrayOf(hashSetOf("compileDevDebug"), JavaProject().apply {
+            arrayOf(hashSetOf("compileDevDebug"), Project().apply {
                 productFlavor("dev") {}
                 buildType("debug") {}
             }),
             arrayOf(hashSetOf("compileDevRelease", "compileDevDebug", "compileProdDebug", "compileProdRelease"),
-                    JavaProject().apply {
+                    Project().apply {
                         productFlavor("dev") {}
                         productFlavor("prod") {}
                         buildType("debug") {}
@@ -36,7 +36,7 @@ class VariantTest : KobaltTest() {
 
     @Test(dataProvider = "projectVariants", description =
             "Make sure we generate the correct dynamic tasks based on the product flavor and build types.")
-    fun taskNamesShouldWork(expected: Set<String>, project: JavaProject) {
+    fun taskNamesShouldWork(expected: Set<String>, project: Project) {
         val variantNames = HashSet(Variant.allVariants(project).map { it.toTask("compile") })
         Assert.assertEquals(variantNames, expected)
     }