From 90df90e543c58343f8ddf55c123d95e7374d0096 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 25 May 2019 13:47:21 -0700 Subject: [PATCH] Updated examples. --- examples/java/build.gradle | 2 +- examples/java/kobalt/src/Build.kt | 7 +++++- .../kobalt/wrapper/kobalt-wrapper.properties | 2 +- examples/java/pom.xml | 4 ++-- .../java/com/example/ExampleVersion.java | 2 +- .../java/com/example/GeneratedVersion.java | 23 ++++++++++--------- examples/kotlin/build.gradle.kts | 6 ++--- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/examples/java/build.gradle b/examples/java/build.gradle index 6fce5c9..ebebe1e 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -9,7 +9,7 @@ plugins { defaultTasks 'run' -def semverProcessor = 'net.thauvin.erik:semver:1.2.0' +final def semverProcessor = 'net.thauvin.erik:semver:1.2.0' sourceCompatibility = 1.8 targetCompatibility = 1.8 diff --git a/examples/java/kobalt/src/Build.kt b/examples/java/kobalt/src/Build.kt index 1bfdcf6..7394eb4 100644 --- a/examples/java/kobalt/src/Build.kt +++ b/examples/java/kobalt/src/Build.kt @@ -15,7 +15,7 @@ val example = project { name = "example" version = "1.0" - val mainClassName = "com.example.Example" + val mainClassName = "com.example.App" val processorJar = "net.thauvin.erik:semver:1.2.0" dependencies { @@ -42,4 +42,9 @@ val example = project { application { mainClass = mainClassName } + + application { + taskName = "runExample" + mainClass = "com.example.Example" + } } diff --git a/examples/java/kobalt/wrapper/kobalt-wrapper.properties b/examples/java/kobalt/wrapper/kobalt-wrapper.properties index 0d568d3..bdce6e3 100644 --- a/examples/java/kobalt/wrapper/kobalt-wrapper.properties +++ b/examples/java/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=1.0.122 +kobalt.version=1.0.123 diff --git a/examples/java/pom.xml b/examples/java/pom.xml index 6d1f0a3..9a95781 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -27,7 +27,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 1.8 1.8 @@ -56,7 +56,7 @@ - com.example.Example + com.example.App diff --git a/examples/java/src/generated/java/com/example/ExampleVersion.java b/examples/java/src/generated/java/com/example/ExampleVersion.java index 1b14175..d1b07f0 100644 --- a/examples/java/src/generated/java/com/example/ExampleVersion.java +++ b/examples/java/src/generated/java/com/example/ExampleVersion.java @@ -9,7 +9,7 @@ import java.util.Date; public final class ExampleVersion { public static final String PROJECT = "Java Example"; - public static final Date BUILDDATE = new Date(1556420335650L); + public static final Date BUILDDATE = new Date(1558817026391L); public static final String VERSION = "8.4.97-alpha+T800"; /** diff --git a/examples/java/src/generated/java/com/example/GeneratedVersion.java b/examples/java/src/generated/java/com/example/GeneratedVersion.java index c6647f2..9abab04 100644 --- a/examples/java/src/generated/java/com/example/GeneratedVersion.java +++ b/examples/java/src/generated/java/com/example/GeneratedVersion.java @@ -2,6 +2,7 @@ * This file is automatically generated. * Do not modify! -- ALL CHANGES WILL BE ERASED! */ + package com.example; import java.util.Date; @@ -12,17 +13,17 @@ import java.util.Date; * @author Semantic Version Annotation Processor */ public final class GeneratedVersion { - public final static String PROJECT = "Java App"; - public final static Date BUILDDATE = new Date(1556420335600L); - public final static int MAJOR = 11; - public final static int MINOR = 11; - public final static int PATCH = 20; - public final static String PRERELEASE = "beta"; - public final static String PRERELEASE_PREFIX = "-"; - public final static String BUILDMETA = "007"; - public final static String BUILDMETA_PREFIX = "+"; - public final static String SEPARATOR = "."; - public final static String VERSION = "11.11.20-beta+007"; + public static final String PROJECT = "Java App"; + public static final Date BUILDDATE = new Date(1558817026346L); + public static final int MAJOR = 11; + public static final int MINOR = 11; + public static final int PATCH = 20; + public static final String PRERELEASE = "beta"; + public static final String PRERELEASE_PREFIX = "-"; + public static final String BUILDMETA = "007"; + public static final String BUILDMETA_PREFIX = "+"; + public static final String SEPARATOR = "."; + public static final String VERSION = "11.11.20-beta+007"; /** * Disables the default constructor. diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts index e783526..925b6dc 100644 --- a/examples/kotlin/build.gradle.kts +++ b/examples/kotlin/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - kotlin("jvm").version("1.3.30") + kotlin("jvm").version("1.3.31") application - id("org.jetbrains.kotlin.kapt").version("1.3.30") + id("org.jetbrains.kotlin.kapt").version("1.3.31") id("com.github.ben-manes.versions").version("0.21.0") } @@ -13,7 +13,7 @@ plugins { defaultTasks(ApplicationPlugin.TASK_RUN_NAME) -var semverProcessor = "net.thauvin.erik:semver:1.2.0" +val semverProcessor = "net.thauvin.erik:semver:1.2.0" dependencies { kapt(semverProcessor)