From 8649d8d623e5bb3a7369752ebfba3dd4221a3cf4 Mon Sep 17 00:00:00 2001 From: Alexandr Evstigneev Date: Mon, 1 Sep 2025 10:11:03 +0400 Subject: [PATCH] IJPL-204686 Updated jvm/jbr version to 21 across multiple modules There are more statements in the testData, left them as is for now GitOrigin-RevId: ca654cccb3650be0ba5c9257cffd8f8d3db97436 --- native/XPlatLauncher/resources/TestProject/build.gradle.kts | 1 + native/XPlatLauncher/resources/TestProject/gradle.properties | 4 ++-- platform/workspace/codegen-impl/build.gradle.kts | 3 ++- platform/workspace/codegen/build.gradle.kts | 3 ++- plugins/java-decompiler/engine/build.gradle.kts | 4 ++-- plugins/performanceTesting/commands-model/build.gradle | 2 +- plugins/performanceTesting/event-bus/build.gradle | 2 +- python/setup-test-environment/build.gradle.kts | 2 +- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/native/XPlatLauncher/resources/TestProject/build.gradle.kts b/native/XPlatLauncher/resources/TestProject/build.gradle.kts index 396932f4417e..d994129e7afb 100644 --- a/native/XPlatLauncher/resources/TestProject/build.gradle.kts +++ b/native/XPlatLauncher/resources/TestProject/build.gradle.kts @@ -1,3 +1,4 @@ +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. import java.net.URI import java.nio.file.Files import java.nio.file.StandardCopyOption diff --git a/native/XPlatLauncher/resources/TestProject/gradle.properties b/native/XPlatLauncher/resources/TestProject/gradle.properties index 65c3e19f5c4a..3865f0587d34 100644 --- a/native/XPlatLauncher/resources/TestProject/gradle.properties +++ b/native/XPlatLauncher/resources/TestProject/gradle.properties @@ -1,3 +1,3 @@ -jbrSdkVersion = 17.0.6 -jbrSdkBuildNumber = 829.9 +jbrSdkVersion=17.0.6 +jbrSdkBuildNumber=829.9 org.gradle.jvmargs=-Xmx2048m diff --git a/platform/workspace/codegen-impl/build.gradle.kts b/platform/workspace/codegen-impl/build.gradle.kts index 922479463146..0d9f8f39e284 100644 --- a/platform/workspace/codegen-impl/build.gradle.kts +++ b/platform/workspace/codegen-impl/build.gradle.kts @@ -1,3 +1,4 @@ +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. plugins { id("maven-publish") id("java") @@ -21,7 +22,7 @@ repositories { } kotlin { - jvmToolchain(17) + jvmToolchain(21) } publishing { diff --git a/platform/workspace/codegen/build.gradle.kts b/platform/workspace/codegen/build.gradle.kts index a041c071fbbf..e6bdf0d82a25 100644 --- a/platform/workspace/codegen/build.gradle.kts +++ b/platform/workspace/codegen/build.gradle.kts @@ -1,3 +1,4 @@ +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. plugins { id("maven-publish") id("java") @@ -15,7 +16,7 @@ repositories { } kotlin { - jvmToolchain(17) + jvmToolchain(21) } tasks.withType(Jar::class) { diff --git a/plugins/java-decompiler/engine/build.gradle.kts b/plugins/java-decompiler/engine/build.gradle.kts index 3800d8f1b18b..7005b6500970 100644 --- a/plugins/java-decompiler/engine/build.gradle.kts +++ b/plugins/java-decompiler/engine/build.gradle.kts @@ -5,8 +5,8 @@ plugins { } tasks.compileJava { - sourceCompatibility = "17" - targetCompatibility = "17" + sourceCompatibility = "21" + targetCompatibility = "21" } sourceSets { diff --git a/plugins/performanceTesting/commands-model/build.gradle b/plugins/performanceTesting/commands-model/build.gradle index 50055b70b62b..a7b4405eb62f 100644 --- a/plugins/performanceTesting/commands-model/build.gradle +++ b/plugins/performanceTesting/commands-model/build.gradle @@ -33,7 +33,7 @@ dependencies { } kotlin { - jvmToolchain(17) + jvmToolchain(21) } sourceSets { diff --git a/plugins/performanceTesting/event-bus/build.gradle b/plugins/performanceTesting/event-bus/build.gradle index c2ddef5ceb8c..72469a040732 100644 --- a/plugins/performanceTesting/event-bus/build.gradle +++ b/plugins/performanceTesting/event-bus/build.gradle @@ -52,7 +52,7 @@ dependencies { } kotlin { - jvmToolchain(17) + jvmToolchain(21) compileKotlin { kotlinOptions { freeCompilerArgs += "-opt-in=kotlin.time.ExperimentalTime" diff --git a/python/setup-test-environment/build.gradle.kts b/python/setup-test-environment/build.gradle.kts index c7cf38334e0d..741e326f00e8 100644 --- a/python/setup-test-environment/build.gradle.kts +++ b/python/setup-test-environment/build.gradle.kts @@ -12,7 +12,7 @@ plugins { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(21)) } }