diff --git a/.gitignore b/.gitignore index f9a4d9d..aa3330b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ **/.idea/tasks.xml **/.idea/workspace.xml *.iws +*.sublime-* .classpath .DS_Store .gradle diff --git a/.travis.yml b/.travis.yml index 9b93be0..6b6a336 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,4 +16,4 @@ cache: before_cache: - rm -rf .kobalt/* -script: ./kobaltw clean assemble +script: ./kobaltw clean assemble test diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt index 7dd817d..5f25d09 100644 --- a/example/kobalt/src/Build.kt +++ b/example/kobalt/src/Build.kt @@ -7,8 +7,8 @@ import net.thauvin.erik.kobalt.plugin.propertyfile.* // ./kobaltw propertyFile val bs = buildScript { - plugins(file("../kobaltBuild/libs/kobalt-property-file-0.9.0.jar")) - //plugins("net.thauvin.erik:kobalt-property-file:") + //repos(file("K:/maven/repository")) + plugins("net.thauvin.erik:kobalt-property-file:") } val p = project { @@ -39,7 +39,7 @@ val p = project { comment = "##Generated file - do not modify!" //failOnWarning = true - //entry(key = "version.fail", value = "a", type = Types.INT) + entry(key = "version.fail", value = "a", type = Types.INT) // Version properties with patch increment entry(key = "version.major", value = "1") diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index de3cd0b..a678309 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -8,7 +8,8 @@ import org.apache.maven.model.* val semver = "0.9.0" val bs = buildScript { - plugins("net.thauvin.erik:kobalt-versioneye:") + repos(file("k:/maven/repository")) + plugins("net.thauvin.erik:kobalt-versioneye:", "net.thauvin.erik:kobalt-maven-local:") } val dev by profile() @@ -52,7 +53,9 @@ val p = project { fatJar = true } - mavenJars {} + mavenJars { + fatJar = true + } } autoGitTag {