From c5a6e2220c82cc746e14d0f852d199c835216064 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 29 Sep 2023 15:31:33 -0700 Subject: [PATCH] Updated all dependencies --- .idea/compiler.xml | 16 ++++++++++ .idea/copyright/BSD_3_Clause.xml | 2 +- .idea/copyright/profiles_settings.xml | 7 +++++ .idea/jarRepositories.xml | 30 +++++++++++++++++++ .idea/kotlinc.xml | 6 ++++ .idea/misc.xml | 8 ++++- .idea/modules.xml | 1 + .idea/modules/examples-java.main.iml | 8 +++++ .idea/scopes/Source_Code.xml | 3 ++ examples/java/gradle/build.gradle | 20 ++++++++----- .../java/com/example/ExampleVersion.java | 2 +- .../java/com/example/GeneratedVersion.java | 2 +- examples/kotlin/build.gradle.kts | 6 ++-- lib/bld/bld-wrapper.properties | 7 ++--- version.properties | 8 ----- 15 files changed, 99 insertions(+), 27 deletions(-) create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/kotlinc.xml create mode 100644 .idea/modules/examples-java.main.iml create mode 100644 .idea/scopes/Source_Code.xml delete mode 100644 version.properties diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..40012f2 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/BSD_3_Clause.xml b/.idea/copyright/BSD_3_Clause.xml index 956f692..025a880 100644 --- a/.idea/copyright/BSD_3_Clause.xml +++ b/.idea/copyright/BSD_3_Clause.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..dd82085 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..4e9cedf --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..f8467b4 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index dbc8bc6..32dcb40 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,10 +6,16 @@ + + - \ No newline at end of file + diff --git a/.idea/modules.xml b/.idea/modules.xml index 55adcb9..c98f120 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,6 +4,7 @@ + \ No newline at end of file diff --git a/.idea/modules/examples-java.main.iml b/.idea/modules/examples-java.main.iml new file mode 100644 index 0000000..807b620 --- /dev/null +++ b/.idea/modules/examples-java.main.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/Source_Code.xml b/.idea/scopes/Source_Code.xml new file mode 100644 index 0000000..1753056 --- /dev/null +++ b/.idea/scopes/Source_Code.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/examples/java/gradle/build.gradle b/examples/java/gradle/build.gradle index a89c79b..6107ccf 100644 --- a/examples/java/gradle/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.47.0' + id 'com.github.ben-manes.versions' version '0.48.0' } // ./gradlew run @@ -11,11 +11,6 @@ defaultTasks 'run' final def semverProcessor = 'net.thauvin.erik:semver:1.2.1-SNAPSHOT' -sourceCompatibility = 17 -targetCompatibility = 17 - -mainClassName = 'com.example.App' - repositories { mavenLocal() mavenCentral() @@ -27,12 +22,21 @@ dependencies { implementation semverProcessor } -tasks.withType(JavaCompile) { +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +application { + mainClassName = 'com.example.App' +} + +tasks.withType(JavaCompile).configureEach { options.generatedSourceOutputDirectory.set(file("${projectDir}/src/generated/java")) options.compilerArgs += ["-Asemver.project.dir=$projectDir"] } -task runExample(type: JavaExec) { +tasks.register("runExample", JavaExec) { group = 'application' classpath = sourceSets.main.runtimeClasspath mainClass.set('com.example.Example') diff --git a/examples/java/gradle/src/generated/java/com/example/ExampleVersion.java b/examples/java/gradle/src/generated/java/com/example/ExampleVersion.java index 943ebb0..f2140d0 100644 --- a/examples/java/gradle/src/generated/java/com/example/ExampleVersion.java +++ b/examples/java/gradle/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(1692564205424L); + public static final Date BUILDDATE = new Date(1696019617021L); 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 index 28b778b..d397944 100644 --- a/examples/java/gradle/src/generated/java/com/example/GeneratedVersion.java +++ b/examples/java/gradle/src/generated/java/com/example/GeneratedVersion.java @@ -14,7 +14,7 @@ import java.util.Date; */ public final class GeneratedVersion { public static final String PROJECT = "Java App"; -public static final Date BUILDDATE = new Date(1692564205452L); +public static final Date BUILDDATE = new Date(1696019617081L); public static final int MAJOR = 11; public static final int MINOR = 11; public static final int PATCH = 20; diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts index 9c52a47..6a714d9 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.47.0" - kotlin("jvm") version "1.9.0" - kotlin("kapt") version "1.9.0" + id("com.github.ben-manes.versions") version "0.48.0" + kotlin("jvm") version "1.9.10" + kotlin("kapt") version "1.9.10" } // ./gradlew diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index dd33837..675f518 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,10 +1,9 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.2 -bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.0 -bld.extension-testng=com.uwyn.rife2:bld-testng:0.9.1-SNAPSHOT bld.extension-exec=com.uwyn.rife2:bld-exec:0.9.0-SNAPSHOT -bld.repositories=MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES +bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.1-SNAPSHOT +bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.3-SNAPSHOT +bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= bld.sourceDirectories= bld.version=1.7.2 diff --git a/version.properties b/version.properties deleted file mode 100644 index 3966686..0000000 --- a/version.properties +++ /dev/null @@ -1,8 +0,0 @@ -#Generated by the Semver Plugin for Gradle -#Sun May 02 21:54:48 PDT 2021 -version.buildmeta= -version.major=1 -version.minor=2 -version.patch=1 -version.prerelease=SNAPSHOT -version.semver=1.2.1-SNAPSHOT