diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 5fa620429..e45c38376 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -23,12 +23,12 @@ jobs: steps: - name: Check out the repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - - name: Set up JDK 20 - uses: actions/setup-java@v3 + - name: Set up JDK 21 + uses: actions/setup-java@v4 with: - java-version: '20' + java-version: '21' distribution: 'temurin' - name: Build with Gradle diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1d2a2332d..9e973c4f2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,11 +11,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up JDK 20 - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - name: Set up JDK 21 + uses: actions/setup-java@v4 with: - java-version: '20' + java-version: '21' distribution: 'temurin' - name: Decode GPG Key diff --git a/gestalt-core/src/main/java/org/github/gestalt/config/decoder/StringConstructorDecoder.java b/gestalt-core/src/main/java/org/github/gestalt/config/decoder/StringConstructorDecoder.java index 05ccf6353..4a6c03529 100644 --- a/gestalt-core/src/main/java/org/github/gestalt/config/decoder/StringConstructorDecoder.java +++ b/gestalt-core/src/main/java/org/github/gestalt/config/decoder/StringConstructorDecoder.java @@ -54,6 +54,7 @@ public boolean canDecode(String path, Tags tags, ConfigNode node, TypeCapture * @param decoderContext The context of the current decoder. * @return ValidateOf the current node with details of either success or failures. */ + @Override public ValidateOf decode(String path, Tags tags, ConfigNode node, TypeCapture type, DecoderContext decoderContext) { LeafNode leafNode = (LeafNode) node; diff --git a/gestalt-core/src/test/java/org/github/gestalt/config/decoder/StringConstructorDecoderTest.java b/gestalt-core/src/test/java/org/github/gestalt/config/decoder/StringConstructorDecoderTest.java index 5b3e6fe7e..e8f108967 100644 --- a/gestalt-core/src/test/java/org/github/gestalt/config/decoder/StringConstructorDecoderTest.java +++ b/gestalt-core/src/test/java/org/github/gestalt/config/decoder/StringConstructorDecoderTest.java @@ -91,6 +91,7 @@ void decodeEmptyWrongType() { results.getErrors().get(0).description()); } + @SuppressWarnings({"UnusedMethod", "UnusedVariable"}) private static class MyClass { Integer myData; @@ -103,6 +104,7 @@ public MyClass() { } } + @SuppressWarnings("UnusedMethod") private static class MyStringClass { String myData; diff --git a/gestalt-kodein-di/src/test/kotlin/org/github/gestalt/config/kotlin/kodein/test/KodeinTest.kt b/gestalt-kodein-di/src/test/kotlin/org/github/gestalt/config/kotlin/kodein/test/KodeinTest.kt index b65b50634..46e3e451e 100644 --- a/gestalt-kodein-di/src/test/kotlin/org/github/gestalt/config/kotlin/kodein/test/KodeinTest.kt +++ b/gestalt-kodein-di/src/test/kotlin/org/github/gestalt/config/kotlin/kodein/test/KodeinTest.kt @@ -3,7 +3,6 @@ package org.github.gestalt.config.kotlin.kodein.test import org.github.gestalt.config.Gestalt import org.github.gestalt.config.builder.GestaltBuilder import org.github.gestalt.config.kotlin.kodein.gestalt -import org.github.gestalt.config.source.ClassPathConfigSource import org.github.gestalt.config.source.ClassPathConfigSourceBuilder import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeAll diff --git a/gestalt-koin-di/src/test/kotlin/org/github/gestalt/config/kotlin/koin/test/KoinTest.kt b/gestalt-koin-di/src/test/kotlin/org/github/gestalt/config/kotlin/koin/test/KoinTest.kt index eabe03594..8651225ef 100644 --- a/gestalt-koin-di/src/test/kotlin/org/github/gestalt/config/kotlin/koin/test/KoinTest.kt +++ b/gestalt-koin-di/src/test/kotlin/org/github/gestalt/config/kotlin/koin/test/KoinTest.kt @@ -3,7 +3,6 @@ package org.github.gestalt.config.kotlin.koin.test import org.github.gestalt.config.Gestalt import org.github.gestalt.config.builder.GestaltBuilder import org.github.gestalt.config.kotlin.koin.gestalt -import org.github.gestalt.config.source.ClassPathConfigSource import org.github.gestalt.config.source.ClassPathConfigSourceBuilder import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeAll diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f4328a991..a12fb908b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] java = "11" -javaLatest = "19" +javaLatest = "21" # @pin -kotlin = "1.8.22" +kotlin = "1.9.21" # @pin -kotlinDokka = "1.8.20" +kotlinDokka = "1.9.10" # Kotlin DI -kodeinDI = "7.21.0" +kodeinDI = "7.21.1" koinDI = "3.5.0" # Java DI # @pin @@ -21,12 +21,12 @@ weldCore = "4.0.3.Final" jackson = "2.16.0" hocon = "1.4.3" # Cloud -awsBom = "2.21.28" -gcpLibraries = "26.27.0" +awsBom = "2.21.39" +gcpLibraries = "26.28.0" # vault vault = "6.2.0" # Git support -jgit = "6.7.0.202309050840-r" +jgit = "6.8.0.202311291450-r" eddsa = "0.3.0" # testing junit5 = "5.10.1" @@ -40,8 +40,7 @@ testcontainers = "1.19.3" # static code analysis errorprone = "2.23.0" gradleErrorProne = "3.1.0" -detekt = "1.23.3" -gradleDetekt = "1.23.3" +detekt = "1.23.4" checkStyle = "10.10.0" # benchmarking jmh = "1.37" @@ -107,7 +106,7 @@ jmh-annotations = { module = "org.openjdk.jmh:jmh-generator-annprocess", version errorProne = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" } gradle-git-versions = { module = "com.palantir.gradle.gitversion:gradle-git-version", version.ref = "gitVersions" } detekt = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" } -gradle-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "gradleDetekt" } +gradle-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } # Gradle Utilities gradle-ben-manes-versions = { module = "com.github.ben-manes:gradle-versions-plugin", version.ref = "gradleVersions" } gradle-versions-update = { module = "nl.littlerobots.vcu:plugin", version.ref = "gradleVersionsUpdate" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..d64cd4917 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f862f..1af9e0930 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0adc8e1a5..1aa94a426 100755 --- a/gradlew +++ b/gradlew @@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \