From 5e083bc609540a72f7fcc1aa081e832786cc74cb Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 13 Jul 2016 22:16:52 -0700 Subject: [PATCH] Code format. --- .idea/modules/semver.iml | 26 +++ build.gradle | 2 +- example/kobalt/src/Build.kt | 7 + .../kobalt/wrapper/kobalt-wrapper.properties | 2 +- .../erik/semver/example/GeneratedVersion.java | 157 ------------------ kobalt/Build.kt.iml | 13 -- kobalt/src/Build.kt | 89 ++++++++-- kobalt/wrapper/kobalt-wrapper.jar | Bin 8830 -> 8734 bytes kobalt/wrapper/kobalt-wrapper.properties | 2 +- kobaltw | 0 semver.iml | 126 -------------- semver.ipr | 110 +++++++++--- .../thauvin/erik/semver/VersionProcessor.java | 1 - 13 files changed, 193 insertions(+), 342 deletions(-) create mode 100644 .idea/modules/semver.iml delete mode 100644 example/src/generated/java/net/thauvin/erik/semver/example/GeneratedVersion.java delete mode 100644 kobalt/Build.kt.iml mode change 100644 => 100755 kobaltw delete mode 100644 semver.iml diff --git a/.idea/modules/semver.iml b/.idea/modules/semver.iml new file mode 100644 index 0000000..24fcd77 --- /dev/null +++ b/.idea/modules/semver.iml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 7895e9a..8192c45 100644 --- a/build.gradle +++ b/build.gradle @@ -205,7 +205,7 @@ task release(dependsOn: ['wrapper', 'clean', 'deploy']) << { task pandoc(type: Exec) { group = 'Documentation' - def pandoc_args = ['--from', 'markdown_github', '--to', 'html5', '-s', '-c', 'github-pandoc.css', '-o', 'README.html', 'README.md'] + def pandoc_args = [] if (Os.isFamily(Os.FAMILY_WINDOWS)) { commandLine(['cmd', '/c', 'pandoc'] + pandoc_args) diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt index 2286f83..bd87306 100644 --- a/example/kobalt/src/Build.kt +++ b/example/kobalt/src/Build.kt @@ -1,7 +1,10 @@ +import com.beust.kobalt.localMaven import com.beust.kobalt.plugin.application.application import com.beust.kobalt.plugin.apt.apt import com.beust.kobalt.plugin.packaging.assemble +import com.beust.kobalt.plugin.packaging.install import com.beust.kobalt.project +import com.beust.kobalt.repos import java.io.FileInputStream import java.util.* @@ -54,6 +57,10 @@ val example = project { dependenciesTest { } + + apt { + outputDir = "/src/generated/java/" + } install { libDir = "deploy" diff --git a/example/kobalt/wrapper/kobalt-wrapper.properties b/example/kobalt/wrapper/kobalt-wrapper.properties index 7018006..40e4395 100644 --- a/example/kobalt/wrapper/kobalt-wrapper.properties +++ b/example/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=0.842 \ No newline at end of file +kobalt.version=0.843 \ No newline at end of file diff --git a/example/src/generated/java/net/thauvin/erik/semver/example/GeneratedVersion.java b/example/src/generated/java/net/thauvin/erik/semver/example/GeneratedVersion.java deleted file mode 100644 index f5500de..0000000 --- a/example/src/generated/java/net/thauvin/erik/semver/example/GeneratedVersion.java +++ /dev/null @@ -1,157 +0,0 @@ -/* - * This file is automatically generated. - * Do not modify! -- ALL CHANGES WILL BE ERASED! - */ -package net.thauvin.erik.semver.example; - -import java.util.Date; - -/** - * Provides semantic version information. - * - * @author Semantic Version - * Annotation Processor - */ -public final class GeneratedVersion { - private final static String buildmeta = ""; - private final static Date date = new Date(1467959174599L); - private final static int major = 3; - private final static int minor = 1; - private final static int patch = 45; - private final static String prerelease = "beta"; - private final static String project = "Example"; - - /** - * Disables the default constructor. - * - * @throws UnsupportedOperationException If the constructor is called. - */ - private GeneratedVersion() - throws UnsupportedOperationException { - throw new UnsupportedOperationException("Illegal constructor call."); - } - - /** - * Returns the build date. - * - * @return The build date. - */ - public static Date getBuildDate() { - return date; - } - - /** - * Returns the project name. - * - * @return The project name, if any. - */ - public static String getProject() { - return project; - } - - /** - * Returns the full version string. - *

- * Formatted as: - *

- * MAJOR.MINOR.PATCH[-PRERELEASE][+BUILDMETADATA] - *
- *

- * For example: - *

- * - * @return The version string. - */ - public static String getVersion() { - return Integer.toString(getMajor()) + '.' - + Integer.toString(getMinor()) + '.' - + Integer.toString(getPatch()) - + getPreRelease(true) + getBuildMetadata(true); - } - - /** - * Returns the major version. - * - * @return The major version. - */ - public static int getMajor() { - return major; - } - - /** - * Returns the minor version. - * - * @return The minor version. - */ - public static int getMinor() { - return minor; - } - - /** - * Returns the patch version. - * - * @return The patch version. - */ - public static int getPatch() { - return patch; - } - - /** - * Returns the pre-release version. - * - * @param isHyphen Prepend a hyphen, if true. - * @return The pre-release version, if any. - */ - public static String getPreRelease(final boolean isHyphen) { - if (prerelease.length() > 0) { - if (isHyphen) { - return '-' + prerelease; - } else { - return prerelease; - } - } - - return ""; - } - - /** - * Returns the pre-release version. - * - * @return The pre-release version, if any. - */ - public static String getPreRelease() { - return getPreRelease(false); - } - - /** - * Returns the build metadata. - * - * @param isPlus Prepend a plus sign, if true. - * @return The build metadata, if any. - */ - public static String getBuildMetadata(final boolean isPlus) { - if (buildmeta.length() > 0) { - if (isPlus) { - return '+' + buildmeta; - } else { - return buildmeta; - } - } - - return ""; - } - - /** - * Returns the build metadata. - * - * @return The build metadata, if any. - */ - public static String getBuildMetadata() { - return getBuildMetadata(false); - } -} \ No newline at end of file diff --git a/kobalt/Build.kt.iml b/kobalt/Build.kt.iml deleted file mode 100644 index 00b83dc..0000000 --- a/kobalt/Build.kt.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 9575571..3187eb1 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -1,14 +1,20 @@ import com.beust.kobalt.localMaven import com.beust.kobalt.plugin.application.application +import com.beust.kobalt.plugin.apt.apt +import com.beust.kobalt.plugin.java.javaCompiler import com.beust.kobalt.plugin.packaging.assemble import com.beust.kobalt.plugin.packaging.install +import com.beust.kobalt.plugins import com.beust.kobalt.project import com.beust.kobalt.repos import java.io.FileInputStream import java.util.* +import net.thauvin.erik.kobalt.plugin.exec.* val repos = repos(localMaven()) +val pl = plugins("net.thauvin.erik:kobalt-exec:0.6.0-beta") + fun StringBuilder.prepend(s: String): StringBuilder { if (this.length > 0) { this.insert(0, s) @@ -16,27 +22,26 @@ fun StringBuilder.prepend(s: String): StringBuilder { return this } +fun versionFor(directory: String = "./"): String { + val propsFile = directory + '/' + "version.properties" + val majorKey = "version.major" + val minorKey = "version.minor" + val patchKey = "version.patch" + val metaKey = "version.buildmeta" + val preKey = "version.prerelease" + + val p = Properties().apply { FileInputStream(propsFile).use { fis -> load(fis) } } + + return (p.getProperty(majorKey, "1") + "." + p.getProperty(minorKey, "0") + "." + p.getProperty(patchKey, "0") + + StringBuilder(p.getProperty(preKey, "")).prepend("-") + + StringBuilder(p.getProperty(metaKey, "")).prepend("+")) +} + val semver = project { name = "semver" group = "net.thauvin.erik" artifactId = name - - fun versionFor(): String { - val propsFile = "version.properties" - val majorKey = "version.major" - val minorKey = "version.minor" - val patchKey = "version.patch" - val metaKey = "version.buildmeta" - val preKey = "version.prerelease" - - val p = Properties().apply { FileInputStream(propsFile).use { fis -> load(fis) } } - - return (p.getProperty(majorKey, "1") + "." + p.getProperty(minorKey, "0") + "." + p.getProperty(patchKey, "0") - + StringBuilder(p.getProperty(preKey, "")).prepend("-") - + StringBuilder(p.getProperty(metaKey, "")).prepend("+")) - } - version = versionFor() sourceDirectories { @@ -56,6 +61,9 @@ val semver = project { } + javaCompiler { + } + install { libDir = "deploy" } @@ -68,4 +76,53 @@ val semver = project { mainClass = "com.example.Main" } + 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)) + } +} + + +val example = project { + + name = "example" + directory = "example" + version = versionFor(directory) + + val mainClassName = "net.thauvin.erik.semver.example.Example" + val processorJar = "net.thauvin.erik:semver:0.9.6-beta" + + sourceDirectories { + path("src/main/java") + } + + sourceDirectoriesTest { + path("src/test/java") + } + + dependencies { + apt(processorJar) + compile(processorJar) + } + + dependenciesTest { + + } + + install { + libDir = "deploy" + } + + assemble { + jar { + manifest { + attributes("Main-Class", mainClassName) + } + } + } + + application { + mainClass = mainClassName + } } diff --git a/kobalt/wrapper/kobalt-wrapper.jar b/kobalt/wrapper/kobalt-wrapper.jar index c1788497a9c59da1afeb10cd17f104bd82ff21f4..6ca6ca57fa38d07d866754a0971cf6e82f5e83b3 100644 GIT binary patch delta 8424 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 K1~MT40000km~!6$ delta 8521 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 diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties index 7018006..9c63a2e 100644 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ b/kobalt/wrapper/kobalt-wrapper.properties @@ -1 +1 @@ -kobalt.version=0.842 \ No newline at end of file +kobalt.version=0.853 \ No newline at end of file diff --git a/kobaltw b/kobaltw old mode 100644 new mode 100755 diff --git a/semver.iml b/semver.iml deleted file mode 100644 index 6d651e8..0000000 --- a/semver.iml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/semver.ipr b/semver.ipr index 2ce7e7e..47c9c27 100644 --- a/semver.ipr +++ b/semver.ipr @@ -62,9 +62,6 @@ - - - + + + - - - - - + - - + + @@ -304,17 +303,76 @@ + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/net/thauvin/erik/semver/VersionProcessor.java b/src/main/java/net/thauvin/erik/semver/VersionProcessor.java index 2100156..4a386f8 100644 --- a/src/main/java/net/thauvin/erik/semver/VersionProcessor.java +++ b/src/main/java/net/thauvin/erik/semver/VersionProcessor.java @@ -247,6 +247,5 @@ public class VersionProcessor extends AbstractProcessor { error("Could not load '" + Constants.VELOCITY_PROPERTIES + "' from jar."); } - } } \ No newline at end of file