From 5db9f589981f581fc452e6b983e9867bd3cc7a96 Mon Sep 17 00:00:00 2001 From: Andrey Cherkasov Date: Mon, 3 Aug 2026 02:35:24 +0400 Subject: [PATCH] [kotlin] KTIJ-38940 Update bundled JPS version to Kotlin 2.4.0 IJ-CR-214534 GitOrigin-RevId: 902b9b5f8a47d425822c732213418f2bbd753174 --- .idea/libraries/kotlinc_kotlin_dist.xml | 10 ++-- .../kotlinc_kotlin_jps_plugin_classpath.xml | 10 ++-- .../kotlinc_kotlin_jps_plugin_tests.xml | 10 ++-- lib/BUILD.bazel | 30 ++++++------ lib/MODULE.bazel | 46 +++++++++---------- plugins/kotlin/kotlin_test_dependencies.bzl | 10 ++-- .../resources/model.properties | 2 +- 7 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.idea/libraries/kotlinc_kotlin_dist.xml b/.idea/libraries/kotlinc_kotlin_dist.xml index 2907112c7461..d47cf4c70c06 100644 --- a/.idea/libraries/kotlinc_kotlin_dist.xml +++ b/.idea/libraries/kotlinc_kotlin_dist.xml @@ -1,18 +1,18 @@ - + - - 74eabb16163c4575b5dc4b2038268026f389849200f466870714342ccc3792d3 + + d12b996e50fe7b245a0a5045bac8c0bd5cbc227a792e44b41b0ae80e042c8490 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath.xml b/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath.xml index ab22e0a85d65..40a70fac9b40 100644 --- a/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath.xml +++ b/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath.xml @@ -1,18 +1,18 @@ - + - - 0d6103ec6a0eb9c36e856c04d3478099ab86437dd5f19a22a69d9e80b4cff2cb + + 80d785cfe4309db0246069b3313d11a119fe8ee38bd8b102bd8bb4978a1c61be - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_jps_plugin_tests.xml b/.idea/libraries/kotlinc_kotlin_jps_plugin_tests.xml index b942313c1aeb..d8bf5df538f2 100644 --- a/.idea/libraries/kotlinc_kotlin_jps_plugin_tests.xml +++ b/.idea/libraries/kotlinc_kotlin_jps_plugin_tests.xml @@ -1,18 +1,18 @@ - + - - fb351eeb8e11fae3096c43241611f686e8d1940d0f3b6ba6befe71ef908426ce + + fb292f37213201021a9c2ff5c4ea96a45796ce049d0974b78fdfe547810e0c68 - + - + \ No newline at end of file diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index c59749de4833..697835983d01 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -8404,17 +8404,17 @@ java_library( ) copy_file( - name = "org.jetbrains.kotlin/kotlin-dist-for-ide-2.3.20.jar_copy", - src = "@org_jetbrains_kotlin-kotlin-dist-for-ide-2_3_20_http//file", - out = "org.jetbrains.kotlin/kotlin-dist-for-ide-2.3.20.jar", + name = "org.jetbrains.kotlin/kotlin-dist-for-ide-2.4.0.jar_copy", + src = "@org_jetbrains_kotlin-kotlin-dist-for-ide-2_4_0_http//file", + out = "org.jetbrains.kotlin/kotlin-dist-for-ide-2.4.0.jar", allow_symlink = True, visibility = ["//visibility:public"], ) jvm_import( name = "kotlinc-kotlin-dist", - jar = "@org_jetbrains_kotlin-kotlin-dist-for-ide-2_3_20_http//file", - source_jar = "@org_jetbrains_kotlin-kotlin-dist-for-ide-2_3_20-sources_http//file", + jar = "@org_jetbrains_kotlin-kotlin-dist-for-ide-2_4_0_http//file", + source_jar = "@org_jetbrains_kotlin-kotlin-dist-for-ide-2_4_0-sources_http//file", visibility = ["//visibility:public"], ) @@ -8470,17 +8470,17 @@ java_library( ) copy_file( - name = "org.jetbrains.kotlin/kotlin-jps-plugin-classpath-2.3.20.jar_copy", - src = "@org_jetbrains_kotlin-kotlin-jps-plugin-classpath-2_3_20_http//file", - out = "org.jetbrains.kotlin/kotlin-jps-plugin-classpath-2.3.20.jar", + name = "org.jetbrains.kotlin/kotlin-jps-plugin-classpath-2.4.0.jar_copy", + src = "@org_jetbrains_kotlin-kotlin-jps-plugin-classpath-2_4_0_http//file", + out = "org.jetbrains.kotlin/kotlin-jps-plugin-classpath-2.4.0.jar", allow_symlink = True, visibility = ["//visibility:public"], ) jvm_import( name = "kotlinc-kotlin-jps-plugin-classpath", - jar = "@org_jetbrains_kotlin-kotlin-jps-plugin-classpath-2_3_20_http//file", - source_jar = "@org_jetbrains_kotlin-kotlin-jps-plugin-classpath-2_3_20-sources_http//file", + jar = "@org_jetbrains_kotlin-kotlin-jps-plugin-classpath-2_4_0_http//file", + source_jar = "@org_jetbrains_kotlin-kotlin-jps-plugin-classpath-2_4_0-sources_http//file", visibility = ["//visibility:public"], ) @@ -8514,17 +8514,17 @@ java_library( ) copy_file( - name = "org.jetbrains.kotlin/kotlin-jps-plugin-tests-for-ide-2.3.20.jar_copy", - src = "@org_jetbrains_kotlin-kotlin-jps-plugin-tests-for-ide-2_3_20_http//file", - out = "org.jetbrains.kotlin/kotlin-jps-plugin-tests-for-ide-2.3.20.jar", + name = "org.jetbrains.kotlin/kotlin-jps-plugin-tests-for-ide-2.4.0.jar_copy", + src = "@org_jetbrains_kotlin-kotlin-jps-plugin-tests-for-ide-2_4_0_http//file", + out = "org.jetbrains.kotlin/kotlin-jps-plugin-tests-for-ide-2.4.0.jar", allow_symlink = True, visibility = ["//visibility:public"], ) jvm_import( name = "kotlinc-kotlin-jps-plugin-tests", - jar = "@org_jetbrains_kotlin-kotlin-jps-plugin-tests-for-ide-2_3_20_http//file", - source_jar = "@org_jetbrains_kotlin-kotlin-jps-plugin-tests-for-ide-2_3_20-sources_http//file", + jar = "@org_jetbrains_kotlin-kotlin-jps-plugin-tests-for-ide-2_4_0_http//file", + source_jar = "@org_jetbrains_kotlin-kotlin-jps-plugin-tests-for-ide-2_4_0-sources_http//file", visibility = ["//visibility:public"], ) diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index 39b4513b8ef2..f0456b17ff2d 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -6581,17 +6581,17 @@ http_file( ) http_file( - name = "org_jetbrains_kotlin-kotlin-dist-for-ide-2_3_20_http", - downloaded_file_path = "kotlin-dist-for-ide-2.3.20.jar", - sha256 = "74eabb16163c4575b5dc4b2038268026f389849200f466870714342ccc3792d3", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-dist-for-ide/2.3.20/kotlin-dist-for-ide-2.3.20.jar", + name = "org_jetbrains_kotlin-kotlin-dist-for-ide-2_4_0_http", + downloaded_file_path = "kotlin-dist-for-ide-2.4.0.jar", + sha256 = "d12b996e50fe7b245a0a5045bac8c0bd5cbc227a792e44b41b0ae80e042c8490", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-dist-for-ide/2.4.0/kotlin-dist-for-ide-2.4.0.jar", ) http_file( - name = "org_jetbrains_kotlin-kotlin-dist-for-ide-2_3_20-sources_http", - downloaded_file_path = "kotlin-dist-for-ide-2.3.20-sources.jar", + name = "org_jetbrains_kotlin-kotlin-dist-for-ide-2_4_0-sources_http", + downloaded_file_path = "kotlin-dist-for-ide-2.4.0-sources.jar", sha256 = "c6deada2fac53b8ea6523dbda77597b128006674616f140f04df23264c6d1aa3", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-dist-for-ide/2.3.20/kotlin-dist-for-ide-2.3.20-sources.jar", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-dist-for-ide/2.4.0/kotlin-dist-for-ide-2.4.0-sources.jar", ) http_file( @@ -6623,17 +6623,17 @@ http_file( ) http_file( - name = "org_jetbrains_kotlin-kotlin-jps-plugin-classpath-2_3_20_http", - downloaded_file_path = "kotlin-jps-plugin-classpath-2.3.20.jar", - sha256 = "0d6103ec6a0eb9c36e856c04d3478099ab86437dd5f19a22a69d9e80b4cff2cb", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/2.3.20/kotlin-jps-plugin-classpath-2.3.20.jar", + name = "org_jetbrains_kotlin-kotlin-jps-plugin-classpath-2_4_0_http", + downloaded_file_path = "kotlin-jps-plugin-classpath-2.4.0.jar", + sha256 = "80d785cfe4309db0246069b3313d11a119fe8ee38bd8b102bd8bb4978a1c61be", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/2.4.0/kotlin-jps-plugin-classpath-2.4.0.jar", ) http_file( - name = "org_jetbrains_kotlin-kotlin-jps-plugin-classpath-2_3_20-sources_http", - downloaded_file_path = "kotlin-jps-plugin-classpath-2.3.20-sources.jar", - sha256 = "01ddaa5e0828f793753f9161edc7773862605fc32fa316f89cb8a98ad4af2fdc", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/2.3.20/kotlin-jps-plugin-classpath-2.3.20-sources.jar", + name = "org_jetbrains_kotlin-kotlin-jps-plugin-classpath-2_4_0-sources_http", + downloaded_file_path = "kotlin-jps-plugin-classpath-2.4.0-sources.jar", + sha256 = "c3f2d150f3501d2f818edd85934d4acb4ae26dcbd7c7ef10ae761489959a8113", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/2.4.0/kotlin-jps-plugin-classpath-2.4.0-sources.jar", ) http_file( @@ -6651,17 +6651,17 @@ http_file( ) http_file( - name = "org_jetbrains_kotlin-kotlin-jps-plugin-tests-for-ide-2_3_20_http", - downloaded_file_path = "kotlin-jps-plugin-tests-for-ide-2.3.20.jar", - sha256 = "fb351eeb8e11fae3096c43241611f686e8d1940d0f3b6ba6befe71ef908426ce", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/2.3.20/kotlin-jps-plugin-tests-for-ide-2.3.20.jar", + name = "org_jetbrains_kotlin-kotlin-jps-plugin-tests-for-ide-2_4_0_http", + downloaded_file_path = "kotlin-jps-plugin-tests-for-ide-2.4.0.jar", + sha256 = "fb292f37213201021a9c2ff5c4ea96a45796ce049d0974b78fdfe547810e0c68", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/2.4.0/kotlin-jps-plugin-tests-for-ide-2.4.0.jar", ) http_file( - name = "org_jetbrains_kotlin-kotlin-jps-plugin-tests-for-ide-2_3_20-sources_http", - downloaded_file_path = "kotlin-jps-plugin-tests-for-ide-2.3.20-sources.jar", - sha256 = "0be6017e4a37346df78c14ec9cd54805b52d5ad5a4be7789d085256b75b6e2b5", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/2.3.20/kotlin-jps-plugin-tests-for-ide-2.3.20-sources.jar", + name = "org_jetbrains_kotlin-kotlin-jps-plugin-tests-for-ide-2_4_0-sources_http", + downloaded_file_path = "kotlin-jps-plugin-tests-for-ide-2.4.0-sources.jar", + sha256 = "99e49e9216e89d6afffd0fa82bf84e4f004cf404132d117dbc25701f957042fa", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/2.4.0/kotlin-jps-plugin-tests-for-ide-2.4.0-sources.jar", ) http_file( diff --git a/plugins/kotlin/kotlin_test_dependencies.bzl b/plugins/kotlin/kotlin_test_dependencies.bzl index b13259db806f..830156f2d8d5 100644 --- a/plugins/kotlin/kotlin_test_dependencies.bzl +++ b/plugins/kotlin/kotlin_test_dependencies.bzl @@ -7,7 +7,7 @@ def download_file(name, url, sha256): _files.append(struct(name = name, url = url, sha256 = sha256)) kotlinCompilerCliVersion = "2.4.20-ij262-52" -kotlincKotlinJpsPluginTestsVersion = "2.3.20" +kotlincKotlinJpsPluginTestsVersion = "2.4.0" download_file( name = "kotlinx-serialization-core-1.7.1.jar", @@ -210,7 +210,7 @@ download_file( download_file( name = "js-ir-runtime-for-ide.klib", url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/js-ir-runtime-for-ide/{0}/js-ir-runtime-for-ide-{0}.klib".format(kotlincKotlinJpsPluginTestsVersion), - sha256 = "b67c578ddb29fb6520368735790b8afb4906cafaa2958d10b8d2ff38d1dbf0fb", + sha256 = "72cc3f7175c4c2c956c5b8b54484c6b7f41215d8cf21a1b8b1ace1df66e650c1", ) download_file( @@ -246,13 +246,13 @@ download_file( download_file( name = "kotlin-dist-for-ide-increment-compilation.jar", url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-dist-for-ide/{0}/kotlin-dist-for-ide-{0}.jar".format(kotlincKotlinJpsPluginTestsVersion), - sha256 = "74eabb16163c4575b5dc4b2038268026f389849200f466870714342ccc3792d3", + sha256 = "d12b996e50fe7b245a0a5045bac8c0bd5cbc227a792e44b41b0ae80e042c8490", ) download_file( name = "kotlin-dist-for-ide.jar", url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-dist-for-ide/{0}/kotlin-dist-for-ide-{0}.jar".format(kotlincKotlinJpsPluginTestsVersion), - sha256 = "74eabb16163c4575b5dc4b2038268026f389849200f466870714342ccc3792d3", + sha256 = "d12b996e50fe7b245a0a5045bac8c0bd5cbc227a792e44b41b0ae80e042c8490", ) download_file( @@ -264,7 +264,7 @@ download_file( download_file( name = "kotlin-jps-plugin-classpath.jar", url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/{0}/kotlin-jps-plugin-classpath-{0}.jar".format(kotlincKotlinJpsPluginTestsVersion), - sha256 = "0d6103ec6a0eb9c36e856c04d3478099ab86437dd5f19a22a69d9e80b4cff2cb", + sha256 = "80d785cfe4309db0246069b3313d11a119fe8ee38bd8b102bd8bb4978a1c61be", ) download_file( diff --git a/plugins/kotlin/util/project-model-updater/resources/model.properties b/plugins/kotlin/util/project-model-updater/resources/model.properties index a4efe682d863..c2a7577a848f 100644 --- a/plugins/kotlin/util/project-model-updater/resources/model.properties +++ b/plugins/kotlin/util/project-model-updater/resources/model.properties @@ -2,7 +2,7 @@ kotlincVersion=2.4.20-ij262-52 kotlincArtifactsMode=MAVEN -jpsPluginVersion=2.3.20 +jpsPluginVersion=2.4.0 jpsPluginArtifactsMode=MAVEN # The Kotlin Gradle Plugin version used for testing