From acbdb55b014a50083a266095bf27f509c2b9d946 Mon Sep 17 00:00:00 2001 From: taniaholst Date: Mon, 3 Feb 2025 11:45:24 +0100 Subject: [PATCH] :arrow_up: Upgrade deps --- app/build.gradle.kts | 21 +++++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- lib/build.gradle.kts | 13 +++++++------ 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ef3a438..b675803 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,11 +1,12 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { val kotlinVersion = "2.0.20" - val springBootVersion = "3.3.5" - val springDepMgmtVersion = "1.1.6" - val versionsVersion = "0.51.0" + val springBootVersion = "3.4.2" + val springDepMgmtVersion = "1.1.7" + val versionsVersion = "0.52.0" kotlin("jvm") kotlin("plugin.spring") version kotlinVersion @@ -25,11 +26,11 @@ repositories { dependencies { val logstashVersion = "8.0" - val opensearchVersion = "1.5.3" + val opensearchVersion = "1.6.0" val jsoupVersion = "1.18.3" - val opensearchTestcontainersVersion = "2.1.1" + val opensearchTestcontainersVersion = "2.1.2" val testcontainersVersion = "1.20.4" - val wiremockVersion = "4.1.4" + val wiremockVersion = "4.2.0" val kotestVersion = "5.9.1" implementation(project(":lib")) @@ -56,10 +57,10 @@ dependencies { testImplementation("io.kotest:kotest-assertions-json:$kotestVersion") } -tasks.withType { - kotlinOptions { - freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = "21" +tasks.withType().configureEach { + compilerOptions { + freeCompilerArgs.add("-Xjsr305=strict") + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e2fbf0..e382118 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 384b068..72afd33 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -1,7 +1,8 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - val versionsVersion = "0.51.0" + val versionsVersion = "0.52.0" kotlin("jvm") id("com.github.ben-manes.versions") version versionsVersion // ./gradlew dependencyUpdates to check for new versions @@ -18,17 +19,17 @@ repositories { } dependencies { - val opensearchVersion = "1.5.3" + val opensearchVersion = "1.6.0" implementation("org.opensearch.client:spring-data-opensearch-starter:$opensearchVersion") { exclude("org.opensearch.client", "opensearch-rest-client-sniffer") } } -tasks.withType { - kotlinOptions { - freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = "21" +tasks.withType().configureEach { + compilerOptions { + freeCompilerArgs.add("-Xjsr305=strict") + jvmTarget.set(JvmTarget.JVM_21) } }