From ca6c032438991d13e6ca36be9783e4635f6fc09d Mon Sep 17 00:00:00 2001 From: Andreas Eberle Date: Thu, 28 Nov 2024 15:32:33 +0100 Subject: [PATCH] Update Kotlin to version 2.1.0 - Additional changes --- .../src/test/java/io/quarkus/gradle/QuarkusPluginTest.java | 2 +- .../conditional-dependencies-kotlin/build.gradle.kts | 4 ++-- integration-tests/kotlin/pom.xml | 5 ----- .../reactive/kotlin/CountryNamePayloadTransformer.kt | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/devtools/gradle/gradle-application-plugin/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java b/devtools/gradle/gradle-application-plugin/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java index d5dad18b9ed5a..eb0f79aa66858 100644 --- a/devtools/gradle/gradle-application-plugin/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java +++ b/devtools/gradle/gradle-application-plugin/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java @@ -105,7 +105,7 @@ public void shouldReturnMultipleOutputSourceDirectories() { @Test public void shouldNotFailOnProjectDependenciesWithoutMain(@TempDir Path testProjectDir) throws IOException { - var kotlinVersion = System.getProperty("kotlin_version", "1.9.23"); + var kotlinVersion = System.getProperty("kotlin_version", "2.1.0"); var settingFile = testProjectDir.resolve("settings.gradle.kts"); var mppProjectDir = testProjectDir.resolve("mpp"); var quarkusProjectDir = testProjectDir.resolve("quarkus"); diff --git a/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts b/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts index 5dea13880a16b..bd98910b42c2a 100644 --- a/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts +++ b/integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - kotlin("jvm") version "1.9.23" - kotlin("plugin.allopen") version "1.9.23" + kotlin("jvm") version "2.1.0" + kotlin("plugin.allopen") version "2.1.0" id("io.quarkus") } diff --git a/integration-tests/kotlin/pom.xml b/integration-tests/kotlin/pom.xml index bf5587575cf76..1b06edc08ed3d 100644 --- a/integration-tests/kotlin/pom.xml +++ b/integration-tests/kotlin/pom.xml @@ -13,15 +13,10 @@ quarkus-integration-test-kotlin Quarkus - Integration Tests - Kotlin - - 1.3.1 - - io.quarkus quarkus-rest-kotlin-serialization - 999-SNAPSHOT diff --git a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNamePayloadTransformer.kt b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNamePayloadTransformer.kt index 7a937f5fba6fb..27647a5abc182 100644 --- a/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNamePayloadTransformer.kt +++ b/integration-tests/resteasy-reactive-kotlin/standard/src/main/kotlin/io/quarkus/it/resteasy/reactive/kotlin/CountryNamePayloadTransformer.kt @@ -12,6 +12,6 @@ class CountryNamePayloadTransformer { @Outgoing("countries-t1-out") suspend fun transform(country: Country): Country { delay(100) - return Country(country.name.lowercase(), country.capital) + return Country(country.name.uppercase(), country.capital) } }