Skip to content

Commit ea2e80a

Browse files
authored
Merge pull request quarkusio#45470 from andreas-eberle/feature/kotlin-2.1.0
Update Kotlin to version 2.1.20
2 parents eb6aa7d + 43a11c3 commit ea2e80a

File tree

12 files changed

+16
-21
lines changed

12 files changed

+16
-21
lines changed

bom/application/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@
150150
<cloudevents-api.version>3.0.0</cloudevents-api.version>
151151
<azure-functions-java-library.version>3.1.0</azure-functions-java-library.version>
152152
<azure-functions-java-spi.version>1.0.0</azure-functions-java-spi.version>
153-
<kotlin.version>2.0.21</kotlin.version>
154-
<kotlin.coroutine.version>1.9.0</kotlin.coroutine.version>
153+
<kotlin.version>2.1.20</kotlin.version>
154+
<kotlin.coroutine.version>1.10.1</kotlin.coroutine.version>
155+
<kotlin-serialization.version>1.8.0</kotlin-serialization.version>
155156
<azure.toolkit-lib.version>0.27.0</azure.toolkit-lib.version>
156-
<kotlin-serialization.version>1.7.3</kotlin-serialization.version>
157157
<dekorate.version>4.1.4</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
158158
<maven-invoker.version>3.2.0</maven-invoker.version>
159159
<awaitility.version>4.3.0</awaitility.version>

build-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<!-- These properties are needed in order for them to be resolvable by the generated projects -->
2222
<compiler-plugin.version>${version.compiler.plugin}</compiler-plugin.version>
23-
<kotlin.version>2.0.21</kotlin.version>
23+
<kotlin.version>2.1.20</kotlin.version>
2424
<dokka.version>2.0.0</dokka.version>
2525
<scala.version>2.13.12</scala.version>
2626
<scala-maven-plugin.version>4.9.2</scala-maven-plugin.version>

devtools/gradle/gradle-application-plugin/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void shouldReturnMultipleOutputSourceDirectories() {
105105

106106
@Test
107107
public void shouldNotFailOnProjectDependenciesWithoutMain(@TempDir Path testProjectDir) throws IOException {
108-
var kotlinVersion = System.getProperty("kotlin_version", "1.9.23");
108+
var kotlinVersion = System.getProperty("kotlin_version", "2.1.20");
109109
var settingFile = testProjectDir.resolve("settings.gradle.kts");
110110
var mppProjectDir = testProjectDir.resolve("mpp");
111111
var quarkusProjectDir = testProjectDir.resolve("quarkus");

extensions/schema-registry/confluent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>org.jetbrains.kotlin</groupId>
2727
<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
28-
<version>2.0.21</version>
28+
<version>2.1.20</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>org.json</groupId>

independent-projects/arc/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<!-- test versions -->
5454
<version.assertj>3.27.3</version.assertj>
5555
<version.junit5>5.10.5</version.junit5>
56-
<version.kotlin>2.0.21</version.kotlin>
57-
<version.kotlin-coroutines>1.9.0</version.kotlin-coroutines>
56+
<version.kotlin>2.1.20</version.kotlin>
57+
<version.kotlin-coroutines>1.10.1</version.kotlin-coroutines>
5858
<version.mockito>5.16.1</version.mockito>
5959
<!-- TCK versions -->
6060
<version.arquillian>1.7.0.Final</version.arquillian>

integration-tests/gradle/src/main/resources/conditional-dependencies-kotlin/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
kotlin("jvm") version "1.9.23"
3-
kotlin("plugin.allopen") version "1.9.23"
2+
kotlin("jvm") version "2.1.20"
3+
kotlin("plugin.allopen") version "2.1.20"
44
id("io.quarkus")
55
}
66

integration-tests/gradle/src/main/resources/grpc-multi-module-no-java/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
kotlin("jvm") version "2.0.21"
3-
kotlin("plugin.allopen") version "2.0.21"
2+
kotlin("jvm") version "2.1.20"
3+
kotlin("plugin.allopen") version "2.1.20"
44

55
id("io.quarkus") apply false
66
}

integration-tests/kafka-json-schema-apicurio2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>org.jetbrains.kotlin</groupId>
2525
<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
26-
<version>2.0.21</version>
26+
<version>2.1.20</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>org.json</groupId>

integration-tests/kotlin-maven-invoker/src/test/java/io/quarkus/kotlin/maven/it/KotlinDevModeIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public void testExternalKotlinReloadableArtifacts() throws Exception {
123123
install(externalJarDir, false);
124124

125125
// Change GreetingResource.kt endpoint response to upper case letters
126-
filter(greetingResourceKotlin, Map.of(greetingBonjourCall, greetingBonjourCall.concat(".toUpperCase()")));
126+
filter(greetingResourceKotlin, Map.of(greetingBonjourCall, greetingBonjourCall.concat(".uppercase()")));
127127

128128
await()
129129
.pollDelay(100, TimeUnit.MILLISECONDS)

integration-tests/kotlin/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,10 @@
1313
<artifactId>quarkus-integration-test-kotlin</artifactId>
1414
<name>Quarkus - Integration Tests - Kotlin</name>
1515

16-
<properties>
17-
<serialization.version>1.3.1</serialization.version>
18-
</properties>
19-
2016
<dependencies>
2117
<dependency>
2218
<groupId>io.quarkus</groupId>
2319
<artifactId>quarkus-rest-kotlin-serialization</artifactId>
24-
<version>999-SNAPSHOT</version>
2520
</dependency>
2621

2722
<dependency>

0 commit comments

Comments
 (0)