From 599485255c9292896201a15962f16c6a181c00a4 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Fri, 6 Jan 2023 08:44:38 +0200 Subject: [PATCH] Bump to Kotlin 1.8.0 --- bom/application/pom.xml | 2 +- build-parent/pom.xml | 2 +- .../src/test/java/io/quarkus/gradle/QuarkusPluginTest.java | 2 +- devtools/gradle/gradle.properties | 2 +- independent-projects/arc/tests/pom.xml | 2 +- .../conditional-dependencies-kotlin/build.gradle.kts | 4 ++-- jakarta/transform.sh | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 438d46ef92d94..d7a133c505c14 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -152,7 +152,7 @@ 3.11.0 2.13.0 1.4.2 - 1.7.22 + 1.8.0 1.6.4 1.4.1 6.3.1 diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 7d82508203de4..f3c6d9c17e9d1 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -20,7 +20,7 @@ 3.10.1 - 1.7.22 + 1.8.0 1.7.20 2.13.8 4.8.0 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 0edaafdaf50d0..151a5f783a9bc 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 @@ -99,7 +99,7 @@ public void shouldReturnMultipleOutputSourceDirectories() { @Test public void shouldNotFailOnProjectDependenciesWithoutMain() throws IOException { - var kotlinVersion = System.getProperty("kotlin_version", "1.7.22"); + var kotlinVersion = System.getProperty("kotlin_version", "1.8.0"); var settingFile = testProjectDir.resolve("settings.gradle.kts"); var mppProjectDir = testProjectDir.resolve("mpp"); var quarkusProjectDir = testProjectDir.resolve("quarkus"); diff --git a/devtools/gradle/gradle.properties b/devtools/gradle/gradle.properties index 133e709814ac5..d29bb3e5ade39 100644 --- a/devtools/gradle/gradle.properties +++ b/devtools/gradle/gradle.properties @@ -1,2 +1,2 @@ version = 999-SNAPSHOT -kotlin_version = 1.7.22 +kotlin_version = 1.8.0 diff --git a/independent-projects/arc/tests/pom.xml b/independent-projects/arc/tests/pom.xml index cb28436b23edf..0f08a0e565f05 100644 --- a/independent-projects/arc/tests/pom.xml +++ b/independent-projects/arc/tests/pom.xml @@ -48,7 +48,7 @@ org.jetbrains.kotlin kotlin-stdlib - 1.7.22 + 1.8.0 test 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 065ace8968752..e2d44fca65c06 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.7.22" - kotlin("plugin.allopen") version "1.7.22" + kotlin("jvm") version "1.8.0" + kotlin("plugin.allopen") version "1.8.0" id("io.quarkus") } diff --git a/jakarta/transform.sh b/jakarta/transform.sh index cdda4a155229e..9e5004cc6f7ae 100755 --- a/jakarta/transform.sh +++ b/jakarta/transform.sh @@ -34,7 +34,7 @@ if [ "${REWRITE_OFFLINE-false}" != "true" ]; then # Build Kotlin Maven Plugin to allow skipping main compilation # (skipping test compilation is supported but not main) rm -rf target/kotlin - git clone -b v1.7.22-jakarta --depth 1 https://github.com/gsmet/kotlin.git target/kotlin + git clone -b v1.8.0-jakarta --depth 1 https://github.com/gsmet/kotlin.git target/kotlin pushd target/kotlin/libraries/tools/kotlin-maven-plugin mvn -B clean install -DskipTests -DskipITs popd