Merge branch 'master' of github.com:cbeust/kobalt-line-count

Conflicts:
	kobalt/src/Build.kt
	kobalt/wrapper/kobalt-wrapper.properties
	src/main/kotlin/com/beust/kobalt/plugin/linecount/LineCountPlugin.kt
	src/main/resources/META-INF/kobalt-plugin.xml

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.

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'

kobalt/src/Build.kt

@@ -5,7 +5,7 @@ import com.beust.kobalt.plugin.publish.*
 //import com.beust.kobalt.plugin.linecount.lineCount
 
 //val plugins = plugins(
-////    "com.beust.kobalt:kobalt-line-count:0.14"
+//    "com.beust.kobalt:kobalt-line-count:0.14"
 //    file(homeDir("kotlin/kobalt-line-count/kobaltBuild/libs/kobalt-line-count-0.14.jar"))
 //)
 

kobalt/wrapper/kobalt-wrapper.properties

@@ -1 +1 @@
-kobalt.version=0.388
+kobalt.version=0.388

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 $*

src/main/kotlin/com/beust/kobalt/plugin/linecount/LineCountPlugin.kt

@@ -13,12 +13,12 @@ import java.nio.file.attribute.BasicFileAttributes
 //}
 
 public class LineCountPlugin : BasePlugin(), ITaskContributor {
-    override fun tasksFor(context: KobaltContext)
+    // ITaskContributor
-        = listOf(DynamicTask(this, "dynamicTask", "Dynamic task", runBefore = listOf("compile"),
+    override fun tasksFor(context: KobaltContext) = listOf(
-            closure = { project ->
+            DynamicTask(this, "dynamicTask", "Dynamic task", runBefore = listOf("compile"), closure = {
-                println("Running dynamic task")
                 TaskResult()
-            }))
+            })
+    )
 
     companion object {
         const val NAME : String = "kobalt-line-count"