diff --git a/bin/test/net/thauvin/erik/semver/ConstantsTest.class b/bin/test/net/thauvin/erik/semver/ConstantsTest.class index c8c9fde..934286a 100644 Binary files a/bin/test/net/thauvin/erik/semver/ConstantsTest.class and b/bin/test/net/thauvin/erik/semver/ConstantsTest.class differ diff --git a/bin/test/net/thauvin/erik/semver/VersionInfoTest.class b/bin/test/net/thauvin/erik/semver/VersionInfoTest.class index 8c5f8b4..d6401b4 100644 Binary files a/bin/test/net/thauvin/erik/semver/VersionInfoTest.class and b/bin/test/net/thauvin/erik/semver/VersionInfoTest.class differ diff --git a/bin/test/net/thauvin/erik/semver/VersionProcessorTest.class b/bin/test/net/thauvin/erik/semver/VersionProcessorTest.class index 5166fb7..af2b771 100644 Binary files a/bin/test/net/thauvin/erik/semver/VersionProcessorTest.class and b/bin/test/net/thauvin/erik/semver/VersionProcessorTest.class differ diff --git a/examples/java/bld/.gitignore b/examples/java/bld/.gitignore new file mode 100644 index 0000000..a2805aa --- /dev/null +++ b/examples/java/bld/.gitignore @@ -0,0 +1,55 @@ +.gradle +.DS_Store +build +lib/bld/** +!lib/bld/bld-wrapper.jar +!lib/bld/bld-wrapper.properties +lib/compile/ +lib/runtime/ +lib/standalone/ +lib/test/ + +# IDEA ignores + +# User-specific +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Editor-based Rest Client +.idea/httpRequests \ No newline at end of file diff --git a/examples/java/bld/.idea/.gitignore b/examples/java/bld/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/examples/java/bld/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/examples/java/bld/.idea/app.iml b/examples/java/bld/.idea/app.iml new file mode 100644 index 0000000..787b59b --- /dev/null +++ b/examples/java/bld/.idea/app.iml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/java/bld/.idea/bld.iml b/examples/java/bld/.idea/bld.iml new file mode 100644 index 0000000..e63e11e --- /dev/null +++ b/examples/java/bld/.idea/bld.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/java/bld/.idea/inspectionProfiles/Project_Default.xml b/examples/java/bld/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..1e01b48 --- /dev/null +++ b/examples/java/bld/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/examples/java/bld/.idea/libraries/bld.xml b/examples/java/bld/.idea/libraries/bld.xml new file mode 100644 index 0000000..abca604 --- /dev/null +++ b/examples/java/bld/.idea/libraries/bld.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/java/bld/.idea/libraries/compile.xml b/examples/java/bld/.idea/libraries/compile.xml new file mode 100644 index 0000000..9bd86aa --- /dev/null +++ b/examples/java/bld/.idea/libraries/compile.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/java/bld/.idea/libraries/runtime.xml b/examples/java/bld/.idea/libraries/runtime.xml new file mode 100644 index 0000000..2ae5c4b --- /dev/null +++ b/examples/java/bld/.idea/libraries/runtime.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/java/bld/.idea/libraries/test.xml b/examples/java/bld/.idea/libraries/test.xml new file mode 100644 index 0000000..b80486a --- /dev/null +++ b/examples/java/bld/.idea/libraries/test.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/java/bld/.idea/misc.xml b/examples/java/bld/.idea/misc.xml new file mode 100644 index 0000000..542659b --- /dev/null +++ b/examples/java/bld/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/examples/java/bld/.idea/modules.xml b/examples/java/bld/.idea/modules.xml new file mode 100644 index 0000000..55adcb9 --- /dev/null +++ b/examples/java/bld/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/examples/java/bld/.idea/runConfigurations/Run Tests.xml b/examples/java/bld/.idea/runConfigurations/Run Tests.xml new file mode 100644 index 0000000..2b503e5 --- /dev/null +++ b/examples/java/bld/.idea/runConfigurations/Run Tests.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/examples/java/bld/.idea/vcs.xml b/examples/java/bld/.idea/vcs.xml new file mode 100644 index 0000000..c2365ab --- /dev/null +++ b/examples/java/bld/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/examples/java/bld/.vscode/launch.json b/examples/java/bld/.vscode/launch.json new file mode 100644 index 0000000..30a8889 --- /dev/null +++ b/examples/java/bld/.vscode/launch.json @@ -0,0 +1,11 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Run Tests", + "request": "launch", + "mainClass": "com.example.ExampleTest" + } + ] +} diff --git a/examples/java/bld/.vscode/settings.json b/examples/java/bld/.vscode/settings.json new file mode 100644 index 0000000..c83239c --- /dev/null +++ b/examples/java/bld/.vscode/settings.json @@ -0,0 +1,15 @@ +{ + "java.project.sourcePaths": [ + "src/main/java", + "src/main/resources", + "src/test/java", + "src/bld/java" + ], + "java.configuration.updateBuildConfiguration": "automatic", + "java.project.referencedLibraries": [ + "${HOME}/.bld/dist/bld-1.7.1.jar", + "lib/compile/*.jar", + "lib/runtime/*.jar", + "lib/test/*.jar" + ] +} diff --git a/examples/java/bld/bld b/examples/java/bld/bld new file mode 100755 index 0000000..80d2986 --- /dev/null +++ b/examples/java/bld/bld @@ -0,0 +1,2 @@ +#!/usr/bin/env sh +java -jar "$(dirname "$0")/lib/bld/bld-wrapper.jar" "$0" --build com.example.ExampleBuild "$@" \ No newline at end of file diff --git a/examples/java/bld/bld.bat b/examples/java/bld/bld.bat new file mode 100644 index 0000000..084bb72 --- /dev/null +++ b/examples/java/bld/bld.bat @@ -0,0 +1,4 @@ +@echo off +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +java -jar "%DIRNAME%/lib/bld/bld-wrapper.jar" "%0" --build com.example.ExampleBuild %* \ No newline at end of file diff --git a/examples/java/example.mustache b/examples/java/bld/example.mustache similarity index 100% rename from examples/java/example.mustache rename to examples/java/bld/example.mustache diff --git a/examples/java/example.properties b/examples/java/bld/example.properties similarity index 100% rename from examples/java/example.properties rename to examples/java/bld/example.properties diff --git a/examples/java/bld/lib/bld/bld-wrapper.jar b/examples/java/bld/lib/bld/bld-wrapper.jar new file mode 100644 index 0000000..1119a1a Binary files /dev/null and b/examples/java/bld/lib/bld/bld-wrapper.jar differ diff --git a/examples/java/bld/lib/bld/bld-wrapper.properties b/examples/java/bld/lib/bld/bld-wrapper.properties new file mode 100644 index 0000000..15900ba --- /dev/null +++ b/examples/java/bld/lib/bld/bld-wrapper.properties @@ -0,0 +1,7 @@ +bld.downloadExtensionJavadoc=false +bld.downloadExtensionSources=true +bld.extensions= +bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES +bld.downloadLocation= +bld.sourceDirectories= +bld.version=1.7.1 diff --git a/examples/java/bld/src/bld/java/com/example/ExampleBuild.java b/examples/java/bld/src/bld/java/com/example/ExampleBuild.java new file mode 100644 index 0000000..d586d32 --- /dev/null +++ b/examples/java/bld/src/bld/java/com/example/ExampleBuild.java @@ -0,0 +1,36 @@ +package com.example; + +import rife.bld.BuildCommand; +import rife.bld.Project; + +import java.util.List; + +import static rife.bld.dependencies.Repository.*; +import static rife.bld.dependencies.Scope.compile; + +public class ExampleBuild extends Project { + public ExampleBuild() { + pkg = "com.example"; + name = "Example"; + version = version(0, 1, 0); + + mainClass = "com.example.App"; + + testOperation().mainClass("com.example.ExampleTest"); + + repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL); + + scope(compile) + .include(dependency("net.thauvin.erik", "semver", + version(1, 2, 1, "SNAPSHOT"))); + } + + @BuildCommand(summary = "Run the example") + public void runExample() throws Exception { + runOperation().executeOnce(() -> runOperation().fromProject(this).mainClass("com.example.Example")); + } + + public static void main(String[] args) { + new ExampleBuild().start(args); + } +} diff --git a/examples/java/src/main/java/com/example/App.java b/examples/java/bld/src/main/java/com/example/App.java similarity index 100% rename from examples/java/src/main/java/com/example/App.java rename to examples/java/bld/src/main/java/com/example/App.java diff --git a/examples/java/bld/src/main/java/com/example/Example.java b/examples/java/bld/src/main/java/com/example/Example.java new file mode 100644 index 0000000..63a4b53 --- /dev/null +++ b/examples/java/bld/src/main/java/com/example/Example.java @@ -0,0 +1,21 @@ +package com.example; + +import net.thauvin.erik.semver.Version; + +import java.text.SimpleDateFormat; +import java.util.Locale; + +@Version(properties = "example.properties", template = "example.mustache", className = "ExampleVersion", + keysPrefix = "example.") +public class Example { + public static void main(final String... args) { + final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.US); + + System.out.println("-- From Example -------------------------------------"); + + System.out.println(" " + ExampleVersion.PROJECT + ' ' + ExampleVersion.VERSION + + " (" + sdf.format(ExampleVersion.BUILDDATE) + ')'); + + System.out.println("-----------------------------------------------------"); + } +} diff --git a/examples/java/bld/src/test/java/com/example/ExampleTest.java b/examples/java/bld/src/test/java/com/example/ExampleTest.java new file mode 100644 index 0000000..35fa500 --- /dev/null +++ b/examples/java/bld/src/test/java/com/example/ExampleTest.java @@ -0,0 +1,4 @@ +package com.example; + +public class ExampleTest { +} \ No newline at end of file diff --git a/examples/java/version.properties b/examples/java/bld/version.properties similarity index 100% rename from examples/java/version.properties rename to examples/java/bld/version.properties diff --git a/examples/java/.editorconfig b/examples/java/gradle/.editorconfig similarity index 100% rename from examples/java/.editorconfig rename to examples/java/gradle/.editorconfig diff --git a/examples/java/.gitattributes b/examples/java/gradle/.gitattributes similarity index 100% rename from examples/java/.gitattributes rename to examples/java/gradle/.gitattributes diff --git a/examples/java/.gitignore b/examples/java/gradle/.gitignore similarity index 100% rename from examples/java/.gitignore rename to examples/java/gradle/.gitignore diff --git a/examples/java/.idea/.name b/examples/java/gradle/.idea/.name similarity index 100% rename from examples/java/.idea/.name rename to examples/java/gradle/.idea/.name diff --git a/examples/java/.idea/compiler.xml b/examples/java/gradle/.idea/compiler.xml similarity index 100% rename from examples/java/.idea/compiler.xml rename to examples/java/gradle/.idea/compiler.xml diff --git a/examples/java/.idea/encodings.xml b/examples/java/gradle/.idea/encodings.xml similarity index 100% rename from examples/java/.idea/encodings.xml rename to examples/java/gradle/.idea/encodings.xml diff --git a/examples/java/.idea/inspectionProfiles/Project_Default.xml b/examples/java/gradle/.idea/inspectionProfiles/Project_Default.xml similarity index 100% rename from examples/java/.idea/inspectionProfiles/Project_Default.xml rename to examples/java/gradle/.idea/inspectionProfiles/Project_Default.xml diff --git a/examples/java/.idea/misc.xml b/examples/java/gradle/.idea/misc.xml similarity index 100% rename from examples/java/.idea/misc.xml rename to examples/java/gradle/.idea/misc.xml diff --git a/examples/java/.idea/modules.xml b/examples/java/gradle/.idea/modules.xml similarity index 100% rename from examples/java/.idea/modules.xml rename to examples/java/gradle/.idea/modules.xml diff --git a/examples/java/.idea/modules/examples-java.iml b/examples/java/gradle/.idea/modules/examples-java.iml similarity index 100% rename from examples/java/.idea/modules/examples-java.iml rename to examples/java/gradle/.idea/modules/examples-java.iml diff --git a/examples/java/.idea/modules/examples-java_main.iml b/examples/java/gradle/.idea/modules/examples-java_main.iml similarity index 100% rename from examples/java/.idea/modules/examples-java_main.iml rename to examples/java/gradle/.idea/modules/examples-java_main.iml diff --git a/examples/java/.idea/modules/examples-java_test.iml b/examples/java/gradle/.idea/modules/examples-java_test.iml similarity index 100% rename from examples/java/.idea/modules/examples-java_test.iml rename to examples/java/gradle/.idea/modules/examples-java_test.iml diff --git a/examples/java/.idea/vcs.xml b/examples/java/gradle/.idea/vcs.xml similarity index 100% rename from examples/java/.idea/vcs.xml rename to examples/java/gradle/.idea/vcs.xml diff --git a/examples/java/build.gradle b/examples/java/gradle/build.gradle similarity index 87% rename from examples/java/build.gradle rename to examples/java/gradle/build.gradle index 9c3c528..a89c79b 100644 --- a/examples/java/build.gradle +++ b/examples/java/gradle/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'application' - id 'com.github.ben-manes.versions' version '0.46.0' + id 'com.github.ben-manes.versions' version '0.47.0' } // ./gradlew run @@ -11,8 +11,8 @@ defaultTasks 'run' final def semverProcessor = 'net.thauvin.erik:semver:1.2.1-SNAPSHOT' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 17 +targetCompatibility = 17 mainClassName = 'com.example.App' diff --git a/examples/java/gradle/example.mustache b/examples/java/gradle/example.mustache new file mode 100644 index 0000000..70125c1 --- /dev/null +++ b/examples/java/gradle/example.mustache @@ -0,0 +1,21 @@ +/* + * This file is automatically generated. + * Do not modify! -- ALL CHANGES WILL BE ERASED! + */ + +package {{packageName}}; + +import java.util.Date; + +public final class {{className}} { + public static final String PROJECT = "{{project}}"; + public static final Date BUILDDATE = new Date({{epoch}}L); + public static final String VERSION = "{{version}}"; + + /** + * Disables the default constructor. + */ + private {{className}}() { + throw new UnsupportedOperationException("Illegal constructor call."); + } +} diff --git a/examples/java/gradle/example.properties b/examples/java/gradle/example.properties new file mode 100644 index 0000000..d0b5ce4 --- /dev/null +++ b/examples/java/gradle/example.properties @@ -0,0 +1,9 @@ +#Generated by the Semver Plugin for Gradle +#Sat Apr 27 17:04:13 PDT 2019 +example.buildmeta=T800 +example.major=8 +example.minor=4 +example.patch=97 +example.prerelease=alpha +example.project=Java Example +example.semver=8.4.97-alpha+T800 diff --git a/examples/java/gradle/gradle/wrapper/gradle-wrapper.jar b/examples/java/gradle/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7f93135 Binary files /dev/null and b/examples/java/gradle/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/java/gradle/wrapper/gradle-wrapper.properties b/examples/java/gradle/gradle/wrapper/gradle-wrapper.properties similarity index 93% rename from examples/java/gradle/wrapper/gradle-wrapper.properties rename to examples/java/gradle/gradle/wrapper/gradle-wrapper.properties index 9f4197d..ac72c34 100644 --- a/examples/java/gradle/wrapper/gradle-wrapper.properties +++ b/examples/java/gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/examples/java/gradlew b/examples/java/gradle/gradlew similarity index 98% rename from examples/java/gradlew rename to examples/java/gradle/gradlew index fcb6fca..0adc8e1 100755 --- a/examples/java/gradlew +++ b/examples/java/gradle/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/examples/java/gradlew.bat b/examples/java/gradle/gradlew.bat similarity index 100% rename from examples/java/gradlew.bat rename to examples/java/gradle/gradlew.bat diff --git a/examples/java/pom.xml b/examples/java/gradle/pom.xml similarity index 100% rename from examples/java/pom.xml rename to examples/java/gradle/pom.xml diff --git a/examples/java/settings.gradle b/examples/java/gradle/settings.gradle similarity index 100% rename from examples/java/settings.gradle rename to examples/java/gradle/settings.gradle diff --git a/examples/java/src/generated/java/com/example/ExampleVersion.java b/examples/java/gradle/src/generated/java/com/example/ExampleVersion.java similarity index 87% rename from examples/java/src/generated/java/com/example/ExampleVersion.java rename to examples/java/gradle/src/generated/java/com/example/ExampleVersion.java index a72d3a9..1f3cf42 100644 --- a/examples/java/src/generated/java/com/example/ExampleVersion.java +++ b/examples/java/gradle/src/generated/java/com/example/ExampleVersion.java @@ -2,14 +2,14 @@ * This file is automatically generated. * Do not modify! -- ALL CHANGES WILL BE ERASED! */ - + package com.example; import java.util.Date; public final class ExampleVersion { public static final String PROJECT = "Java Example"; - public static final Date BUILDDATE = new Date(1624066674216L); + public static final Date BUILDDATE = new Date(1692423608415L); public static final String VERSION = "8.4.97-alpha+T800"; /** diff --git a/examples/java/gradle/src/generated/java/com/example/GeneratedVersion.java b/examples/java/gradle/src/generated/java/com/example/GeneratedVersion.java new file mode 100644 index 0000000..03423f9 --- /dev/null +++ b/examples/java/gradle/src/generated/java/com/example/GeneratedVersion.java @@ -0,0 +1,34 @@ +/* +* This file is automatically generated. +* Do not modify! -- ALL CHANGES WILL BE ERASED! +*/ + +package com.example; + +import java.util.Date; + +/** +* Provides semantic version information. +* +* @author Semantic Version Annotation Processor +*/ +public final class GeneratedVersion { +public static final String PROJECT = "Java App"; +public static final Date BUILDDATE = new Date(1692423608452L); +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. +*/ +private GeneratedVersion() { +throw new UnsupportedOperationException("Illegal constructor call."); +} +} diff --git a/examples/java/gradle/src/main/java/com/example/App.java b/examples/java/gradle/src/main/java/com/example/App.java new file mode 100644 index 0000000..9875a22 --- /dev/null +++ b/examples/java/gradle/src/main/java/com/example/App.java @@ -0,0 +1,31 @@ +package com.example; + +import net.thauvin.erik.semver.Version; + +import java.text.SimpleDateFormat; +import java.util.Locale; + +@Version(properties = "version.properties") +public final class App { + /** + * Command line interface. + * + * @param args The command line parameters. + */ + public static void main(final String... args) { + final SimpleDateFormat sdf = new SimpleDateFormat("EEE, d MMM yyyy 'at' HH:mm:ss z", Locale.US); + + System.out.println("-----------------------------------------------------"); + + System.out.println(" Version: " + 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("-----------------------------------------------------"); + } +} diff --git a/examples/java/src/main/java/com/example/Example.java b/examples/java/gradle/src/main/java/com/example/Example.java similarity index 100% rename from examples/java/src/main/java/com/example/Example.java rename to examples/java/gradle/src/main/java/com/example/Example.java diff --git a/examples/java/gradle/version.properties b/examples/java/gradle/version.properties new file mode 100644 index 0000000..dc68bf3 --- /dev/null +++ b/examples/java/gradle/version.properties @@ -0,0 +1,9 @@ +#Generated by the Semver Plugin for Gradle +#Sat Apr 27 17:05:34 PDT 2019 +version.buildmeta=007 +version.major=11 +version.minor=11 +version.patch=20 +version.prerelease=beta +version.project=Java App +version.semver=11.11.20-beta+007 diff --git a/examples/java/gradle/wrapper/gradle-wrapper.jar b/examples/java/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 033e24c..0000000 Binary files a/examples/java/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/examples/java/src/generated/java/com/example/GeneratedVersion.java b/examples/java/src/generated/java/com/example/GeneratedVersion.java deleted file mode 100644 index 1f0b0a9..0000000 --- a/examples/java/src/generated/java/com/example/GeneratedVersion.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is automatically generated. - * Do not modify! -- ALL CHANGES WILL BE ERASED! - */ - -package com.example; - -import java.util.Date; - -/** - * Provides semantic version information. - * - * @author Semantic Version Annotation Processor - */ -public final class GeneratedVersion { - public static final String PROJECT = "Java App"; - public static final Date BUILDDATE = new Date(1624066674199L); - 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. - */ - private GeneratedVersion() { - throw new UnsupportedOperationException("Illegal constructor call."); - } -} diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts index 9529c16..9c52a47 100644 --- a/examples/kotlin/build.gradle.kts +++ b/examples/kotlin/build.gradle.kts @@ -1,8 +1,8 @@ plugins { id("application") - id("com.github.ben-manes.versions") version "0.46.0" - kotlin("jvm") version "1.7.22" - kotlin("kapt") version "1.7.22" + id("com.github.ben-manes.versions") version "0.47.0" + kotlin("jvm") version "1.9.0" + kotlin("kapt") version "1.9.0" } // ./gradlew diff --git a/examples/kotlin/gradle/wrapper/gradle-wrapper.jar b/examples/kotlin/gradle/wrapper/gradle-wrapper.jar index 033e24c..7f93135 100644 Binary files a/examples/kotlin/gradle/wrapper/gradle-wrapper.jar and b/examples/kotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/kotlin/gradle/wrapper/gradle-wrapper.properties b/examples/kotlin/gradle/wrapper/gradle-wrapper.properties index 9f4197d..ac72c34 100644 --- a/examples/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/examples/kotlin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/examples/kotlin/gradlew b/examples/kotlin/gradlew index fcb6fca..0adc8e1 100755 --- a/examples/kotlin/gradlew +++ b/examples/kotlin/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/pom.xml b/pom.xml index 8bb99f9..b29f98a 100644 --- a/pom.xml +++ b/pom.xml @@ -2,9 +2,9 @@ 4.0.0 - net.thauvin.erik.semver + net.thauvin.erik semver - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT SemVer Semantic Version Annotation Processor https://github.com/ethauvin/semver diff --git a/src/bld/java/net/thauvin/erik/semver/SemverBuild.java b/src/bld/java/net/thauvin/erik/semver/SemverBuild.java index 1e94f53..f3eab90 100644 --- a/src/bld/java/net/thauvin/erik/semver/SemverBuild.java +++ b/src/bld/java/net/thauvin/erik/semver/SemverBuild.java @@ -45,15 +45,14 @@ import java.nio.file.Path; import java.util.List; import static rife.bld.dependencies.Repository.*; -import static rife.bld.dependencies.Scope.compile; -import static rife.bld.dependencies.Scope.test; +import static rife.bld.dependencies.Scope.*; import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING; public class SemverBuild extends Project { public SemverBuild() { - pkg = "net.thauvin.erik.semver"; + pkg = "net.thauvin.erik"; name = "SemVer"; - version = version(1, 2, 1, "SNAPSHOT"); + version = version(1, 2, 2, "SNAPSHOT"); var description = "Semantic Version Annotation Processor"; var url = "https://github.com/ethauvin/semver"; @@ -82,11 +81,11 @@ public class SemverBuild extends Project { .withCredentials(property("sonatype.user"), property("sonatype.password")) : repository(SONATYPE_RELEASES.location()) .withCredentials(property("sonatype.user"), property("sonatype.password"))) - .repository(MAVEN_LOCAL) .info(new PublishInfo() .groupId(pkg) .artifactId(name.toLowerCase()) - .name(name).version(version) + .name(name) + .version(version) .description(description) .url(url) .developer(new PublishDeveloper()