diff --git a/jps/jps-builders/BUILD.bazel b/jps/jps-builders/BUILD.bazel index b2afd763871b..9ac54960a230 100644 --- a/jps/jps-builders/BUILD.bazel +++ b/jps/jps-builders/BUILD.bazel @@ -37,12 +37,12 @@ jvm_library( "//platform/runtime/repository", "//platform/util/zip", "@lib//:caffeine", - "@lib//:jetbrains-kotlinx-metadata-jvm", "@lib//:kotlin-stdlib-provided", "@lib//:hash4j", "@lib//:jetbrains-annotations", "@lib//:mvstore", "@lib//:netty-jps-provided", + "@lib//:kotlin-metadata", ], runtime_deps = [ ":build_resources", diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 5d0526fd95c5..d52804daef82 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -2666,13 +2666,6 @@ kt_jvm_import( srcjar = "@atomicfu-jvm-0_20_2-sources_http//file" ) -kt_jvm_import( - name = "jetbrains-kotlinx-metadata-jvm", - jar = "@kotlinx-metadata-jvm-0_8_0_http//file", - srcjar = "@kotlinx-metadata-jvm-0_8_0-sources_http//file", - visibility = ["//visibility:public"] -) - kt_jvm_import( name = "jetbrains-markdown", jar = "@markdown-jvm-0_7_2_http//file", @@ -3343,6 +3336,13 @@ kt_jvm_import( visibility = ["//visibility:public"] ) +kt_jvm_import( + name = "kotlin-metadata", + jar = "@kotlin-metadata-jvm-2_1_20-Beta1_http//file", + srcjar = "@kotlin-metadata-jvm-2_1_20-Beta1-sources_http//file", + visibility = ["//visibility:public"] +) + java_import( name = "kotlin-ml-completion-completion-ranking-kotlin", jars = ["@completion-ranking-kotlin-0_4_0_http//file"], @@ -8861,8 +8861,8 @@ java_import( java_import( name = "platform-jps-build-qdox-java-parser", - jars = ["@qdox-2_0_1_http//file"], - srcjar = "@qdox-2_0_1-sources_http//file", + jars = ["@qdox-2_2_0_http//file"], + srcjar = "@qdox-2_2_0-sources_http//file", visibility = ["//visibility:public"] ) diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index 0f46bf513785..740efac50db6 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -3653,20 +3653,6 @@ http_file( downloaded_file_path = "atomicfu-jvm-0.20.2-sources.jar" ) -http_file( - name = "kotlinx-metadata-jvm-0_8_0_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.8.0/kotlinx-metadata-jvm-0.8.0.jar", - sha256 = "6030de49e7fc2ca8009e1221213035694b97494044aa99bcfb0c8e0e73984d4d", - downloaded_file_path = "kotlinx-metadata-jvm-0.8.0.jar" -) - -http_file( - name = "kotlinx-metadata-jvm-0_8_0-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.8.0/kotlinx-metadata-jvm-0.8.0-sources.jar", - sha256 = "336ca3148e52b95541e42a7a22e14b859811449d2c16e7c4da9dea18bb04b379", - downloaded_file_path = "kotlinx-metadata-jvm-0.8.0-sources.jar" -) - http_file( name = "markdown-jvm-0_7_2_http", url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/markdown-jvm/0.7.2/markdown-jvm-0.7.2.jar", @@ -4591,6 +4577,20 @@ http_file( downloaded_file_path = "kotlin-gradle-plugin-idea-proto-1.9.20-dev-8162-sources.jar" ) +http_file( + name = "kotlin-metadata-jvm-2_1_20-Beta1_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-metadata-jvm/2.1.20-Beta1/kotlin-metadata-jvm-2.1.20-Beta1.jar", + sha256 = "243ac56352ce7e1ca7f294a53b1a1b3040ca12b95725449f0c04bbee6d43d84c", + downloaded_file_path = "kotlin-metadata-jvm-2.1.20-Beta1.jar" +) + +http_file( + name = "kotlin-metadata-jvm-2_1_20-Beta1-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-metadata-jvm/2.1.20-Beta1/kotlin-metadata-jvm-2.1.20-Beta1-sources.jar", + sha256 = "3f5468b5c409702c7cac30067208b7218ab9e3f7209e686966c6c2de2134dd18", + downloaded_file_path = "kotlin-metadata-jvm-2.1.20-Beta1-sources.jar" +) + http_file( name = "completion-ranking-kotlin-0_4_0_http", url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/intellij/deps/completion/completion-ranking-kotlin/0.4.0/completion-ranking-kotlin-0.4.0.jar", @@ -11172,17 +11172,17 @@ http_file( ) http_file( - name = "qdox-2_0_1_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/thoughtworks/qdox/qdox/2.0.1/qdox-2.0.1.jar", - sha256 = "c28db4602da9f3817a59de9be137c1f6083a9cb95fa1781f54eda75763a95c67", - downloaded_file_path = "qdox-2.0.1.jar" + name = "qdox-2_2_0_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/thoughtworks/qdox/qdox/2.2.0/qdox-2.2.0.jar", + sha256 = "c260c3230b2340af97d54bf01f7f67ebc57c901922736c881bb11cb981302be2", + downloaded_file_path = "qdox-2.2.0.jar" ) http_file( - name = "qdox-2_0_1-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/thoughtworks/qdox/qdox/2.0.1/qdox-2.0.1-sources.jar", - sha256 = "da6d95621104bd3573371fc791d999d5a9fe633d600c44e8e15320c8700d475b", - downloaded_file_path = "qdox-2.0.1-sources.jar" + name = "qdox-2_2_0-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/com/thoughtworks/qdox/qdox/2.2.0/qdox-2.2.0-sources.jar", + sha256 = "614806dd73810c80a4751daf28bffc5eb641d6026ee58c71f4a28354e06a7dc8", + downloaded_file_path = "qdox-2.2.0-sources.jar" ) http_file( diff --git a/platform/testFramework/junit5/eel/BUILD.bazel b/platform/testFramework/junit5/eel/BUILD.bazel index a76b7f0d0899..855c4814e293 100644 --- a/platform/testFramework/junit5/eel/BUILD.bazel +++ b/platform/testFramework/junit5/eel/BUILD.bazel @@ -1,11 +1,5 @@ ### auto-generated section `build intellij.platform.testFramework.junit5.eel` start -load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources", "jvm_test") - -jvm_resources( - name = "testFramework-junit5-eel_resources", - files = glob(["resources/**/*"]), - strip_prefix = "resources" -) +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_test") jvm_library( name = "testFramework-junit5-eel", @@ -13,23 +7,22 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True), deps = [ - "//platform/testFramework/junit5", - "//platform/eel", - "//platform/eel-provider", - "@lib//:kotlin-stdlib", "@lib//:jetbrains-annotations", - "//platform/core-api:core", - "//platform/util", - "//platform/util-ex", - "//platform/eel-impl", - "@lib//:kotlinx-coroutines-core", "@lib//:junit5", + "@lib//:junit5Jupiter", + "@lib//:kotlin-stdlib", + "@lib//:kotlinx-coroutines-core", + "//platform/core-api:core", "//platform/core-nio-fs", + "//platform/eel", + "//platform/eel-impl", + "//platform/eel-provider", "//platform/ide-core", "//platform/ide-core-impl", - "@lib//:junit5Jupiter", - ], - runtime_deps = [":testFramework-junit5-eel_resources"] + "//platform/testFramework/junit5", + "//platform/util", + "//platform/util-ex", + ] ) jvm_library( @@ -38,25 +31,24 @@ jvm_library( srcs = glob(["test/**/*.kt", "test/**/*.java"], allow_empty = True), associates = [":testFramework-junit5-eel"], deps = [ - "//platform/testFramework/junit5", - "//platform/testFramework/junit5:junit5_test_lib", - "//platform/eel", - "//platform/eel-provider", - "@lib//:kotlin-stdlib", "@lib//:jetbrains-annotations", - "//platform/core-api:core", - "//platform/util", - "//platform/util-ex", - "//platform/eel-impl", - "@lib//:kotlinx-coroutines-core", "@lib//:junit5", + "@lib//:junit5Jupiter", + "@lib//:kotlin-stdlib", + "@lib//:kotlinx-coroutines-core", "@lib//:junit5Params", + "//platform/core-api:core", "//platform/core-nio-fs", + "//platform/eel", + "//platform/eel-impl", + "//platform/eel-provider", "//platform/ide-core", "//platform/ide-core-impl", - "@lib//:junit5Jupiter", - ], - runtime_deps = [":testFramework-junit5-eel_resources"] + "//platform/testFramework/junit5", + "//platform/testFramework/junit5:junit5_test_lib", + "//platform/util", + "//platform/util-ex", + ] ) jvm_test( diff --git a/plugins/gradle/BUILD.bazel b/plugins/gradle/BUILD.bazel index c83ede8c508c..4af57e044429 100644 --- a/plugins/gradle/BUILD.bazel +++ b/plugins/gradle/BUILD.bazel @@ -107,6 +107,7 @@ jvm_library( "@lib//:jmock-junit4", "@lib//:jmock-legacy", "@lib//:mockito", + "@lib//:mockito-kotlin", "@lib//:junit4", "//plugins/gradle", "//plugins/gradle:gradle-common", diff --git a/plugins/kotlin/gradle/gradle-java/BUILD.bazel b/plugins/kotlin/gradle/gradle-java/BUILD.bazel index fe1eb7f63e39..f25afc7d6251 100644 --- a/plugins/kotlin/gradle/gradle-java/BUILD.bazel +++ b/plugins/kotlin/gradle/gradle-java/BUILD.bazel @@ -76,6 +76,7 @@ jvm_library( "//java/idea-ui:ui", "//java/execution/impl:java-execution-impl", "//java/compiler/impl:java-compiler-impl", + "//plugins/gradle", "//plugins/gradle/java", "//plugins/gradle/tooling-extension-impl:toolingExtension-impl", "//plugins/kotlin/project-wizard/core:kotlin-project-wizard-core", @@ -152,6 +153,7 @@ jvm_library( "//java/idea-ui:ui", "//java/execution/impl:java-execution-impl", "//java/compiler/impl:java-compiler-impl", + "//plugins/gradle", "//plugins/gradle/java", "//plugins/gradle/tooling-extension-impl:toolingExtension-impl", "@lib//:kotlin-test-junit",