Skip to content

Commit

Permalink
chore: Update Gradle, wrapper, Kotlin, plugins, coroutines, JUnit, GS…
Browse files Browse the repository at this point in the history
…ON and Jetty overrides
  • Loading branch information
nhubbard committed Aug 16, 2024
1 parent 7b6d9bc commit 9a035b0
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 11 deletions.
10 changes: 5 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ val signPublication by extra { !System.getenv("JITPACK").toBoolean() }
plugins {
java
signing
kotlin("jvm") version "2.0.20-Beta2"
kotlin("plugin.allopen") version "2.0.20-Beta2"
kotlin("jvm") version "2.0.20-RC2"
kotlin("plugin.allopen") version "2.0.20-RC2"
alias(libs.plugins.dokka)
alias(libs.plugins.kover)
alias(libs.plugins.benchmark)
Expand All @@ -49,7 +49,7 @@ plugins {
}

group = "io.github.nhubbard"
version = "2.2.0"
version = "2.2.1"

val projectDescription =
"A type-safe cascading configuration library for Kotlin and Java, supporting most configuration formats"
Expand Down Expand Up @@ -268,9 +268,9 @@ configurations.all {
resolutionStrategy.eachDependency {
// Resolve Gson vulnerability from Toml4j
if (requested.group == "com.google.code.gson" && requested.name == "gson")
useVersion("2.10.1")
useVersion("2.11.0")
// Resolve Jetty vulnerability from Spark
if (requested.group == "org.eclipse.jetty" && requested.name.matches("^jetty-(server|xml|util|http)".toRegex()))
useVersion("9.4.54.v20240208")
useVersion("9.4.55.v20240627")
}
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 4 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# 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
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
10 changes: 5 additions & 5 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ rootProject.name = "konf"

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
id("com.gradle.develocity") version "3.17.5"
id("com.gradle.develocity") version "3.17.6"
}

develocity {
Expand All @@ -50,13 +50,13 @@ dependencyResolutionManagement {

// Gradle plugins
plugin("dokka", "org.jetbrains.dokka").version("1.9.20")
plugin("kover", "org.jetbrains.kotlinx.kover").version("0.8.2")
plugin("kover", "org.jetbrains.kotlinx.kover").version("0.8.3")
plugin("benchmark", "org.jetbrains.kotlinx.benchmark").version("0.4.11")
plugin("sonatype-publisher", "net.thebugmc.gradle.sonatype-central-portal-publisher").version("1.2.3")
plugin("sonatype-publisher", "net.thebugmc.gradle.sonatype-central-portal-publisher").version("1.2.4")
plugin("solo-publisher", "ca.solo-studios.sonatype-publish").version("0.2.3")

// Dependencies
library("kotlinx-coroutines-core", "org.jetbrains.kotlinx", "kotlinx-coroutines-core").version("1.9.0-RC")
library("kotlinx-coroutines-core", "org.jetbrains.kotlinx", "kotlinx-coroutines-core").version("1.9.0-RC.2")
library("reflections", "org.reflections", "reflections").version("0.10.2")
library("commons-text", "org.apache.commons", "commons-text").version("1.12.0")
library("jackson-core", "com.fasterxml.jackson.core", "jackson-core").versionRef("jackson")
Expand All @@ -74,7 +74,7 @@ dependencyResolutionManagement {
library("snakeyaml", "org.yaml", "snakeyaml").version("2.2")

// Test dependencies
library("junit-params", "org.junit.jupiter", "junit-jupiter-params").version("5.11.0-M2")
library("junit-params", "org.junit.jupiter", "junit-jupiter-params").version("5.11.0")
library("spark", "com.sparkjava", "spark-core").version("2.9.4")
library("slf4j-simple", "org.slf4j", "slf4j-simple").version("2.1.0-alpha1")

Expand Down

0 comments on commit 9a035b0

Please sign in to comment.