diff --git a/build.gradle b/build.gradle index 28ff9a5..5035a8c 100644 --- a/build.gradle +++ b/build.gradle @@ -11,20 +11,23 @@ apply plugin: 'kotlin' apply plugin: 'kotlin-kapt' apply plugin: 'application' +// ./gradlew +// ./gradlew runJava + defaultTasks 'run' -def processorJar = files("lib/semver-0.9.7.jar") +def processorJar = "net.thauvin.erik:semver:0.9.7" mainClassName = 'com.example.Main' repositories { + mavenLocal() jcenter() } dependencies { kapt processorJar compileOnly processorJar - //compileOnly 'com.github.spullara.mustache.java:compiler:0.9.4' compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } @@ -32,4 +35,4 @@ dependencies { task(runJava, type: JavaExec) { main 'com.example.Example' classpath sourceSets.main.runtimeClasspath -} \ No newline at end of file +} diff --git a/lib/semver-0.9.7.jar b/lib/semver-0.9.7.jar index 452f6f4..81158bf 100644 Binary files a/lib/semver-0.9.7.jar and b/lib/semver-0.9.7.jar differ diff --git a/src/main/java/com/example/Example.java b/src/main/java/com/example/Example.java index 95f8371..abeaf51 100644 --- a/src/main/java/com/example/Example.java +++ b/src/main/java/com/example/Example.java @@ -8,14 +8,14 @@ public class Example { System.out.println("-- From Java ----------------------------------------"); - System.out.println(" " + GeneratedVersion.project + ' ' + GeneratedVersion.version); + System.out.println(" " + GeneratedVersion.PROJECT + ' ' + GeneratedVersion.VERSION); - System.out.println(" Built on: " + sdf.format(GeneratedVersion.buildDate)); - System.out.println(" Major: " + GeneratedVersion.major); - System.out.println(" Minor: " + GeneratedVersion.minor); - System.out.println(" Patch: " + GeneratedVersion.patch); - System.out.println(" PreRelease: " + GeneratedVersion.preRelease); - System.out.println(" BuildMetaData: " + GeneratedVersion.buildMeta); + System.out.println(" Built on: " + sdf.format(GeneratedVersion.BUILDDATE)); + System.out.println(" Major: " + GeneratedVersion.MAJOR); + System.out.println(" Minor: " + GeneratedVersion.MINOR); + System.out.println(" Patch: " + GeneratedVersion.PATCH); + System.out.println(" PreRelease: " + GeneratedVersion.PRERELEASE); + System.out.println(" BuildMetaData: " + GeneratedVersion.BUILDMETA); System.out.println("-----------------------------------------------------"); } diff --git a/src/main/kotlin/com/example/Main.kt b/src/main/kotlin/com/example/Main.kt index 61651e6..ce661ef 100644 --- a/src/main/kotlin/com/example/Main.kt +++ b/src/main/kotlin/com/example/Main.kt @@ -11,14 +11,14 @@ class Main { println("-----------------------------------------------------") - println(" ${GeneratedVersion.project} ${GeneratedVersion.version}") + println(" ${GeneratedVersion.PROJECT} ${GeneratedVersion.VERSION}") - println(" Built on: " + sdf.format(GeneratedVersion.buildDate)) - println(" Major: ${GeneratedVersion.major}") - println(" Minor: ${GeneratedVersion.minor}") - println(" Patch: ${GeneratedVersion.patch}") - println(" PreRelease: ${GeneratedVersion.preRelease}") - println(" BuildMetaData: ${GeneratedVersion.buildMeta}") + println(" Built on: " + sdf.format(GeneratedVersion.BUILDDATE)) + println(" Major: ${GeneratedVersion.MAJOR}") + println(" Minor: ${GeneratedVersion.MINOR}") + println(" Patch: ${GeneratedVersion.PATCH}") + println(" PreRelease: ${GeneratedVersion.PRERELEASE}") + println(" BuildMetaData: ${GeneratedVersion.BUILDMETA}") println("-----------------------------------------------------") } diff --git a/version.properties b/version.properties index cd5de1a..fca66d0 100644 --- a/version.properties +++ b/version.properties @@ -1,7 +1,7 @@ #Mon, 18 Jul 2016 17:33:54 -0700 -version.prerelease=beta version.project=Example -version.minor=1 -version.buildmeta=001 -version.patch=49 -version.major=3 +version.major=2 +version.minor=17 +version.patch=52 +version.prerelease=beta +version.buildmeta=007 \ No newline at end of file