Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove aspect-tools dependency on the platform. #6102

Merged
merged 1 commit into from
Feb 20, 2024
Merged

Remove aspect-tools dependency on the platform. #6102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
10 changes: 1 addition & 9 deletions aspect/tools/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions build-visibility.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions intellij_platform_sdk/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

load(
"//:build-visibility.bzl",
"ASPECT_TOOLS_PACKAGE",
"INTELLIJ_PLUGINS_VISIBILITY",
"create_test_libs_visibility_package",
)
Expand Down Expand Up @@ -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(
Expand Down
Loading