diff --git a/Build.kt b/Build.kt index 94ed7a8..0578f3d 100644 --- a/Build.kt +++ b/Build.kt @@ -24,15 +24,11 @@ val processorExample = javaProject(processor) { directory = "example" dependencies { - compile(file("../processor/kobaltBuild/libs/processor-0.1.jar")) + compile(file("processor/kobaltBuild/libs/processor-0.1.jar")) } assemble { jar { - fatJar = true - manifest { - attributes("Main-Class", "com.beust.apt.example.Example") - } } } diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt deleted file mode 100644 index 1c502d7..0000000 --- a/kobalt/src/Build.kt +++ /dev/null @@ -1,123 +0,0 @@ - -import com.beust.kobalt.api.License -import com.beust.kobalt.api.Scm -import com.beust.kobalt.homeDir -import com.beust.kobalt.internal.test -import com.beust.kobalt.plugin.application.application -import com.beust.kobalt.plugin.java.javaProject -import com.beust.kobalt.plugin.kotlin.kotlinCompiler -import com.beust.kobalt.plugin.kotlin.kotlinProject -import com.beust.kobalt.plugin.packaging.assemble -import com.beust.kobalt.plugin.publish.jcenter -import com.beust.kobalt.repos -import java.io.File - -val r = repos("http://repo.spongepowered.org/maven") - - -val wrapper = javaProject { - name = "kobalt-wrapper" - version = readVersion() - directory = "modules/wrapper" - - assemble { - jar { - name = projectName + ".jar" - manifest { - attributes("Main-Class", "com.beust.kobalt.wrapper.Main") - } - } - } - - application { - mainClass = "com.beust.kobalt.wrapper.Main" - jvmArgs("-Dtest=foo") - } -} - -val kobalt = kotlinProject(wrapper) { - name = "kobalt" - group = "com.beust" - artifactId = name - version = readVersion() - description = "A build system in Kotlin" - url = "http://beust.com/kobalt" - licenses = arrayListOf(License("Apache 2.0", "http://www.apache.org/licenses/LICENSE-2.0")) - scm = Scm(url = "http://github.com/cbeust/kobalt", - connection = "https://github.com/cbeust/kobalt.git", - developerConnection = "git@github.com:cbeust/kobalt.git") - - dependenciesTest { - compile("org.testng:testng:6.9.9") - } - - dependencies { - compile("org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-1038", - "org.jetbrains.kotlin:kotlin-compiler-embeddable:1.0.0-beta-1038", - "org.spongepowered:spongeapi:2.1-SNAPSHOT", - - // file(homeDir("java/jcommander/target/jcommander-1.47.jar")), - "com.beust:jcommander:1.48", - "com.squareup.okhttp:okhttp:2.5.0", - "org.jsoup:jsoup:1.8.3", - "com.google.inject:guice:4.0", - "com.google.inject.extensions:guice-assistedinject:4.0", - "javax.inject:javax.inject:1", - "com.google.guava:guava:19.0-rc2", - "org.apache.maven:maven-model:3.3.3", - "com.github.spullara.mustache.java:compiler:0.9.1", - "io.reactivex:rxjava:1.0.14", - "com.google.code.gson:gson:2.4" - ) - } - - assemble { - mavenJars { - fatJar = true - manifest { - attributes("Main-Class", "com.beust.kobalt.MainKt") - } - } - zip { - include("kobaltw") - include(from("$buildDirectory/libs"), to("kobalt/wrapper"), - "$projectName-$version.jar") - include(from("modules/wrapper/$buildDirectory/libs"), to("kobalt/wrapper"), - "$projectName-wrapper.jar") - } - } - - test { - args("-log", "2", "src/test/resources/testng.xml") - } - - kotlinCompiler { - args("-nowarn") - } - - jcenter { - publish = true - file("$buildDirectory/libs/$name-$version.zip", "$name/$version/$name-$version.zip") - } -} - -fun readVersion() : String { - val p = java.util.Properties() - var localFile = java.io.File("src/main/resources/kobalt.properties") - if (! localFile.exists()) { - localFile = File(homeDir("kotlin", "kobalt", "src/main/resources/kobalt.properties")) - } - p.load(java.io.FileReader(localFile)) - return p.getProperty("kobalt.version") -} - -//import com.beust.kobalt.plugin.linecount.lineCount -//val plugins = plugins( -// "com.beust.kobalt:kobalt-line-count:0.15" -//// file(homeDir("kotlin/kobalt-line-count/kobaltBuild/libs/kobalt-line-count-0.14.jar")) -//) -// -//val lc = lineCount { -// suffix = "**.md" -//} - diff --git a/kobalt/wrapper/kobalt-wrapper.jar b/kobalt/wrapper/kobalt-wrapper.jar index ef904a4..d79c449 100644 Binary files a/kobalt/wrapper/kobalt-wrapper.jar and b/kobalt/wrapper/kobalt-wrapper.jar differ diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index eee113f..2a639e9 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=0.234 \ No newline at end of file +kobalt.version=0.246 diff --git a/kobaltw b/kobaltw old mode 100644 new mode 100755 index b27b3d8..494cd77 --- a/kobaltw +++ b/kobaltw @@ -1 +1 @@ -java -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $* +java -jar $(dirname $0)/kobalt/wrapper/kobalt-wrapper.jar $* diff --git a/run b/run new file mode 100755 index 0000000..6857885 --- /dev/null +++ b/run @@ -0,0 +1 @@ +java -classpath processor/kobaltBuild/libs/processor-0.1.jar:example/kobaltBuild/libs/example-0.1.jar com.beust.apt.example.Example