Skip to content

Commit

Permalink
Update Kotlin to version 2.1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
andreas-eberle committed Jan 28, 2025
1 parent 02dda9d commit 3e4f929
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 22 deletions.
6 changes: 3 additions & 3 deletions bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@
<cloudevents-api.version>3.0.0</cloudevents-api.version>
<azure-functions-java-library.version>3.1.0</azure-functions-java-library.version>
<azure-functions-java-spi.version>1.0.0</azure-functions-java-spi.version>
<kotlin.version>2.0.21</kotlin.version>
<kotlin.coroutine.version>1.9.0</kotlin.coroutine.version>
<kotlin.version>2.1.10</kotlin.version>
<kotlin.coroutine.version>1.10.0</kotlin.coroutine.version>
<kotlin-serialization.version>1.8.0</kotlin-serialization.version>
<azure.toolkit-lib.version>0.27.0</azure.toolkit-lib.version>
<kotlin-serialization.version>1.7.3</kotlin-serialization.version>
<dekorate.version>4.1.4</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
<maven-invoker.version>3.2.0</maven-invoker.version>
<awaitility.version>4.2.2</awaitility.version>
Expand Down
2 changes: 1 addition & 1 deletion build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<!-- These properties are needed in order for them to be resolvable by the generated projects -->
<compiler-plugin.version>${version.compiler.plugin}</compiler-plugin.version>
<kotlin.version>2.0.21</kotlin.version>
<kotlin.version>2.1.10</kotlin.version>
<dokka.version>2.0.0</dokka.version>
<scala.version>2.13.12</scala.version>
<scala-maven-plugin.version>4.9.2</scala-maven-plugin.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.10");
var settingFile = testProjectDir.resolve("settings.gradle.kts");
var mppProjectDir = testProjectDir.resolve("mpp");
var quarkusProjectDir = testProjectDir.resolve("quarkus");
Expand Down
2 changes: 1 addition & 1 deletion devtools/gradle/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
plugin-publish = "1.3.0"

# updating Kotlin here makes QuarkusPluginTest > shouldNotFailOnProjectDependenciesWithoutMain(Path) fail
kotlin = "2.0.21"
kotlin = "2.1.10"
smallrye-config = "3.11.1"

junit5 = "5.10.5"
Expand Down
2 changes: 1 addition & 1 deletion extensions/schema-registry/confluent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
<version>2.0.21</version>
<version>2.1.10</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
Expand Down
4 changes: 2 additions & 2 deletions independent-projects/arc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
<!-- test versions -->
<version.assertj>3.27.3</version.assertj>
<version.junit5>5.10.5</version.junit5>
<version.kotlin>2.0.21</version.kotlin>
<version.kotlin-coroutines>1.9.0</version.kotlin-coroutines>
<version.kotlin>2.1.10</version.kotlin>
<version.kotlin-coroutines>1.10.1</version.kotlin-coroutines>
<version.mockito>5.15.2</version.mockito>
<!-- TCK versions -->
<version.arquillian>1.7.0.Final</version.arquillian>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
kotlin("jvm") version "1.9.23"
kotlin("plugin.allopen") version "1.9.23"
kotlin("jvm") version "2.1.10"
kotlin("plugin.allopen") version "2.1.10"
id("io.quarkus")
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
kotlin("jvm") version "2.0.21"
kotlin("plugin.allopen") version "2.0.21"
kotlin("jvm") version "2.1.10"
kotlin("plugin.allopen") version "2.1.10"

id("io.quarkus") apply false
}
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/kafka-json-schema-apicurio2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
<version>2.0.21</version>
<version>2.1.10</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public void testExternalKotlinReloadableArtifacts() throws Exception {
install(externalJarDir, false);

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

await()
.pollDelay(100, TimeUnit.MILLISECONDS)
Expand Down
5 changes: 0 additions & 5 deletions integration-tests/kotlin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,10 @@
<artifactId>quarkus-integration-test-kotlin</artifactId>
<name>Quarkus - Integration Tests - Kotlin</name>

<properties>
<serialization.version>1.3.1</serialization.version>
</properties>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-rest-kotlin-serialization</artifactId>
<version>999-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ class CountryNameMessageTransformer {
@Outgoing("countries-t2-out")
suspend fun transform(input: Message<Country>): Message<String> {
delay(100)
return input.withPayload(input.payload.name.toLowerCase())
return input.withPayload(input.payload.name.lowercase())
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ class CountryNamePayloadTransformer {
@Outgoing("countries-t1-out")
suspend fun transform(country: Country): Country {
delay(100)
return Country(country.name.toUpperCase(), country.capital)
return Country(country.name.uppercase(), country.capital)
}
}

0 comments on commit 3e4f929

Please sign in to comment.