erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Remove javaProject/kotlinProject.

Browse source
This commit is contained in:
Cedric Beust 2017-03-21 09:28:33 -07:00
parent bdb8f5988d
commit de6b7afb61
2 changed files with 0 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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<String>()
fun args(vararg options: String) = compilerArgs.addAll(options)

15
src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt
View file

@ -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<String>()
fun args(vararg options: String) = args.addAll(options)