From d28a3c62d9f1219715a68b47b06f0278b844a534 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Thu, 14 Nov 2024 10:13:11 +0200 Subject: [PATCH 1/2] Kotlin 2.1 --- build.gradle.kts | 6 +++--- pom-central.xml | 14 +++++++------- pom.xml | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6e97cdbac..1f04b5c82 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "2.0.21" + kotlin("jvm") version "2.1.0-RC" jacoco id("org.sonarqube") version "5.1.0.4882" id("com.diffplug.spotless") version "6.12.0" @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib:2.0.21") + implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.0-RC") testImplementation("org.junit.jupiter:junit-jupiter:[5.11.0,)") testImplementation("org.hamcrest:hamcrest-core:[2.2,)") testImplementation("org.zapodot:embedded-db-junit-jupiter:[2.2.0,)") @@ -34,7 +34,7 @@ java.targetCompatibility = JavaVersion.VERSION_11 tasks.withType { compilerOptions { - jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) } } diff --git a/pom-central.xml b/pom-central.xml index 0487c8cbe..d31d88355 100644 --- a/pom-central.xml +++ b/pom-central.xml @@ -27,7 +27,7 @@ https://github.com/javadev/LeetCode-in-Kotlin - 2.0.21 + 2.1.0-RC UTF-8 @@ -47,7 +47,7 @@ kotlin-maven-plugin ${kotlin.version} - 11 + 17 @@ -74,7 +74,7 @@ org.junit.jupiter junit-jupiter-engine - [5.11.0,) + [5.11.3,) @@ -149,25 +149,25 @@ org.junit.jupiter junit-jupiter-api - [5.11.0,) + [5.11.3,) test org.junit.jupiter junit-jupiter-engine - [5.11.0,) + [5.11.3,) test org.junit.platform junit-platform-launcher - [1.11.0,) + [1.11.3,) test org.hamcrest hamcrest-core - [2.2,) + [3.0,) test diff --git a/pom.xml b/pom.xml index 24bc8a0c7..6e4d2caef 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ https://github.com/javadev/LeetCode-in-Kotlin - 2.0.21 + 2.1.0-RC UTF-8 @@ -46,7 +46,7 @@ kotlin-maven-plugin ${kotlin.version} - 11 + 17 @@ -73,7 +73,7 @@ org.junit.jupiter junit-jupiter-engine - [5.11.0,) + [5.11.3,) @@ -140,25 +140,25 @@ org.junit.jupiter junit-jupiter-api - [5.11.0,) + [5.11.3,) test org.junit.jupiter junit-jupiter-engine - [5.11.0,) + [5.11.3,) test org.junit.platform junit-platform-launcher - [1.11.0,) + [1.11.3,) test org.hamcrest hamcrest-core - [2.2,) + [3.0,) test From 82806a85d24306a4fba5d178f135b56b289e2ef4 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Thu, 14 Nov 2024 10:16:00 +0200 Subject: [PATCH 2/2] Java 17 --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1f04b5c82..61b6b2958 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,8 +29,8 @@ tasks.test { group = "com.github.javadev" version = "1.30-SNAPSHOT" description = "leetcode-in-kotlin" -java.sourceCompatibility = JavaVersion.VERSION_11 -java.targetCompatibility = JavaVersion.VERSION_11 +java.sourceCompatibility = JavaVersion.VERSION_17 +java.targetCompatibility = JavaVersion.VERSION_17 tasks.withType { compilerOptions {