From 7657ce1b9b180773c909a1da6846d83db52ec351 Mon Sep 17 00:00:00 2001
From: Tomasz Pasternak <tomasz.pasternak@jetbrains.com>
Date: Mon, 19 Feb 2024 15:15:43 +0100
Subject: [PATCH] Remove aspect-tools dependency on the platform.

It's hard to reason what is included in *_deploy.jar files and what is not
---
 WORKSPACE                   |  4 ++--
 aspect/tools/BUILD          | 10 +---------
 build-visibility.bzl        |  2 --
 intellij_platform_sdk/BUILD | 11 -----------
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 67da7da95b5..329a6fede08 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -750,8 +750,8 @@ jvm_maven_import_external(
 
 jvm_maven_import_external(
     name = "com_google_guava_guava",
-    artifact = "com.google.guava:guava:31.1-jre",
-    artifact_sha256 = "a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab",
+    artifact = "com.google.guava:guava:33.0.0-jre",
+    artifact_sha256 = "f4d85c3e4d411694337cb873abea09b242b664bb013320be6105327c45991537",
     server_urls = [
         "https://repo1.maven.org/maven2",
     ],
diff --git a/aspect/tools/BUILD b/aspect/tools/BUILD
index dfb43ad8c91..4170a86cd57 100644
--- a/aspect/tools/BUILD
+++ b/aspect/tools/BUILD
@@ -7,20 +7,12 @@ package(default_visibility = ["//aspect:__pkg__"])
 
 licenses(["notice"])
 
-# To prevent versioning conflicts when developing internally, we always use the same
-# guava version bundled with the IntelliJ plugin API.
-java_library(
-    name = "guava",
-    visibility = ["//visibility:private"],
-    exports = ["//intellij_platform_sdk:guava_for_external_binaries"],
-)
-
 java_library(
     name = "lib",
     srcs = glob(["src/**/*.java"]),
     javacopts = ["-source 8 -target 8"],
     deps = [
-        ":guava",
+        "@com_google_guava_guava//jar",
         "//proto:proto_deps",
         "@jsr305_annotations//jar",
         "//third_party/bazel/src/main/protobuf:worker_protocol_java_proto",
diff --git a/build-visibility.bzl b/build-visibility.bzl
index 4626f7a0a0a..7a9bef384c6 100644
--- a/build-visibility.bzl
+++ b/build-visibility.bzl
@@ -47,8 +47,6 @@ ASPECT_TEST_RULES_VISIBILITY_TO_ALL = [
 
 SERVICES_EXPERIMENT_SUBPACKAGES = None
 
-ASPECT_TOOLS_PACKAGE = ["//aspect/tools:__pkg__"]
-
 def create_plugin_packages_group(name = None):
     # This group is not needed externally
     pass
diff --git a/intellij_platform_sdk/BUILD b/intellij_platform_sdk/BUILD
index a14f7cd0bc3..d080b23b0ae 100644
--- a/intellij_platform_sdk/BUILD
+++ b/intellij_platform_sdk/BUILD
@@ -7,7 +7,6 @@
 
 load(
     "//:build-visibility.bzl",
-    "ASPECT_TOOLS_PACKAGE",
     "INTELLIJ_PLUGINS_VISIBILITY",
     "create_test_libs_visibility_package",
 )
@@ -781,16 +780,6 @@ java_library(
     ),
 )
 
-java_library(
-    name = "guava_for_external_binaries",
-    visibility = ASPECT_TOOLS_PACKAGE,
-    exports = select_from_plugin_api_directory(
-        android_studio = [":guava"],
-        clion = [":guava"],
-        intellij = [":guava"],
-    ),
-)
-
 # Some versions of the IDE include jsr305.jar, but others don't. So we need to include the JSR 305
 # classes (@Nullable, etc.) in the plugin jars for IDEs that don't already have it on the classpath.
 java_library(