From 83f7379ed8fedc2de438f037964281f8f733e277 Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Tue, 24 Sep 2024 12:12:38 +0200 Subject: [PATCH] chore: Support Jetbrains IDEs 243 - add dependency on optentest4j It has been dropped from the platform --- MODULE.bazel | 4 +++- base/BUILD | 1 + gazelle/BUILD | 1 + golang/BUILD | 1 + ijwb/BUILD | 1 + java/BUILD | 2 ++ javascript/BUILD | 1 + kotlin/BUILD | 1 + maven_install.json | 14 ++++++++++++-- plugin_dev/BUILD | 1 + scala/BUILD | 1 + 11 files changed, 25 insertions(+), 3 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 19e8d36a9bb..b8d4afd7a38 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -79,6 +79,7 @@ maven.install( name = "maven", artifacts = [ "junit:junit:4.13.2", + "org.opentest4j:opentest4j:1.3.0", "org.mockito:mockito-core:5.8.0", "org.objenesis:objenesis:3.3", "net.bytebuddy:byte-buddy:1.14.0", @@ -106,10 +107,11 @@ maven.install( ) use_repo( maven, + "com_google_guava_failureaccess", "com_google_guava_guava", "com_google_j2objc_j2objc_annotations", - "com_google_guava_failureaccess", "maven", + "org_opentest4j_opentest4j", "unpinned_maven", auto_value = "com_google_auto_value_auto_value", auto_value_annotations = "com_google_auto_value_auto_value_annotations", diff --git a/base/BUILD b/base/BUILD index 78c931ed74a..a2a8d393c37 100644 --- a/base/BUILD +++ b/base/BUILD @@ -598,5 +598,6 @@ intellij_integration_test_suite( "@com_google_guava_guava//jar", "@error_prone_annotations//jar", "@junit//jar", + "@org_opentest4j_opentest4j//jar", ], ) diff --git a/gazelle/BUILD b/gazelle/BUILD index e8f7ebd2c5e..68c8ddaca11 100644 --- a/gazelle/BUILD +++ b/gazelle/BUILD @@ -88,5 +88,6 @@ intellij_integration_test_suite( "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", "@junit//jar", + "@org_opentest4j_opentest4j//jar", ], ) diff --git a/golang/BUILD b/golang/BUILD index 503cca75b4e..e8f8701f7cc 100644 --- a/golang/BUILD +++ b/golang/BUILD @@ -117,5 +117,6 @@ intellij_integration_test_suite( "//third_party/go:go_for_tests", "@com_google_guava_guava//jar", "@junit//jar", + "@org_opentest4j_opentest4j//jar", ], ) diff --git a/ijwb/BUILD b/ijwb/BUILD index a2249af5bad..45c0eb10a9e 100644 --- a/ijwb/BUILD +++ b/ijwb/BUILD @@ -176,5 +176,6 @@ intellij_integration_test_suite( "//intellij_platform_sdk:test_libs", "@com_google_guava_guava//jar", "@junit//jar", + "@org_opentest4j_opentest4j//jar", ], ) diff --git a/java/BUILD b/java/BUILD index 95e25a569e4..9f4bf575538 100644 --- a/java/BUILD +++ b/java/BUILD @@ -162,6 +162,7 @@ intellij_unit_test_suite( "//testing:lib", "@com_google_guava_guava//jar", "@junit//jar", + "@org_opentest4j_opentest4j//jar", ], ) @@ -228,6 +229,7 @@ java_binary( "//shared", "@com_google_guava_guava//jar", "@junit//jar", + "@org_opentest4j_opentest4j//jar", "@truth//jar", ], ) diff --git a/javascript/BUILD b/javascript/BUILD index 2b082da52fd..52223b11495 100644 --- a/javascript/BUILD +++ b/javascript/BUILD @@ -104,5 +104,6 @@ intellij_integration_test_suite( "//third_party/javascript:javascript_for_tests", "@com_google_guava_guava//jar", "@junit//jar", + "@org_opentest4j_opentest4j//jar", ], ) diff --git a/kotlin/BUILD b/kotlin/BUILD index 0e5f5c60447..c83da724869 100644 --- a/kotlin/BUILD +++ b/kotlin/BUILD @@ -117,5 +117,6 @@ intellij_integration_test_suite( "//third_party/auto_value", "@com_google_guava_guava//jar", "@junit//jar", + "@org_opentest4j_opentest4j//jar", ], ) diff --git a/maven_install.json b/maven_install.json index f73bc1dab3b..8fb09e42bc8 100755 --- a/maven_install.json +++ b/maven_install.json @@ -1,7 +1,7 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -1340736648, - "__RESOLVED_ARTIFACTS_HASH": 1712402666, + "__INPUT_ARTIFACTS_HASH": 728228764, + "__RESOLVED_ARTIFACTS_HASH": 247655140, "conflict_resolution": { "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.10.1", "com.google.errorprone:error_prone_annotations:2.20.0": "com.google.errorprone:error_prone_annotations:2.23.0", @@ -157,6 +157,12 @@ }, "version": "3.3" }, + "org.opentest4j:opentest4j": { + "shasums": { + "jar": "48e2df636cab6563ced64dcdff8abb2355627cb236ef0bf37598682ddf742f1b" + }, + "version": "1.3.0" + }, "org.ow2.asm:asm": { "shasums": { "jar": "b62e84b5980729751b0458c534cf1366f727542bb8d158621335682a460f0353" @@ -571,6 +577,9 @@ "org.objenesis.instantiator.util", "org.objenesis.strategy" ], + "org.opentest4j:opentest4j": [ + "org.opentest4j" + ], "org.ow2.asm:asm": [ "org.objectweb.asm", "org.objectweb.asm.signature" @@ -602,6 +611,7 @@ "org.hamcrest:hamcrest-core", "org.mockito:mockito-core", "org.objenesis:objenesis", + "org.opentest4j:opentest4j", "org.ow2.asm:asm" ] }, diff --git a/plugin_dev/BUILD b/plugin_dev/BUILD index 1c10462a1ce..e4333ecf90f 100644 --- a/plugin_dev/BUILD +++ b/plugin_dev/BUILD @@ -89,5 +89,6 @@ intellij_integration_test_suite( "//intellij_platform_sdk:test_libs", "//third_party/devkit:devkit_for_tests", "@junit//jar", + "@org_opentest4j_opentest4j//jar", ], ) diff --git a/scala/BUILD b/scala/BUILD index 1868ca20fdb..1ef028bed57 100644 --- a/scala/BUILD +++ b/scala/BUILD @@ -103,5 +103,6 @@ intellij_integration_test_suite( "//third_party/scala:scala_for_tests", "@com_google_guava_guava//jar", "@junit//jar", + "@org_opentest4j_opentest4j//jar", ], )