diff --git a/.idea/kobalt.xml b/.idea/kobalt.xml index ed2be6d..52b4669 100644 --- a/.idea/kobalt.xml +++ b/.idea/kobalt.xml @@ -5,23 +5,13 @@ - - - \ No newline at end of file diff --git a/example/example.iml b/example/example.iml index fcc55b6..6ca0d8f 100644 --- a/example/example.iml +++ b/example/example.iml @@ -1,16 +1,16 @@ - + - - + + - - - + + + \ No newline at end of file diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt index b2e052a..eb7c521 100644 --- a/example/kobalt/src/Build.kt +++ b/example/kobalt/src/Build.kt @@ -2,17 +2,15 @@ import com.beust.kobalt.* import com.beust.kobalt.plugin.packaging.* import com.beust.kobalt.plugin.application.* import com.beust.kobalt.plugin.java.* -import net.thauvin.erik.kobalt.plugin.maven.local.* val bs = buildScript { repos(localMaven()) - //plugins(file("../kobaltBuild/libs/kobalt-maven-local-0.5.2.jar")) plugins("net.thauvin.erik:kobalt-maven-local:") } val example = project { - //println(">>> LOCAL MAVEN REPO: " + localMaven()) + // println(" >>> LOCAL MAVEN REPO: " + localMaven()) name = "example" group = "com.example" diff --git a/example/kobalt/wrapper/kobalt-wrapper.properties b/example/kobalt/wrapper/kobalt-wrapper.properties index 91fe49a..1ec9521 100644 --- a/example/kobalt/wrapper/kobalt-wrapper.properties +++ b/example/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=1.0.3 \ No newline at end of file +kobalt.version=1.0.5 \ No newline at end of file diff --git a/example/m2/repository/.gitignore b/example/m2/repository/.gitignore deleted file mode 100644 index 5e7d273..0000000 --- a/example/m2/repository/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore diff --git a/kobalt-maven-local.iml b/kobalt-maven-local.iml index bd0250c..456c8ae 100644 --- a/kobalt-maven-local.iml +++ b/kobalt-maven-local.iml @@ -22,432 +22,9 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -463,9 +40,432 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kobalt/Build.kt.iml b/kobalt/Build.kt.iml index a6e2d45..e091790 100644 --- a/kobalt/Build.kt.iml +++ b/kobalt/Build.kt.iml @@ -19,9 +19,18 @@ - + - + + + + + + + + + + diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index fa3d95e..880ea63 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -1,4 +1,8 @@ import com.beust.kobalt.buildScript +import com.beust.kobalt.file +import com.beust.kobalt.localMaven +import com.beust.kobalt.misc.kobaltLog +import com.beust.kobalt.plugin.application.application import com.beust.kobalt.plugin.packaging.assemble import com.beust.kobalt.plugin.publish.bintray import com.beust.kobalt.project @@ -8,8 +12,18 @@ import org.apache.maven.model.License import org.apache.maven.model.Model import org.apache.maven.model.Scm +val semver = "0.5.2" + val bs = buildScript { - plugins("net.thauvin.erik:kobalt-versioneye:") + val f = java.io.File("kobaltBuild/libs/kobalt-maven-local-$semver.jar") + val p = if (f.exists()) { + kobaltLog(1, " >>> Using: ${f.path}") + file(f.path) + } else { + "net.thauvin.erik:kobalt-maven-local:" + } + plugins("net.thauvin.erik:kobalt-versioneye:", p) + repos(localMaven()) } val dev = false @@ -19,7 +33,7 @@ val p = project { name = "kobalt-maven-local" group = "net.thauvin.erik" artifactId = name - version = "0.5.2" + version = semver pom = Model().apply { description = "Maven Local Repository plug-in for the Kobalt build system." @@ -75,3 +89,37 @@ val p = project { team = "Owners" } } + +val example = project(p) { + + println(" >>> LOCAL MAVEN REPO: " + localMaven()) + + name = "example" + group = "com.example" + artifactId = name + version = "0.1" + directory = "example" + + sourceDirectories { + path("src/main/java") + } + + sourceDirectoriesTest { + path("src/test/java") + } + + dependencies { + } + + dependenciesTest { + } + + assemble { + jar { + } + } + + application { + mainClass = "com.example.Main" + } +} \ No newline at end of file diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index 91fe49a..1ec9521 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=1.0.3 \ No newline at end of file +kobalt.version=1.0.5 \ No newline at end of file diff --git a/libs/example-0.1.jar b/libs/example-0.1.jar new file mode 100644 index 0000000..3e82662 Binary files /dev/null and b/libs/example-0.1.jar differ