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

Turning on project{} (and warnings for javaProject/kotlinProject).

Browse source
This commit is contained in:
Cedric Beust 2016-02-04 22:38:49 +04:00
parent a118d3680b
commit 44bc37881e
5 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kobalt/src/Build.kt
View file

@ -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

16
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Directives.kt Normal file
View file

@ -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())
}
}

9
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/JvmCompilerPlugin.kt
View file

@ -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())
}
}

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

@ -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())

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

@ -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())