From e8f75d56c4e3b85bbb0a6f11435de29c6a72bca3 Mon Sep 17 00:00:00 2001 From: Andrew Westberg Date: Tue, 28 May 2024 15:58:53 +0000 Subject: [PATCH] Bump dependencies --- build.gradle.kts | 7 ++++--- buildSrc/src/main/kotlin/Versions.kt | 16 ++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 20 ++++++++++---------- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a32873d..0c93e6b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask import org.hibernate.build.publish.auth.maven.MavenRepoAuthPlugin +import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { java @@ -18,7 +19,7 @@ if (!project.hasProperty("isGithubActions")) { } group = "io.newm" -version = "2.2.0-SNAPSHOT" +version = "2.2.1-SNAPSHOT" java.sourceCompatibility = JavaVersion.VERSION_21 java.targetCompatibility = JavaVersion.VERSION_21 @@ -182,7 +183,7 @@ project.tasks.withType { - kotlinOptions { + compilerOptions { freeCompilerArgs = listOf( "-Xjsr305=strict", @@ -190,7 +191,7 @@ tasks.withType { "-opt-in=kotlinx.serialization.ExperimentalSerializationApi", "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", ) - jvmTarget = "21" + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index eeb15f7..713deea 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,17 +1,17 @@ object Versions { - const val COMMONS_LOGGING = "1.3.1" + const val COMMONS_LOGGING = "1.3.2" const val COMMONS_NUMBERS = "1.1" - const val COROUTINES = "1.8.0" + const val COROUTINES = "1.8.1" const val GOOGLE_TRUTH = "1.4.2" const val JUNIT = "5.10.2" - const val KOTLIN = "1.9.23" - const val KOTLINX_DATETIME = "0.5.0" + const val KOTLIN = "2.0.0" + const val KOTLINX_DATETIME = "0.6.0" const val KOTLINX_SERIALIZATION = "1.6.3" const val KTLINT = "1.2.1" - const val KTLINT_PLUGIN = "12.1.0" - const val KTOR = "2.3.9" - const val LOGBACK = "1.5.3" + const val KTLINT_PLUGIN = "12.1.1" + const val KTOR = "2.3.11" + const val LOGBACK = "1.5.6" const val MAVEN_REPO_AUTH_PLUGIN = "3.0.4" - const val MOCKK = "1.13.10" + const val MOCKK = "1.13.11" const val VERSIONS_PLUGIN = "0.51.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22c..b82aa23 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.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail