diff --git a/.gitignore b/.gitignore index 1c150cd..6fb8d73 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,9 @@ **/.idea/tasks.xml **/.idea/workspace.xml *.iws -.DS_Store +*.sublime-* .classpath +.DS_Store .gradle .kobalt .nb-gradle @@ -25,6 +26,6 @@ /project.properties /target /test-output -Thumbs.db ehthumbs.db -kobaltBuild \ No newline at end of file +kobaltBuild +Thumbs.db \ No newline at end of file diff --git a/README.md b/README.md index fa70cca..23215f5 100644 --- a/README.md +++ b/README.md @@ -16,15 +16,6 @@ val p = project { } ``` -Use the `localMaven()` directive to tell Kobalt to look for artifacts in the Maven Local Repository: - -```kotlin -val bs = buildScript { - ... - repos(localMaven()) -} -``` - To publish to the Maven Local Repository use the `publishToMavenLocal` task: ``` diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt index 741195e..5008631 100644 --- a/example/kobalt/src/Build.kt +++ b/example/kobalt/src/Build.kt @@ -3,12 +3,12 @@ import com.beust.kobalt.plugin.packaging.* import com.beust.kobalt.plugin.application.* import com.beust.kobalt.plugin.java.* -// ./kobaltw run --log 2 +// ./kobaltw run +// ./kobaltw puslishToMavenLocal val bs = buildScript { - //plugins(file("../libs/kobalt-maven-local-0.5.2.jar")) + //repos(file("K:/maven/repository")) plugins("net.thauvin.erik:kobalt-maven-local:") - repos(localMaven()) } val example = project { @@ -26,4 +26,4 @@ val example = project { application { mainClass = "com.example.Main" } -} +} \ No newline at end of file diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 2af62e6..05d546a 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -5,7 +5,10 @@ import com.beust.kobalt.plugin.publish.* import net.thauvin.erik.kobalt.plugin.versioneye.* import org.apache.maven.model.* +// ./kobaltw install + val bs = buildScript { + repos(file("K:/maven/repository")) plugins("net.thauvin.erik:kobalt-versioneye:") } @@ -16,7 +19,7 @@ val p = project { name = "kobalt-maven-local" group = "net.thauvin.erik" artifactId = name - version = "0.5.2" + version = "0.5.3" pom = Model().apply { description = "Maven Local Repository plug-in for the Kobalt build system." @@ -47,12 +50,18 @@ val p = project { } + install { + target = "K:/maven/repository/net/thauvin/erik/kobalt-maven-local/$version/" + } + assemble { jar { fatJar = true } - mavenJars {} + mavenJars { + fatJar = true + } } autoGitTag {