From 968c6802694a8bc385b5bdd7c1f1b2ed15bd04c1 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 2 Jul 2018 00:06:01 -0700 Subject: [PATCH] Cleaned up examples. --- examples/java/.gitattributes | 5 +++++ .../src/main/java/com/example/{Example.java => App.java} | 3 +-- examples/kotlin/.gitattributes | 5 +++++ examples/kotlin/src/main/java/com/example/Example.java | 2 +- examples/kotlin/src/main/kotlin/com/example/Main.kt | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 examples/java/.gitattributes rename examples/java/src/main/java/com/example/{Example.java => App.java} (90%) create mode 100644 examples/kotlin/.gitattributes diff --git a/examples/java/.gitattributes b/examples/java/.gitattributes new file mode 100644 index 0000000..6ec2ae2 --- /dev/null +++ b/examples/java/.gitattributes @@ -0,0 +1,5 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# batch files are specific to windows and always crlf +*.bat eol=crlf diff --git a/examples/java/src/main/java/com/example/Example.java b/examples/java/src/main/java/com/example/App.java similarity index 90% rename from examples/java/src/main/java/com/example/Example.java rename to examples/java/src/main/java/com/example/App.java index c3cb880..ca0582a 100644 --- a/examples/java/src/main/java/com/example/Example.java +++ b/examples/java/src/main/java/com/example/App.java @@ -1,7 +1,6 @@ package com.example; import net.thauvin.erik.semver.Version; - import java.text.SimpleDateFormat; @Version(properties = "version.properties") @@ -11,7 +10,7 @@ public class Example { System.out.println("-----------------------------------------------------"); - System.out.println(" " + GeneratedVersion.PROJECT + ' ' + GeneratedVersion.VERSION); + System.out.println(" Version:" + GeneratedVersion.PROJECT + ' ' + GeneratedVersion.VERSION); System.out.println(" Built on: " + sdf.format(GeneratedVersion.BUILDDATE)); System.out.println(" Major: " + GeneratedVersion.MAJOR); diff --git a/examples/kotlin/.gitattributes b/examples/kotlin/.gitattributes new file mode 100644 index 0000000..6ec2ae2 --- /dev/null +++ b/examples/kotlin/.gitattributes @@ -0,0 +1,5 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# batch files are specific to windows and always crlf +*.bat eol=crlf diff --git a/examples/kotlin/src/main/java/com/example/Example.java b/examples/kotlin/src/main/java/com/example/Example.java index abeaf51..51b8b0d 100644 --- a/examples/kotlin/src/main/java/com/example/Example.java +++ b/examples/kotlin/src/main/java/com/example/Example.java @@ -8,7 +8,7 @@ public class Example { System.out.println("-- From Java ----------------------------------------"); - System.out.println(" " + GeneratedVersion.PROJECT + ' ' + GeneratedVersion.VERSION); + System.out.println(" Version: " + GeneratedVersion.PROJECT + ' ' + GeneratedVersion.VERSION); System.out.println(" Built on: " + sdf.format(GeneratedVersion.BUILDDATE)); System.out.println(" Major: " + GeneratedVersion.MAJOR); diff --git a/examples/kotlin/src/main/kotlin/com/example/Main.kt b/examples/kotlin/src/main/kotlin/com/example/Main.kt index ce661ef..0b30a6e 100644 --- a/examples/kotlin/src/main/kotlin/com/example/Main.kt +++ b/examples/kotlin/src/main/kotlin/com/example/Main.kt @@ -11,7 +11,7 @@ class Main { println("-----------------------------------------------------") - println(" ${GeneratedVersion.PROJECT} ${GeneratedVersion.VERSION}") + println(" Version: ${GeneratedVersion.PROJECT} ${GeneratedVersion.VERSION}") println(" Built on: " + sdf.format(GeneratedVersion.BUILDDATE)) println(" Major: ${GeneratedVersion.MAJOR}")