From d51ee7ca6bd6f2414e8f91f96834fdc58632f1ec Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Mon, 16 Nov 2015 03:07:21 -0800 Subject: [PATCH 1/7] Update to kobalt-plugin.xml --- Build.kt | 6 +++--- kobalt/wrapper/kobalt-wrapper.properties | 2 +- kobaltw | 4 ++-- .../resources/META-INF/{plugin.xml => kobalt-plugin.xml} | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename src/main/resources/META-INF/{plugin.xml => kobalt-plugin.xml} (100%) diff --git a/Build.kt b/Build.kt index 4d6747b..cfcbb85 100644 --- a/Build.kt +++ b/Build.kt @@ -4,10 +4,10 @@ import com.beust.kobalt.plugin.kotlin.* import com.beust.kobalt.plugin.publish.* //import com.beust.kobalt.plugin.linecount.lineCount -//val plugins = plugins( -//// "com.beust.kobalt:kobalt-line-count:0.14" +val plugins = plugins( + "com.beust.kobalt:kobalt-line-count:0.14" // file(homeDir("kotlin/kobalt-line-count/kobaltBuild/libs/kobalt-line-count-0.14.jar")) -//) +) //val lc = lineCount { // suffix = "**Plugin.kt" diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index 5ea33a2..fe1450f 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=0.226 \ No newline at end of file +kobalt.version=0.276 diff --git a/kobaltw b/kobaltw index 37966eb..1fd228d 100755 --- a/kobaltw +++ b/kobaltw @@ -1,2 +1,2 @@ -java -jar kobalt/wrapper/kobalt-wrapper.jar $* - +#!/usr/bin/env bash +java -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $* diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/kobalt-plugin.xml similarity index 100% rename from src/main/resources/META-INF/plugin.xml rename to src/main/resources/META-INF/kobalt-plugin.xml From 75bf30a16c1d7038928e0cebd4018b47a78a0f21 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sun, 13 Dec 2015 03:57:08 +0400 Subject: [PATCH 2/7] Update to 0.329. --- Build.kt | 11 +++++------ build.gradle | 5 ++++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Build.kt b/Build.kt index cfcbb85..3f8cd81 100644 --- a/Build.kt +++ b/Build.kt @@ -4,10 +4,10 @@ import com.beust.kobalt.plugin.kotlin.* import com.beust.kobalt.plugin.publish.* //import com.beust.kobalt.plugin.linecount.lineCount -val plugins = plugins( - "com.beust.kobalt:kobalt-line-count:0.14" +//val plugins = plugins( +// "com.beust.kobalt:kobalt-line-count:0.14" // file(homeDir("kotlin/kobalt-line-count/kobaltBuild/libs/kobalt-line-count-0.14.jar")) -) +//) //val lc = lineCount { // suffix = "**Plugin.kt" @@ -17,11 +17,10 @@ val project = kotlinProject { name = "kobalt-line-count" group = "com.beust.kobalt" artifactId = name - version = "0.16" + version = "0.17" dependencies { -// compile("file:" + homeDir("kotlin/kobalt/kobaltBuild/libs/kobalt-0.168.jar")) - compile("com.beust:kobalt:0.226") + compile("com.beust:kobalt:0.329") } assemble { diff --git a/build.gradle b/build.gradle index 91c6674..c6ea071 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,5 @@ buildscript { + ext.kotlin_version = '1.0.0-beta-3595' ext.kotlin_version = '0.14.449' repositories { jcenter() @@ -10,6 +11,7 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" classpath "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -23,7 +25,8 @@ apply plugin: 'kotlin' dependencies { compile "com.google.guava:guava:18.0" - compile "com.beust:kobalt:0.174" + compile "com.beust:kobalt:0.329" + compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } sourceSets { main.java.srcDirs += 'src/main/kotlin' From 79242e1d8262ab48d41d82760b564c2cec0d5d28 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sun, 13 Dec 2015 03:57:14 +0400 Subject: [PATCH 3/7] Fix XML file. --- src/main/resources/META-INF/kobalt-plugin.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/META-INF/kobalt-plugin.xml b/src/main/resources/META-INF/kobalt-plugin.xml index 79b9ef9..e2280f5 100644 --- a/src/main/resources/META-INF/kobalt-plugin.xml +++ b/src/main/resources/META-INF/kobalt-plugin.xml @@ -1,6 +1,6 @@ kobalt-line-count - + com.beust.kobalt.plugin.linecount.LineCountPlugin - + \ No newline at end of file From fbb27d246df6949f288552650c4619b2772e1c5d Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sun, 13 Dec 2015 03:57:23 +0400 Subject: [PATCH 4/7] Use ITaskContributor. --- .../plugin/linecount/LineCountPlugin.kt | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/linecount/LineCountPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/linecount/LineCountPlugin.kt index fe52da3..586d6d8 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/linecount/LineCountPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/linecount/LineCountPlugin.kt @@ -1,12 +1,9 @@ package com.beust.kobalt.plugin.linecount -import com.beust.kobalt.api.BasePlugin -import com.beust.kobalt.api.Kobalt -import com.beust.kobalt.api.KobaltContext -import com.beust.kobalt.api.Project +import com.beust.kobalt.TaskResult +import com.beust.kobalt.api.* import com.beust.kobalt.api.annotation.Directive import com.beust.kobalt.api.annotation.Task -import com.beust.kobalt.internal.TaskResult import com.beust.kobalt.misc.log import java.nio.file.* import java.nio.file.attribute.BasicFileAttributes @@ -15,7 +12,15 @@ fun main(argv: Array) { com.beust.kobalt.main(argv) } -public class LineCountPlugin : BasePlugin() { +public class LineCountPlugin : BasePlugin(), ITaskContributor { + + // ITaskContributor + override fun tasksFor(context: KobaltContext) = listOf( + DynamicTask(this, "dynamicTask", "Dynamic task", runBefore = listOf("compile"), closure = { + TaskResult() + }) + ) + companion object { const val NAME : String = "kobalt-line-count" } @@ -23,15 +28,6 @@ public class LineCountPlugin : BasePlugin() { var info: LineCountInfo = LineCountInfo() - override fun apply(project: Project, context: KobaltContext) { - println("*** Applying plugin $name with project $project") - println("*** Adding dynamic task") - addTask(project, "dynamicTask", runBefore = listOf("compile")) { - println("Dynamic task") - TaskResult() - } - } - @Task(name = "lineCount", description = "Count the lines", runBefore = arrayOf("compile")) fun lineCount(project: Project): TaskResult { var fileCount = 0 From dfc461a2ad5d4cf5d1c96779b4304e3b541458af Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sun, 13 Dec 2015 03:57:32 +0400 Subject: [PATCH 5/7] Update kobalt. --- kobalt/wrapper/kobalt-wrapper.jar | Bin 6177 -> 7246 bytes kobalt/wrapper/kobalt-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/kobalt/wrapper/kobalt-wrapper.jar b/kobalt/wrapper/kobalt-wrapper.jar index 98481509fac75bd040642dbb93576df1e2b39a6b..d8394fe8614546b84f62dad81433eec7efa0da17 100644 GIT binary patch delta 6945 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 ZMQRZ#F%c@-|9p}E!{UF_n&N-1{|6%Ic3J=c literal 6177 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 diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index fe1450f..82d7761 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=0.276 +kobalt.version=0.329 From 160448998ce6b976835d2da641655456e22242d6 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sun, 13 Dec 2015 04:05:45 +0400 Subject: [PATCH 6/7] Move build file. --- Build.kt => kobalt/src/Build.kt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Build.kt => kobalt/src/Build.kt (100%) diff --git a/Build.kt b/kobalt/src/Build.kt similarity index 100% rename from Build.kt rename to kobalt/src/Build.kt From da193174b96b9b2f8ba844d73c6eaca489670ccc Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sun, 13 Dec 2015 07:21:36 -0800 Subject: [PATCH 7/7] README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3410019..be471c3 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ # kobalt-line-count, a plug-in for the Kobalt build system + +Please see [the Kobalt documentation](http://beust.com/kobalt/ten-minutes/index.html) where this plug-in is explained in details.