diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt index 477634c..d123d2b 100644 --- a/example/kobalt/src/Build.kt +++ b/example/kobalt/src/Build.kt @@ -38,23 +38,11 @@ val example = project { val mainClassName = "net.thauvin.erik.semver.example.Example" val processorJar = "net.thauvin.erik:semver:" - sourceDirectories { - path("src/main/java") - } - - sourceDirectoriesTest { - path("src/test/java") - } - dependencies { apt(processorJar) compile(processorJar) } - dependenciesTest { - - } - apt { outputDir = "/src/generated/java/" } diff --git a/example/kobalt/wrapper/kobalt-wrapper.properties b/example/kobalt/wrapper/kobalt-wrapper.properties index 8d6fc4f..0909c8d 100644 --- a/example/kobalt/wrapper/kobalt-wrapper.properties +++ b/example/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=1.0.23 \ No newline at end of file +kobalt.version=1.0.26 \ No newline at end of file diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 64b0b9a..7eaa07a 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -45,14 +45,6 @@ val semver = project { artifactId = name version = versionFor() - sourceDirectories { - path("src/main/java") - } - - sourceDirectoriesTest { - path("src/test/java") - } - dependencies { compile("org.apache.velocity:velocity:1.7") } @@ -61,9 +53,6 @@ val semver = project { compile("org.testng:testng:6.11") } - javaCompiler { - } - install { libDir = "deploy" } @@ -79,19 +68,17 @@ val semver = project { exec { val args = listOf("--from", "markdown_github", "--to", "html5", "-s", "-c", "github-pandoc.css", "-o", "README.html", "README.md") commandLine(listOf("pandoc") + args, os = setOf(Os.LINUX)) - commandLine(listOf("cmd", "/c", "pandoc") + args, os =setOf(Os.WINDOWS)) + commandLine(listOf("cmd", "/c", "pandoc") + args, os = setOf(Os.WINDOWS)) } } -val example = project { +val example = project(semver){ name = "example" directory = "example" version = versionFor(directory) val mainClassName = "net.thauvin.erik.semver.example.Example" - //val processorJar = "net.thauvin.erik:semver:" - val processorJar = file("deploy/semver-" + versionFor() + ".jar") sourceDirectories { path("src/main/java") @@ -102,8 +89,7 @@ val example = project { } dependencies { - apt(processorJar) - compile("org.apache.velocity:velocity:1.7", processorJar) + compile("org.apache.velocity:velocity:1.7") } dependenciesTest { diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index 8d6fc4f..0909c8d 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=1.0.23 \ No newline at end of file +kobalt.version=1.0.26 \ No newline at end of file