From 5e14fbb39fd179fccebeff19b7ba687afd90a84d Mon Sep 17 00:00:00 2001 From: Googler Date: Tue, 18 Oct 2022 03:20:51 -0700 Subject: [PATCH] Add explicit test deps for dependencies otherwise imported implicitly via the plugin_api_for_tests rule. (cherry picked from commit e2d9fed8f1c20d65344507858256d56e2b5e82ff) --- WORKSPACE | 18 ++++++++++++++++++ aswb/BUILD | 5 +++++ base/BUILD | 4 ++++ common/experiments/BUILD | 1 + cpp/BUILD | 3 +++ dart/BUILD | 1 + golang/BUILD | 2 ++ ijwb/BUILD | 2 ++ java/BUILD | 2 ++ javascript/BUILD | 2 ++ kotlin/BUILD | 2 ++ python/BUILD | 3 +++ scala/BUILD | 2 ++ testing/BUILD | 1 + 14 files changed, 48 insertions(+) diff --git a/WORKSPACE b/WORKSPACE index 033e18d0a0d..bb68bf0a293 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -350,6 +350,24 @@ jvm_maven_import_external( server_urls = ["https://repo1.maven.org/maven2"], ) +jvm_maven_import_external( + name = "com_google_guava_guava", + artifact = "com.google.guava:guava:31.1-jre", + artifact_sha256 = "a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab", + server_urls = [ + "https://repo1.maven.org/maven2", + ], +) + +jvm_maven_import_external( + name = "gson", + artifact = "com.google.code.gson:gson:2.9.1", + artifact_sha256 = "378534e339e6e6d50b1736fb3abb76f1c15d1be3f4c13cec6d536412e23da603", + server_urls = [ + "https://repo1.maven.org/maven2", + ], +) + _JARJAR_BUILD_FILE = """ java_binary( name = "jarjar_bin", diff --git a/aswb/BUILD b/aswb/BUILD index ef84cca6662..d3f2f8611fa 100644 --- a/aswb/BUILD +++ b/aswb/BUILD @@ -73,6 +73,7 @@ java_library( "//base", "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", + "@com_google_guava_guava//jar", ], ) @@ -102,6 +103,7 @@ java_library( "//intellij_platform_sdk:test_libs", "//java", "//testing:lib", + "@com_google_guava_guava//jar", "@error_prone_annotations//jar", "@junit//jar", ], @@ -151,6 +153,7 @@ intellij_unit_test_suite( "//java", "//proto:proto_deps", "//testing:lib", + "@com_google_guava_guava//jar", "@junit//jar", ], ) @@ -201,6 +204,8 @@ intellij_integration_test_suite( "//intellij_platform_sdk:test_libs", "//java", "//proto:proto_deps", + "@com_google_guava_guava//jar", + "@gson//jar", "@junit//jar", ], ) diff --git a/base/BUILD b/base/BUILD index 7e70458974e..0c695ef50cd 100644 --- a/base/BUILD +++ b/base/BUILD @@ -403,6 +403,7 @@ java_library( "//testing:lib", "//third_party/auto_value", "//third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto", + "@com_google_guava_guava//jar", "@junit//jar", ], ) @@ -421,6 +422,7 @@ java_library( "//proto:proto_deps", "//sdkcompat", "//testing:lib", + "@com_google_guava_guava//jar", "@junit//jar", ], ) @@ -452,6 +454,7 @@ intellij_unit_test_suite( "//intellij_platform_sdk:test_libs", "//proto:proto_deps", "//testing:lib", + "@com_google_guava_guava//jar", "@junit//jar", ], ) @@ -472,6 +475,7 @@ intellij_integration_test_suite( "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", "//proto:proto_deps", + "@com_google_guava_guava//jar", "@junit//jar", ], ) diff --git a/common/experiments/BUILD b/common/experiments/BUILD index 435bad17dc7..ab1625b6a63 100644 --- a/common/experiments/BUILD +++ b/common/experiments/BUILD @@ -62,6 +62,7 @@ intellij_unit_test_suite( "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", "//testing:lib", + "@com_google_guava_guava//jar", "@junit//jar", ], ) diff --git a/cpp/BUILD b/cpp/BUILD index a61a259fa69..4c2cf969883 100644 --- a/cpp/BUILD +++ b/cpp/BUILD @@ -95,6 +95,7 @@ intellij_unit_test_suite( runtime_deps = ["//intellij_platform_sdk:test_libs"], deps = [ ":cpp", + "@com_google_guava_guava//jar", "//base", "//base:unit_test_utils", "//common/experiments", @@ -140,6 +141,7 @@ java_library( "//intellij_platform_sdk:test_libs", "//sdkcompat", "//testing:lib", + "@com_google_guava_guava//jar", "@junit//jar", ], ) @@ -168,6 +170,7 @@ intellij_integration_test_suite( "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", "//sdkcompat", + "@com_google_guava_guava//jar", "@junit//jar", ], ) diff --git a/dart/BUILD b/dart/BUILD index 41b5bf693ed..1ab357c1a8c 100644 --- a/dart/BUILD +++ b/dart/BUILD @@ -38,6 +38,7 @@ intellij_unit_test_suite( "//intellij_platform_sdk:jsr305", "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", + "@com_google_guava_guava//jar", "@junit//jar", ], ) diff --git a/golang/BUILD b/golang/BUILD index e9d1fe41edf..0046bbd4dbd 100644 --- a/golang/BUILD +++ b/golang/BUILD @@ -78,6 +78,7 @@ intellij_unit_test_suite( "//intellij_platform_sdk:test_libs", "//testing:lib", "//third_party/go:go_for_tests", + "@com_google_guava_guava//jar", "@junit//jar", ], ) @@ -109,6 +110,7 @@ intellij_integration_test_suite( "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", "//third_party/go:go_for_tests", + "@com_google_guava_guava//jar", "@junit//jar", ], ) diff --git a/ijwb/BUILD b/ijwb/BUILD index 56da3229855..8f7aeddf914 100644 --- a/ijwb/BUILD +++ b/ijwb/BUILD @@ -147,6 +147,7 @@ intellij_unit_test_suite( "//intellij_platform_sdk:jsr305", "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", + "@com_google_guava_guava//jar", "@junit//jar", ], ) @@ -167,6 +168,7 @@ intellij_integration_test_suite( "//intellij_platform_sdk:jsr305", "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", + "@com_google_guava_guava//jar", "@junit//jar", ], ) diff --git a/java/BUILD b/java/BUILD index ac45f5dbac4..172392f18fe 100644 --- a/java/BUILD +++ b/java/BUILD @@ -151,6 +151,7 @@ intellij_unit_test_suite( "//intellij_platform_sdk:test_libs", "//intellij_platform_sdk:truth", "//proto:proto_deps", + "@com_google_guava_guava//jar", "@junit//jar", ], ) @@ -200,6 +201,7 @@ intellij_integration_test_suite( "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", "//proto:proto_deps", + "@com_google_guava_guava//jar", "@junit//jar", ], ) diff --git a/javascript/BUILD b/javascript/BUILD index f7603607517..c63382aa76e 100644 --- a/javascript/BUILD +++ b/javascript/BUILD @@ -77,6 +77,7 @@ intellij_unit_test_suite( "//intellij_platform_sdk:jsr305", "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", + "@com_google_guava_guava//jar", "@junit//jar", ], ) @@ -96,6 +97,7 @@ intellij_integration_test_suite( "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", "//third_party/javascript:javascript_for_tests", + "@com_google_guava_guava//jar", "@junit//jar", ], ) diff --git a/kotlin/BUILD b/kotlin/BUILD index 40c25c82812..28ff97b520f 100644 --- a/kotlin/BUILD +++ b/kotlin/BUILD @@ -85,6 +85,7 @@ intellij_unit_test_suite( "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", "//java", + "@com_google_guava_guava//jar", "@junit//jar", ], ) @@ -109,6 +110,7 @@ intellij_integration_test_suite( "//java", "//proto:proto_deps", "//third_party/auto_value", + "@com_google_guava_guava//jar", "@junit//jar", ], ) diff --git a/python/BUILD b/python/BUILD index 8c3b79f045b..8abd9d5d076 100644 --- a/python/BUILD +++ b/python/BUILD @@ -82,6 +82,7 @@ intellij_integration_test_suite( "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", "//third_party/python:python_for_tests", + "@com_google_guava_guava//jar", "@junit//jar", ], ) @@ -99,6 +100,7 @@ intellij_unit_test_suite( "//intellij_platform_sdk:test_libs", "//proto:proto_deps", "//third_party/python:python_for_tests", + "@com_google_guava_guava//jar", "@junit//jar", ], ) @@ -116,6 +118,7 @@ java_library( "//intellij_platform_sdk:plugin_api_for_tests", "//intellij_platform_sdk:test_libs", "//third_party/python:python_for_tests", + "@com_google_guava_guava//jar", "@junit//jar", ], ) diff --git a/scala/BUILD b/scala/BUILD index 9ec588f9bd2..37faa4dd42d 100644 --- a/scala/BUILD +++ b/scala/BUILD @@ -77,6 +77,7 @@ intellij_unit_test_suite( "//intellij_platform_sdk:test_libs", "//java", "//third_party/scala:scala_for_tests", + "@com_google_guava_guava//jar", "@junit//jar", ], ) @@ -96,6 +97,7 @@ intellij_integration_test_suite( "//intellij_platform_sdk:test_libs", "//java", "//third_party/scala:scala_for_tests", + "@com_google_guava_guava//jar", "@junit//jar", ], ) diff --git a/testing/BUILD b/testing/BUILD index cf45f905051..8d707821f93 100644 --- a/testing/BUILD +++ b/testing/BUILD @@ -88,6 +88,7 @@ java_library( "//common/experiments:unit_test_utils", "//intellij_platform_sdk:jsr305", "//intellij_platform_sdk:plugin_api_for_tests", + "@com_google_guava_guava//jar", "@junit//jar", ], )