From e465d1ac3d095ba9dae4239d453f7143fb757c7c Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 11 Feb 2025 10:25:23 +0100 Subject: [PATCH] update bazel files GitOrigin-RevId: 06d2aa1502e9c589453f8fb3d452ab7e9eaf0041 --- fleet/andel/BUILD.bazel | 1 + java/codeserver/core/BUILD.bazel | 12 +- java/codeserver/highlighting/BUILD.bazel | 1 + java/execution/impl/BUILD.bazel | 1 + java/java-tests/BUILD.bazel | 1 + lib/BUILD.bazel | 173 ++++++++-------- lib/MODULE.bazel | 186 ++++++++++-------- .../build/bazel/BazelBuildFileGenerator.kt | 19 +- .../org/jetbrains/intellij/build/bazel/dsl.kt | 10 +- .../BUILD.bazel | 41 +++- .../BUILD.bazel | 3 + .../kotlin.code-insight.k2/BUILD.bazel | 1 + plugins/kotlin/core/BUILD.bazel | 1 + .../gradle/multiplatform-tests/BUILD.bazel | 5 - plugins/markdown/compose/BUILD.bazel | 1 + 15 files changed, 256 insertions(+), 200 deletions(-) diff --git a/fleet/andel/BUILD.bazel b/fleet/andel/BUILD.bazel index bea39320e847..42348f4fea3f 100644 --- a/fleet/andel/BUILD.bazel +++ b/fleet/andel/BUILD.bazel @@ -14,6 +14,7 @@ jvm_library( "@lib//:fastutil-min", "@lib//:kotlinx-serialization-core", "@lib//:kotlinx-serialization-json", + "@lib//:de-cketti-unicode-kotlin-codepoints-jvm", ] ) ### auto-generated section `build fleet.andel` end \ No newline at end of file diff --git a/java/codeserver/core/BUILD.bazel b/java/codeserver/core/BUILD.bazel index d9094eb7f3e5..983fe6c43801 100644 --- a/java/codeserver/core/BUILD.bazel +++ b/java/codeserver/core/BUILD.bazel @@ -1,5 +1,11 @@ ### auto-generated section `build intellij.java.codeserver.core` start -load("@rules_jvm//:jvm.bzl", "jvm_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +jvm_resources( + name = "java-codeserver-core_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) jvm_library( name = "java-codeserver-core", @@ -17,6 +23,8 @@ jvm_library( "//java/java-frontback-psi-api:frontback-psi", "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", - ] + "//java/java-indexing-api:indexing", + ], + runtime_deps = [":java-codeserver-core_resources"] ) ### auto-generated section `build intellij.java.codeserver.core` end \ No newline at end of file diff --git a/java/codeserver/highlighting/BUILD.bazel b/java/codeserver/highlighting/BUILD.bazel index 78a141080a45..619b752805c8 100644 --- a/java/codeserver/highlighting/BUILD.bazel +++ b/java/codeserver/highlighting/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "@lib//:stream_ex", "//platform/util", "//platform/projectModel-api:projectModel", + "//platform/indexing-api:indexing", "//java/java-frontback-psi-api:frontback-psi", "//java/java-psi-api:psi", "//java/java-psi-impl:psi-impl", diff --git a/java/execution/impl/BUILD.bazel b/java/execution/impl/BUILD.bazel index e15abd2728a6..713e942a9f87 100644 --- a/java/execution/impl/BUILD.bazel +++ b/java/execution/impl/BUILD.bazel @@ -59,6 +59,7 @@ jvm_library( "//platform/threadDumpParser", "//platform/eel-provider", "//java/debugger/shared:java-debugger-impl-shared", + "//java/codeserver/core:java-codeserver-core", ], exports = [ "//java/execution/openapi:java-execution", diff --git a/java/java-tests/BUILD.bazel b/java/java-tests/BUILD.bazel index a82e3c32089e..c50485b84a51 100644 --- a/java/java-tests/BUILD.bazel +++ b/java/java-tests/BUILD.bazel @@ -117,6 +117,7 @@ jvm_library( "//platform/statistics/testFramework", "//platform/searchEverywhere/shared:searchEverywhere", "//platform/searchEverywhere/testFramework", + "//java/codeserver/highlighting:java-codeserver-highlighting", ], runtime_deps = [ "//community-resources:customization", diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 04d86a2aedc1..0104494f7139 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -157,93 +157,93 @@ java_import( kt_jvm_import( name = "ai-grazie-nlp-langs", - jar = "@nlp-langs-jvm-0_4_12_http//file", - srcjar = "@nlp-langs-jvm-0_4_12-sources_http//file", + jar = "@nlp-langs-jvm-0_4_16_http//file", + srcjar = "@nlp-langs-jvm-0_4_16-sources_http//file", visibility = ["//visibility:public"] ) java_library( name = "ai-grazie-spell-gec-engine-local", exports = [ - ":gec-spell-engine-local-jvm-0_4_12_http_import", - ":utils-common-jvm-0_4_12_http_import", - ":model-gec-jvm-0_4_12_http_import", - ":model-text-jvm-0_4_12_http_import", - ":model-common-jvm-0_4_12_http_import", - ":nlp-langs-jvm-0_4_12_http_import", - ":nlp-common-jvm-0_4_12_http_import", - ":nlp-patterns-jvm-0_4_12_http_import", - ":nlp-similarity-jvm-0_4_12_http_import", - ":nlp-phonetics-jvm-0_4_12_http_import", - ":nlp-tokenizer-jvm-0_4_12_http_import", + ":gec-spell-engine-local-jvm-0_4_16_http_import", + ":utils-common-jvm-0_4_16_http_import", + ":model-gec-jvm-0_4_16_http_import", + ":model-text-jvm-0_4_16_http_import", + ":model-common-jvm-0_4_16_http_import", + ":nlp-langs-jvm-0_4_16_http_import", + ":nlp-common-jvm-0_4_16_http_import", + ":nlp-patterns-jvm-0_4_16_http_import", + ":nlp-similarity-jvm-0_4_16_http_import", + ":nlp-phonetics-jvm-0_4_16_http_import", + ":nlp-tokenizer-jvm-0_4_16_http_import", ], visibility = ["//visibility:public"] ) kt_jvm_import( - name = "gec-spell-engine-local-jvm-0_4_12_http_import", - jar = "@gec-spell-engine-local-jvm-0_4_12_http//file", - srcjar = "@gec-spell-engine-local-jvm-0_4_12-sources_http//file" + name = "gec-spell-engine-local-jvm-0_4_16_http_import", + jar = "@gec-spell-engine-local-jvm-0_4_16_http//file", + srcjar = "@gec-spell-engine-local-jvm-0_4_16-sources_http//file" ) kt_jvm_import( - name = "utils-common-jvm-0_4_12_http_import", - jar = "@utils-common-jvm-0_4_12_http//file", - srcjar = "@utils-common-jvm-0_4_12-sources_http//file" + name = "utils-common-jvm-0_4_16_http_import", + jar = "@utils-common-jvm-0_4_16_http//file", + srcjar = "@utils-common-jvm-0_4_16-sources_http//file" ) kt_jvm_import( - name = "model-gec-jvm-0_4_12_http_import", - jar = "@model-gec-jvm-0_4_12_http//file", - srcjar = "@model-gec-jvm-0_4_12-sources_http//file" + name = "model-gec-jvm-0_4_16_http_import", + jar = "@model-gec-jvm-0_4_16_http//file", + srcjar = "@model-gec-jvm-0_4_16-sources_http//file" ) kt_jvm_import( - name = "model-text-jvm-0_4_12_http_import", - jar = "@model-text-jvm-0_4_12_http//file", - srcjar = "@model-text-jvm-0_4_12-sources_http//file" + name = "model-text-jvm-0_4_16_http_import", + jar = "@model-text-jvm-0_4_16_http//file", + srcjar = "@model-text-jvm-0_4_16-sources_http//file" ) kt_jvm_import( - name = "model-common-jvm-0_4_12_http_import", - jar = "@model-common-jvm-0_4_12_http//file", - srcjar = "@model-common-jvm-0_4_12-sources_http//file" + name = "model-common-jvm-0_4_16_http_import", + jar = "@model-common-jvm-0_4_16_http//file", + srcjar = "@model-common-jvm-0_4_16-sources_http//file" ) kt_jvm_import( - name = "nlp-langs-jvm-0_4_12_http_import", - jar = "@nlp-langs-jvm-0_4_12_http//file", - srcjar = "@nlp-langs-jvm-0_4_12-sources_http//file" + name = "nlp-langs-jvm-0_4_16_http_import", + jar = "@nlp-langs-jvm-0_4_16_http//file", + srcjar = "@nlp-langs-jvm-0_4_16-sources_http//file" ) kt_jvm_import( - name = "nlp-common-jvm-0_4_12_http_import", - jar = "@nlp-common-jvm-0_4_12_http//file", - srcjar = "@nlp-common-jvm-0_4_12-sources_http//file" + name = "nlp-common-jvm-0_4_16_http_import", + jar = "@nlp-common-jvm-0_4_16_http//file", + srcjar = "@nlp-common-jvm-0_4_16-sources_http//file" ) kt_jvm_import( - name = "nlp-patterns-jvm-0_4_12_http_import", - jar = "@nlp-patterns-jvm-0_4_12_http//file", - srcjar = "@nlp-patterns-jvm-0_4_12-sources_http//file" + name = "nlp-patterns-jvm-0_4_16_http_import", + jar = "@nlp-patterns-jvm-0_4_16_http//file", + srcjar = "@nlp-patterns-jvm-0_4_16-sources_http//file" ) kt_jvm_import( - name = "nlp-similarity-jvm-0_4_12_http_import", - jar = "@nlp-similarity-jvm-0_4_12_http//file", - srcjar = "@nlp-similarity-jvm-0_4_12-sources_http//file" + name = "nlp-similarity-jvm-0_4_16_http_import", + jar = "@nlp-similarity-jvm-0_4_16_http//file", + srcjar = "@nlp-similarity-jvm-0_4_16-sources_http//file" ) kt_jvm_import( - name = "nlp-phonetics-jvm-0_4_12_http_import", - jar = "@nlp-phonetics-jvm-0_4_12_http//file", - srcjar = "@nlp-phonetics-jvm-0_4_12-sources_http//file" + name = "nlp-phonetics-jvm-0_4_16_http_import", + jar = "@nlp-phonetics-jvm-0_4_16_http//file", + srcjar = "@nlp-phonetics-jvm-0_4_16-sources_http//file" ) kt_jvm_import( - name = "nlp-tokenizer-jvm-0_4_12_http_import", - jar = "@nlp-tokenizer-jvm-0_4_12_http//file", - srcjar = "@nlp-tokenizer-jvm-0_4_12-sources_http//file" + name = "nlp-tokenizer-jvm-0_4_16_http_import", + jar = "@nlp-tokenizer-jvm-0_4_16_http//file", + srcjar = "@nlp-tokenizer-jvm-0_4_16-sources_http//file" ) java_library( @@ -1298,6 +1298,13 @@ java_import( visibility = ["//visibility:public"] ) +kt_jvm_import( + name = "de-cketti-unicode-kotlin-codepoints-jvm", + jar = "@kotlin-codepoints-jvm-0_9_0_http//file", + srcjar = "@kotlin-codepoints-jvm-0_9_0-sources_http//file", + visibility = ["//visibility:public"] +) + kt_jvm_import( name = "devkit-runtime-module-repository-jps", jar = "@devkit-runtime-module-repository-jps-251_16369_http//file", @@ -1502,28 +1509,28 @@ java_import( java_library( name = "grazie-core-ai-grazie-nlp-detect", exports = [ - ":nlp-detect-jvm-0_4_12_http_import", - ":utils-common-jvm-0_4_12_http_import", - ":nlp-common-jvm-0_4_12_http_import", - ":model-text-jvm-0_4_12_http_import", - ":model-common-jvm-0_4_12_http_import", - ":nlp-patterns-jvm-0_4_12_http_import", - ":nlp-tokenizer-jvm-0_4_12_http_import", - ":nlp-similarity-jvm-0_4_12_http_import", - ":nlp-langs-jvm-0_4_12_http_import", + ":nlp-detect-jvm-0_4_16_http_import", + ":utils-common-jvm-0_4_16_http_import", + ":nlp-common-jvm-0_4_16_http_import", + ":model-text-jvm-0_4_16_http_import", + ":model-common-jvm-0_4_16_http_import", + ":nlp-patterns-jvm-0_4_16_http_import", + ":nlp-tokenizer-jvm-0_4_16_http_import", + ":nlp-similarity-jvm-0_4_16_http_import", + ":nlp-langs-jvm-0_4_16_http_import", ], visibility = ["//visibility:public"] ) kt_jvm_import( - name = "nlp-detect-jvm-0_4_12_http_import", - jar = "@nlp-detect-jvm-0_4_12_http//file", - srcjar = "@nlp-detect-jvm-0_4_12-sources_http//file" + name = "nlp-detect-jvm-0_4_16_http_import", + jar = "@nlp-detect-jvm-0_4_16_http//file", + srcjar = "@nlp-detect-jvm-0_4_16-sources_http//file" ) java_import( name = "grazie-core-ai-grazie-utils-lucene-lt-compatibility", - jars = ["@utils-lucene-lt-compatibility-0_4_12_http//file"], + jars = ["@utils-lucene-lt-compatibility-0_4_16_http//file"], visibility = ["//visibility:public"] ) @@ -8520,19 +8527,11 @@ java_import( visibility = ["//visibility:public"] ) -java_library( - name = "platform-jewel-markdown-extension-gfm_tables-commonmark-ext-gfm-tables", - exports = [ - ":commonmark-ext-gfm-tables-0_24_0_http_import", - ":commonmark-0_24_0_http_import", - ], - visibility = ["//visibility:public"] -) - java_import( - name = "commonmark-ext-gfm-tables-0_24_0_http_import", + name = "platform-jewel-markdown-extension-gfm_tables-commonmark-ext-gfm-tables", jars = ["@commonmark-ext-gfm-tables-0_24_0_http//file"], - srcjar = "@commonmark-ext-gfm-tables-0_24_0-sources_http//file" + srcjar = "@commonmark-ext-gfm-tables-0_24_0-sources_http//file", + visibility = ["//visibility:public"] ) java_import( @@ -9553,18 +9552,18 @@ java_import( java_library( name = "search_everywhere_ml-ai-grazie-emb", exports = [ - ":model-emb-jvm-0_4_12_http_import", - ":model-text-jvm-0_4_12_http_import", - ":model-common-jvm-0_4_12_http_import", - ":utils-common-jvm-0_4_12_http_import", + ":model-emb-jvm-0_4_16_http_import", + ":model-text-jvm-0_4_16_http_import", + ":model-common-jvm-0_4_16_http_import", + ":utils-common-jvm-0_4_16_http_import", ], visibility = ["//visibility:public"] ) kt_jvm_import( - name = "model-emb-jvm-0_4_12_http_import", - jar = "@model-emb-jvm-0_4_12_http//file", - srcjar = "@model-emb-jvm-0_4_12-sources_http//file" + name = "model-emb-jvm-0_4_16_http_import", + jar = "@model-emb-jvm-0_4_16_http//file", + srcjar = "@model-emb-jvm-0_4_16-sources_http//file" ) java_import( @@ -9668,15 +9667,15 @@ java_import( java_library( name = "spellchecker-ai-grazie-nlp-detect", exports = [ - ":nlp-detect-jvm-0_4_12_http_import", - ":utils-common-jvm-0_4_12_http_import", - ":nlp-common-jvm-0_4_12_http_import", - ":model-text-jvm-0_4_12_http_import", - ":model-common-jvm-0_4_12_http_import", - ":nlp-patterns-jvm-0_4_12_http_import", - ":nlp-tokenizer-jvm-0_4_12_http_import", - ":nlp-similarity-jvm-0_4_12_http_import", - ":nlp-langs-jvm-0_4_12_http_import", + ":nlp-detect-jvm-0_4_16_http_import", + ":utils-common-jvm-0_4_16_http_import", + ":nlp-common-jvm-0_4_16_http_import", + ":model-text-jvm-0_4_16_http_import", + ":model-common-jvm-0_4_16_http_import", + ":nlp-patterns-jvm-0_4_16_http_import", + ":nlp-tokenizer-jvm-0_4_16_http_import", + ":nlp-similarity-jvm-0_4_16_http_import", + ":nlp-langs-jvm-0_4_16_http_import", ], visibility = ["//visibility:public"] ) @@ -9690,7 +9689,7 @@ kt_jvm_import( java_import( name = "spellchecker-ai-grazie-utils-lucene-lt-compatibility", - jars = ["@utils-lucene-lt-compatibility-0_4_12_http//file"], + jars = ["@utils-lucene-lt-compatibility-0_4_16_http//file"], visibility = ["//visibility:public"] ) diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index 13987cc200bf..547fc2f9ea20 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -56,157 +56,157 @@ http_file( ) http_file( - name = "nlp-langs-jvm-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-langs-jvm/0.4.12/nlp-langs-jvm-0.4.12.jar", + name = "nlp-langs-jvm-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-langs-jvm/0.4.16/nlp-langs-jvm-0.4.16.jar", sha256 = "dd132003dfc893e046834ec15ec5104f067d7a90eb9786e85f49b4e47bac4561", - downloaded_file_path = "nlp-langs-jvm-0.4.12.jar" + downloaded_file_path = "nlp-langs-jvm-0.4.16.jar" ) http_file( - name = "nlp-langs-jvm-0_4_12-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-langs-jvm/0.4.12/nlp-langs-jvm-0.4.12-sources.jar", + name = "nlp-langs-jvm-0_4_16-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-langs-jvm/0.4.16/nlp-langs-jvm-0.4.16-sources.jar", sha256 = "938e124541ff8b96c06ac5c7ba5b0fbbaf1bb52d505e9cc569cf00f67f950357", - downloaded_file_path = "nlp-langs-jvm-0.4.12-sources.jar" + downloaded_file_path = "nlp-langs-jvm-0.4.16-sources.jar" ) http_file( - name = "gec-spell-engine-local-jvm-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/spell/gec-spell-engine-local-jvm/0.4.12/gec-spell-engine-local-jvm-0.4.12.jar", + name = "gec-spell-engine-local-jvm-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/spell/gec-spell-engine-local-jvm/0.4.16/gec-spell-engine-local-jvm-0.4.16.jar", sha256 = "ddb7e0eaddaddfb9ee27bb723614364818898a242189f36cfca7f8031a6ae383", - downloaded_file_path = "gec-spell-engine-local-jvm-0.4.12.jar" + downloaded_file_path = "gec-spell-engine-local-jvm-0.4.16.jar" ) http_file( - name = "utils-common-jvm-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/utils/utils-common-jvm/0.4.12/utils-common-jvm-0.4.12.jar", + name = "utils-common-jvm-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/utils/utils-common-jvm/0.4.16/utils-common-jvm-0.4.16.jar", sha256 = "1721b8bb4a7dbcbc34da8cec18100f03b72c8c06d4e945622c1a24b720981b73", - downloaded_file_path = "utils-common-jvm-0.4.12.jar" + downloaded_file_path = "utils-common-jvm-0.4.16.jar" ) http_file( - name = "model-gec-jvm-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-gec-jvm/0.4.12/model-gec-jvm-0.4.12.jar", + name = "model-gec-jvm-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-gec-jvm/0.4.16/model-gec-jvm-0.4.16.jar", sha256 = "554347aa33621257891e492a2e315c9e93a6d0ac57a3b7e5bb9f8d35bc071da5", - downloaded_file_path = "model-gec-jvm-0.4.12.jar" + downloaded_file_path = "model-gec-jvm-0.4.16.jar" ) http_file( - name = "model-text-jvm-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-text-jvm/0.4.12/model-text-jvm-0.4.12.jar", + name = "model-text-jvm-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-text-jvm/0.4.16/model-text-jvm-0.4.16.jar", sha256 = "fac290bca4ef5ac2084e35dcb1663d5725de799d51333359931f542690672d7b", - downloaded_file_path = "model-text-jvm-0.4.12.jar" + downloaded_file_path = "model-text-jvm-0.4.16.jar" ) http_file( - name = "model-common-jvm-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-common-jvm/0.4.12/model-common-jvm-0.4.12.jar", + name = "model-common-jvm-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-common-jvm/0.4.16/model-common-jvm-0.4.16.jar", sha256 = "58339397d3350db6c549a5ebee98b9611693c187fa2311b18aa849e27067c438", - downloaded_file_path = "model-common-jvm-0.4.12.jar" + downloaded_file_path = "model-common-jvm-0.4.16.jar" ) http_file( - name = "nlp-common-jvm-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-common-jvm/0.4.12/nlp-common-jvm-0.4.12.jar", + name = "nlp-common-jvm-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-common-jvm/0.4.16/nlp-common-jvm-0.4.16.jar", sha256 = "d1c17c4dbb3f5f43b6e3cfc30a319d1a050aa5425ab0ce27b802b90f114a649e", - downloaded_file_path = "nlp-common-jvm-0.4.12.jar" + downloaded_file_path = "nlp-common-jvm-0.4.16.jar" ) http_file( - name = "nlp-patterns-jvm-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-patterns-jvm/0.4.12/nlp-patterns-jvm-0.4.12.jar", - sha256 = "8b9382985b7beb5313307564a5720809e12a909799ae3e8ddc3ec6c27ef614c2", - downloaded_file_path = "nlp-patterns-jvm-0.4.12.jar" + name = "nlp-patterns-jvm-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-patterns-jvm/0.4.16/nlp-patterns-jvm-0.4.16.jar", + sha256 = "add762a914bd20ca21ea25b43f24627f902b687514ddce9ba28916bb20e8066e", + downloaded_file_path = "nlp-patterns-jvm-0.4.16.jar" ) http_file( - name = "nlp-similarity-jvm-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-similarity-jvm/0.4.12/nlp-similarity-jvm-0.4.12.jar", + name = "nlp-similarity-jvm-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-similarity-jvm/0.4.16/nlp-similarity-jvm-0.4.16.jar", sha256 = "79a42758913de07c1ebeb851a4a70236309ea12dcb64d1db7ea007618593470f", - downloaded_file_path = "nlp-similarity-jvm-0.4.12.jar" + downloaded_file_path = "nlp-similarity-jvm-0.4.16.jar" ) http_file( - name = "nlp-phonetics-jvm-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-phonetics-jvm/0.4.12/nlp-phonetics-jvm-0.4.12.jar", + name = "nlp-phonetics-jvm-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-phonetics-jvm/0.4.16/nlp-phonetics-jvm-0.4.16.jar", sha256 = "35479690a543b83528932122a18a476902673caa591bbeb580564eb09fbfdf62", - downloaded_file_path = "nlp-phonetics-jvm-0.4.12.jar" + downloaded_file_path = "nlp-phonetics-jvm-0.4.16.jar" ) http_file( - name = "nlp-tokenizer-jvm-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-tokenizer-jvm/0.4.12/nlp-tokenizer-jvm-0.4.12.jar", - sha256 = "88f25d8b3b2b2806be3a545d1d0ffc2a2a27c971b6f59fed5539f52a8d23946c", - downloaded_file_path = "nlp-tokenizer-jvm-0.4.12.jar" + name = "nlp-tokenizer-jvm-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-tokenizer-jvm/0.4.16/nlp-tokenizer-jvm-0.4.16.jar", + sha256 = "fcc839a317aba9e165c4d061e0f266dcebf32c7ceee9cb5571144cd1db60d63d", + downloaded_file_path = "nlp-tokenizer-jvm-0.4.16.jar" ) http_file( - name = "gec-spell-engine-local-jvm-0_4_12-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/spell/gec-spell-engine-local-jvm/0.4.12/gec-spell-engine-local-jvm-0.4.12-sources.jar", + name = "gec-spell-engine-local-jvm-0_4_16-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/spell/gec-spell-engine-local-jvm/0.4.16/gec-spell-engine-local-jvm-0.4.16-sources.jar", sha256 = "3f496cd5e1b64a489a5fee39ff21946c3fd1000c7e148d96079900a46adca86a", - downloaded_file_path = "gec-spell-engine-local-jvm-0.4.12-sources.jar" + downloaded_file_path = "gec-spell-engine-local-jvm-0.4.16-sources.jar" ) http_file( - name = "utils-common-jvm-0_4_12-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/utils/utils-common-jvm/0.4.12/utils-common-jvm-0.4.12-sources.jar", + name = "utils-common-jvm-0_4_16-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/utils/utils-common-jvm/0.4.16/utils-common-jvm-0.4.16-sources.jar", sha256 = "6b9848b98c08ff6aae33cfc9b7d6e4740597bb0407b0321ee0259933f8143fc4", - downloaded_file_path = "utils-common-jvm-0.4.12-sources.jar" + downloaded_file_path = "utils-common-jvm-0.4.16-sources.jar" ) http_file( - name = "model-gec-jvm-0_4_12-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-gec-jvm/0.4.12/model-gec-jvm-0.4.12-sources.jar", + name = "model-gec-jvm-0_4_16-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-gec-jvm/0.4.16/model-gec-jvm-0.4.16-sources.jar", sha256 = "4082a8b238ccb35a2d0d9d301ec36821e8f5a0cd7075fac36b799ffdecea0fec", - downloaded_file_path = "model-gec-jvm-0.4.12-sources.jar" + downloaded_file_path = "model-gec-jvm-0.4.16-sources.jar" ) http_file( - name = "model-text-jvm-0_4_12-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-text-jvm/0.4.12/model-text-jvm-0.4.12-sources.jar", + name = "model-text-jvm-0_4_16-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-text-jvm/0.4.16/model-text-jvm-0.4.16-sources.jar", sha256 = "1d295289029f89772c26691391f832fff6d14c43d0dec2827574062f337ccb96", - downloaded_file_path = "model-text-jvm-0.4.12-sources.jar" + downloaded_file_path = "model-text-jvm-0.4.16-sources.jar" ) http_file( - name = "model-common-jvm-0_4_12-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-common-jvm/0.4.12/model-common-jvm-0.4.12-sources.jar", + name = "model-common-jvm-0_4_16-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-common-jvm/0.4.16/model-common-jvm-0.4.16-sources.jar", sha256 = "399492704d1ba976cd7bbdbc01766bd2e1bc74771b42fa643115ca9e96197e92", - downloaded_file_path = "model-common-jvm-0.4.12-sources.jar" + downloaded_file_path = "model-common-jvm-0.4.16-sources.jar" ) http_file( - name = "nlp-common-jvm-0_4_12-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-common-jvm/0.4.12/nlp-common-jvm-0.4.12-sources.jar", + name = "nlp-common-jvm-0_4_16-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-common-jvm/0.4.16/nlp-common-jvm-0.4.16-sources.jar", sha256 = "876fd7ee1bd84c1cc691f3e972955a329f94fb8e628725e8650daaa893293086", - downloaded_file_path = "nlp-common-jvm-0.4.12-sources.jar" + downloaded_file_path = "nlp-common-jvm-0.4.16-sources.jar" ) http_file( - name = "nlp-patterns-jvm-0_4_12-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-patterns-jvm/0.4.12/nlp-patterns-jvm-0.4.12-sources.jar", - sha256 = "f21db0ad659d01e686c482b3d7248afd1828d440a069c7209c36cb3cf69bac81", - downloaded_file_path = "nlp-patterns-jvm-0.4.12-sources.jar" + name = "nlp-patterns-jvm-0_4_16-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-patterns-jvm/0.4.16/nlp-patterns-jvm-0.4.16-sources.jar", + sha256 = "032d35869bd3f07ac8797f3c5f1558f616a0579db610387f226a6764794e64fc", + downloaded_file_path = "nlp-patterns-jvm-0.4.16-sources.jar" ) http_file( - name = "nlp-similarity-jvm-0_4_12-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-similarity-jvm/0.4.12/nlp-similarity-jvm-0.4.12-sources.jar", + name = "nlp-similarity-jvm-0_4_16-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-similarity-jvm/0.4.16/nlp-similarity-jvm-0.4.16-sources.jar", sha256 = "39ca32f09b5b2819c50d30e75564ee324c13d8b609fd97f479a25be2787fbb7f", - downloaded_file_path = "nlp-similarity-jvm-0.4.12-sources.jar" + downloaded_file_path = "nlp-similarity-jvm-0.4.16-sources.jar" ) http_file( - name = "nlp-phonetics-jvm-0_4_12-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-phonetics-jvm/0.4.12/nlp-phonetics-jvm-0.4.12-sources.jar", + name = "nlp-phonetics-jvm-0_4_16-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-phonetics-jvm/0.4.16/nlp-phonetics-jvm-0.4.16-sources.jar", sha256 = "2e6f381ad9c1bc7eddd1f084d0393fc4bca1ebf3db5557474f926d7776791d96", - downloaded_file_path = "nlp-phonetics-jvm-0.4.12-sources.jar" + downloaded_file_path = "nlp-phonetics-jvm-0.4.16-sources.jar" ) http_file( - name = "nlp-tokenizer-jvm-0_4_12-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-tokenizer-jvm/0.4.12/nlp-tokenizer-jvm-0.4.12-sources.jar", - sha256 = "ddfdd5bdc079ba7364e72f86d6d9c747f0e5c44c8fd86133fa8dc9259e78fdc4", - downloaded_file_path = "nlp-tokenizer-jvm-0.4.12-sources.jar" + name = "nlp-tokenizer-jvm-0_4_16-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-tokenizer-jvm/0.4.16/nlp-tokenizer-jvm-0.4.16-sources.jar", + sha256 = "95d3dac2a3f159d61d148b3f50fde2517170ffe8b5d90b317da65b4b47883d4b", + downloaded_file_path = "nlp-tokenizer-jvm-0.4.16-sources.jar" ) http_file( @@ -1560,6 +1560,20 @@ http_file( downloaded_file_path = "cucumber-jvm-deps-1.0.5-sources.jar" ) +http_file( + name = "kotlin-codepoints-jvm-0_9_0_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/de/cketti/unicode/kotlin-codepoints-jvm/0.9.0/kotlin-codepoints-jvm-0.9.0.jar", + sha256 = "d642f145f6123739e779d4156145cc5fe7c2173bb58d437b813961a31c337ff9", + downloaded_file_path = "kotlin-codepoints-jvm-0.9.0.jar" +) + +http_file( + name = "kotlin-codepoints-jvm-0_9_0-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/de/cketti/unicode/kotlin-codepoints-jvm/0.9.0/kotlin-codepoints-jvm-0.9.0-sources.jar", + sha256 = "713ed1a4bf439eda3a304bce8a713380fc60221dbd34c49bcda0999f4cdf6937", + downloaded_file_path = "kotlin-codepoints-jvm-0.9.0-sources.jar" +) + http_file( name = "devkit-runtime-module-repository-jps-251_16369_http", url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/intellij/devkit/devkit-runtime-module-repository-jps/251.16369/devkit-runtime-module-repository-jps-251.16369.jar", @@ -1883,24 +1897,24 @@ http_file( ) http_file( - name = "nlp-detect-jvm-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-detect-jvm/0.4.12/nlp-detect-jvm-0.4.12.jar", + name = "nlp-detect-jvm-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-detect-jvm/0.4.16/nlp-detect-jvm-0.4.16.jar", sha256 = "5f28a3687f814c10cef0e3a733295ba26732d06242bad4f5e991c802c30169f7", - downloaded_file_path = "nlp-detect-jvm-0.4.12.jar" + downloaded_file_path = "nlp-detect-jvm-0.4.16.jar" ) http_file( - name = "nlp-detect-jvm-0_4_12-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-detect-jvm/0.4.12/nlp-detect-jvm-0.4.12-sources.jar", + name = "nlp-detect-jvm-0_4_16-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/nlp/nlp-detect-jvm/0.4.16/nlp-detect-jvm-0.4.16-sources.jar", sha256 = "e092fde72b3221ef6822281895df4e20c20061fa3c5441ff336fc2dd01964890", - downloaded_file_path = "nlp-detect-jvm-0.4.12-sources.jar" + downloaded_file_path = "nlp-detect-jvm-0.4.16-sources.jar" ) http_file( - name = "utils-lucene-lt-compatibility-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/utils/utils-lucene-lt-compatibility/0.4.12/utils-lucene-lt-compatibility-0.4.12.jar", - sha256 = "5db9cc68ebfe9c8141179e012f196a0a0968dae9b6ca92dc4a8f13bdbacadaef", - downloaded_file_path = "utils-lucene-lt-compatibility-0.4.12.jar" + name = "utils-lucene-lt-compatibility-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/utils/utils-lucene-lt-compatibility/0.4.16/utils-lucene-lt-compatibility-0.4.16.jar", + sha256 = "c9f992502b804b28381d5b194f855280e69b8866c292a1449589ad389f1c05a9", + downloaded_file_path = "utils-lucene-lt-compatibility-0.4.16.jar" ) http_file( @@ -12173,17 +12187,17 @@ http_file( ) http_file( - name = "model-emb-jvm-0_4_12_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-emb-jvm/0.4.12/model-emb-jvm-0.4.12.jar", + name = "model-emb-jvm-0_4_16_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-emb-jvm/0.4.16/model-emb-jvm-0.4.16.jar", sha256 = "41a39ea18d934827d293a918e144042ae65c0974892c0330add0a52c366c2709", - downloaded_file_path = "model-emb-jvm-0.4.12.jar" + downloaded_file_path = "model-emb-jvm-0.4.16.jar" ) http_file( - name = "model-emb-jvm-0_4_12-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-emb-jvm/0.4.12/model-emb-jvm-0.4.12-sources.jar", + name = "model-emb-jvm-0_4_16-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/model/model-emb-jvm/0.4.16/model-emb-jvm-0.4.16-sources.jar", sha256 = "a100aed816cece4d912092b7ca2e876e7a20b40286cdb7916e8b541eeb210c82", - downloaded_file_path = "model-emb-jvm-0.4.12-sources.jar" + downloaded_file_path = "model-emb-jvm-0.4.16-sources.jar" ) http_file( diff --git a/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt b/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt index d54ca2c8aa8d..b681533fd73d 100644 --- a/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt +++ b/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt @@ -218,21 +218,20 @@ internal class BazelBuildFileGenerator( } fun generateModuleBuildFiles(list: ModuleList, isCommunity: Boolean): Map { - val fileToUpdater = HashMap() + val fileToUpdater = LinkedHashMap>() for (module in (if (isCommunity) list.community else list.ultimate)) { if (generated.putIfAbsent(module, true) == null) { - val fileUpdater = fileToUpdater.computeIfAbsent(module.bazelBuildFileDir) { + val (fileUpdater, buildFile) = fileToUpdater.computeIfAbsent(module.bazelBuildFileDir) { val fileUpdater = BazelFileUpdater(module.bazelBuildFileDir.resolve("BUILD.bazel")) fileUpdater.removeSections("build") fileUpdater.removeSections("maven libs of ") - fileUpdater - } - buildFile(out = fileUpdater, sectionName = "build ${module.module.name}") { - generateBazelBuildFile(module, list) + fileUpdater to BuildFile() } + fileUpdater.insertAutoGeneratedSection(sectionName = "build ${module.module.name}", autoGeneratedContent = buildFile.apply { generateBazelBuildFile(module, list) }.render()) + buildFile.reset() } } - return fileToUpdater + return fileToUpdater.mapValues { it.value.first } } fun save(fileToUpdater: Map) { @@ -652,11 +651,9 @@ private fun computeKotlincOptions(buildFile: BuildFile, module: ModuleDescriptor buildFile.load((if (module.isCommunity) "" else "@community") + "//build:compiler-options.bzl", "create_kotlinc_options") var kotlincOptionsName = "custom" - val badModulePrefix = "intellij.rider.plugins." - if (module.module.name.startsWith(badModulePrefix)) { - kotlincOptionsName += "-${module.module.name.removePrefix(badModulePrefix).replace('.', '-')}" + if (!buildFile.nameGuard.add(kotlincOptionsName)) { + kotlincOptionsName = "custom_" + module.targetName } - buildFile.target("create_kotlinc_options") { option("name", kotlincOptionsName) option("jvm_target", jvmTarget.toInt()) diff --git a/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/dsl.kt b/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/dsl.kt index 5fe78c6f8ae5..3a2b88f3729a 100644 --- a/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/dsl.kt +++ b/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/dsl.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.intellij.build.bazel internal inline fun buildFile(out: BazelFileUpdater, sectionName: String, block: BuildFile.() -> Unit) { @@ -14,6 +14,8 @@ internal class BuildFile { private val targets = mutableListOf() private val lines = mutableListOf() + @JvmField val nameGuard = HashSet() + fun load(bzlFile: String, vararg symbols: String) { val existing = loads.firstOrNull { it.bzlFile == bzlFile } if (existing == null) { @@ -39,6 +41,12 @@ internal class BuildFile { .filter { it.isNotEmpty() } .joinToString("\n\n") } + + fun reset() { + loads.clear() + targets.clear() + lines.clear() + } } // Class to represent a load statement diff --git a/plugins/compose/intellij.compose.ide.plugin.k2/BUILD.bazel b/plugins/compose/intellij.compose.ide.plugin.k2/BUILD.bazel index 43ad4df5f882..993c5c631425 100644 --- a/plugins/compose/intellij.compose.ide.plugin.k2/BUILD.bazel +++ b/plugins/compose/intellij.compose.ide.plugin.k2/BUILD.bazel @@ -1,6 +1,12 @@ ### auto-generated section `build intellij.compose.ide.plugin.k2` start -load("@rules_java//java:defs.bzl", "java_library") -load("@rules_jvm//:jvm.bzl", "jvm_resources") +load("//build:compiler-options.bzl", "create_kotlinc_options") +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +create_kotlinc_options( + name = "custom", + jvm_target = 17, + context_receivers = True +) jvm_resources( name = "ide-plugin-k2_resources", @@ -8,24 +14,40 @@ jvm_resources( strip_prefix = "resources" ) -java_library( +jvm_library( name = "ide-plugin-k2", + module_name = "intellij.compose.ide.plugin.k2", visibility = ["//visibility:public"], - runtime_deps = [ - ":ide-plugin-k2_resources", + srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True), + kotlinc_opts = ":custom", + deps = [ "@lib//:kotlin-stdlib", "//plugins/compose/intellij.compose.ide.plugin.shared:ide-plugin-shared", - ] + "//plugins/kotlin/highlighting/highlighting-k2:kotlin-highlighting-k2", + "//platform/analysis-impl", + "@lib//:kotlinc-kotlin-compiler-common-provided", + "@lib//:kotlinc-analysis-api-provided", + ], + runtime_deps = [":ide-plugin-k2_resources"] ) ### auto-generated section `build intellij.compose.ide.plugin.k2` end ### auto-generated section `build intellij.compose.ide.plugin.k2.tests` start +load("//build:compiler-options.bzl", "create_kotlinc_options") load("@rules_java//java:defs.bzl", "java_library") load("@rules_jvm//:jvm.bzl", "jvm_test") +create_kotlinc_options( + name = "custom_ide-plugin-k2-tests", + jvm_target = 17, + context_receivers = True +) + jvm_test( name = "ide-plugin-k2-tests_test", srcs = glob(["tests/**/*.kt", "tests/**/*.java"], allow_empty = True), + kotlinc_opts = ":custom_ide-plugin-k2-tests", + associates = ["//plugins/compose/intellij.compose.ide.plugin.k2:ide-plugin-k2"], deps = [ "//plugins/compose/intellij.compose.ide.plugin.shared:ide-plugin-shared-tests_test_lib", "//plugins/kotlin/base/test:kotlin-base-test_test_lib", @@ -34,10 +56,13 @@ jvm_test( "//plugins/kotlin/plugin/k2:kotlin-plugin-k2", "//plugins/kotlin/tests-common:tests-common_test_lib", "//plugins/kotlin/test-framework:test-framework_test_lib", + "//plugins/kotlin/highlighting/highlighting-k2:kotlin-highlighting-k2", + "//plugins/kotlin/highlighting/highlighting-k2:kotlin-highlighting-k2_test_lib", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//platform/testFramework/core", - ], - runtime_deps = ["//plugins/compose/intellij.compose.ide.plugin.k2:ide-plugin-k2"] + "@lib//:kotlinc-kotlin-compiler-common-provided", + "@lib//:kotlinc-analysis-api-provided", + ] ) ### auto-generated section `build intellij.compose.ide.plugin.k2.tests` end \ No newline at end of file diff --git a/plugins/compose/intellij.compose.ide.plugin.shared/BUILD.bazel b/plugins/compose/intellij.compose.ide.plugin.shared/BUILD.bazel index f58fc34982cf..130d224dff99 100644 --- a/plugins/compose/intellij.compose.ide.plugin.shared/BUILD.bazel +++ b/plugins/compose/intellij.compose.ide.plugin.shared/BUILD.bazel @@ -15,9 +15,11 @@ jvm_library( deps = [ "//plugins/compose:compose-ide-plugin", "//platform/analysis-api:analysis", + "//platform/analysis-impl", "//platform/core-api:core", "//platform/core-impl", "//platform/lang-api:lang", + "//platform/projectModel-impl", "//platform/util", "//plugins/kotlin/base/indices:kotlin-base-indices", "@lib//:kotlinc-kotlin-compiler-common-provided", @@ -49,6 +51,7 @@ jvm_library( "//plugins/kotlin/base/test:kotlin-base-test_test_lib", "//plugins/kotlin/base/plugin:kotlin-base-plugin", "//plugins/kotlin/base/plugin:kotlin-base-plugin_test_lib", + "//plugins/kotlin/base/indices:kotlin-base-indices", "//plugins/kotlin/tests-common:tests-common_test_lib", "//plugins/kotlin/test-framework:test-framework_test_lib", "@lib//:kotlinc-kotlin-compiler-common", diff --git a/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel b/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel index 2ea9cbc2e53f..1ce2e9812840 100644 --- a/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel +++ b/plugins/kotlin/code-insight/kotlin.code-insight.k2/BUILD.bazel @@ -141,6 +141,7 @@ jvm_library( "//plugins/kotlin/base/test:kotlin-base-test_test_lib", "//java/testFramework", "//plugins/kotlin/base/statistics:kotlin-base-statistics", + "//plugins/kotlin/bundled-compiler-plugins-support", ], runtime_deps = [":kotlin-code-insight-k2_resources"] ) diff --git a/plugins/kotlin/core/BUILD.bazel b/plugins/kotlin/core/BUILD.bazel index 71b02254cca8..d0bb86e350b8 100644 --- a/plugins/kotlin/core/BUILD.bazel +++ b/plugins/kotlin/core/BUILD.bazel @@ -61,6 +61,7 @@ jvm_library( "//platform/workspace/storage", "//plugins/kotlin/code-insight/api:kotlin-code-insight-api", "//plugins/kotlin/refactorings/kotlin.refactorings.common:kotlin-refactorings-common", + "//java/codeserver/core:java-codeserver-core", ] ) ### auto-generated section `build kotlin.core` end \ No newline at end of file diff --git a/plugins/kotlin/gradle/multiplatform-tests/BUILD.bazel b/plugins/kotlin/gradle/multiplatform-tests/BUILD.bazel index 16fcf3e538d9..e3164c0cd57e 100644 --- a/plugins/kotlin/gradle/multiplatform-tests/BUILD.bazel +++ b/plugins/kotlin/gradle/multiplatform-tests/BUILD.bazel @@ -8,7 +8,6 @@ jvm_test( deps = [ "@lib//:junit4", "@lib//:kotlinc-kotlin-jps-common", - "//plugins/kotlin/plugin/k1:kotlin-plugin-k1", "//plugins/kotlin/base/util:kotlin-base-util", "//plugins/kotlin/base/util:kotlin-base-util_test_lib", "//plugins/kotlin/base/plugin:kotlin-base-plugin", @@ -16,12 +15,10 @@ jvm_test( "//plugins/kotlin/base/facet:kotlin-base-facet", "//java/testFramework", "//plugins/kotlin/base/analysis:kotlin-base-analysis", - "//plugins/kotlin/core", "//plugins/kotlin/base/test:kotlin-base-test_test_lib", "//plugins/kotlin/tests-common:tests-common_test_lib", "//platform/external-system-impl:externalSystem-tests_test_lib", "//plugins/kotlin/test-framework:test-framework_test_lib", - "//plugins/kotlin/frontend-independent:fir-frontend-independent", "//plugins/gradle/java", "//plugins/gradle:gradle-tests_test_lib", "//plugins/kotlin/gradle/gradle-tooling/impl:kotlin-gradle-gradle-tooling-impl", @@ -30,14 +27,12 @@ jvm_test( "//android/android:core", "//plugins/kotlin/compiler-plugins/lombok/gradle:kotlin-compiler-plugins-lombok-gradle", "@lib//:kotlinc-kotlin-compiler-common", - "@lib//:kotlinc-kotlin-compiler-fe10", "@lib//:kotlin-tooling-core", "@lib//:kotlin-test", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "@lib//:kotlin-test-junit", "//plugins/kotlin/base/project-model:kotlin-base-project-model", - "//plugins/kotlin/project-configuration", "@lib//:kotlinc-kotlin-compiler-tests", "//android/android-plugin:plugin", "//android/android-plugin:plugin_test_lib", diff --git a/plugins/markdown/compose/BUILD.bazel b/plugins/markdown/compose/BUILD.bazel index a35ba41f2c46..d3d030bd82cb 100644 --- a/plugins/markdown/compose/BUILD.bazel +++ b/plugins/markdown/compose/BUILD.bazel @@ -22,6 +22,7 @@ jvm_library( "//platform/util:util-ui", "//platform/platform-api:ide", "//platform/jewel/markdown/ide-laf-bridge-styling:jewel-markdown-ideLafBridgeStyling", + "//platform/jewel/markdown/extension/gfm-tables:jewel-markdown-extension-gfmTables", ], runtime_deps = [":compose-preview_resources"], plugins = ["@lib//:compose-plugin"]