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 b0df157a..9f6108d2 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt @@ -5,7 +5,6 @@ import com.beust.kobalt.Variant import com.beust.kobalt.api.* import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.internal.BaseJvmPlugin -import com.beust.kobalt.internal.JvmCompilerPlugin import com.beust.kobalt.misc.warn import java.io.File import javax.inject.Inject @@ -68,16 +67,6 @@ class JavaPlugin @Inject constructor(val javaCompiler: JavaCompiler, override va } -@Directive -fun javaProject(vararg projects: Project, init: Project.() -> Unit): Project { - return Project().apply { - warn("javaProject{} is deprecated, please use project{}") - init() - (Kobalt.findPlugin(JvmCompilerPlugin.PLUGIN_NAME) as JvmCompilerPlugin) - .addDependentProjects(this, projects.toList()) - } -} - class JavaConfig(val project: Project) { val compilerArgs = arrayListOf() fun args(vararg options: String) = compilerArgs.addAll(options) 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 8f16a3d4..220be8a7 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt @@ -5,13 +5,11 @@ import com.beust.kobalt.Variant import com.beust.kobalt.api.* import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.internal.BaseJvmPlugin -import com.beust.kobalt.internal.JvmCompilerPlugin import com.beust.kobalt.internal.KobaltSettings import com.beust.kobalt.internal.KotlinJarFiles import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.dependency.FileDependency import com.beust.kobalt.misc.KobaltExecutors -import com.beust.kobalt.misc.warn import javax.inject.Inject import javax.inject.Singleton @@ -131,19 +129,6 @@ class KotlinPlugin @Inject constructor(val executors: KobaltExecutors, val depen } } -/** - * @param projects: the list of projects that need to be built before this one. - */ -@Directive -fun kotlinProject(vararg projects: Project, init: Project.() -> Unit): Project { - return Project().apply { - warn("kotlinProject{} is deprecated, please use project{}") - init() - (Kobalt.findPlugin(JvmCompilerPlugin.PLUGIN_NAME) as JvmCompilerPlugin) - .addDependentProjects(this, projects.toList()) - } -} - class KotlinConfig(val project: Project) { val args = arrayListOf() fun args(vararg options: String) = args.addAll(options)