Skip to content

Commit

Permalink
Removing outdated versions support
Browse files Browse the repository at this point in the history
  • Loading branch information
@sellophane
sellophane committed Jan 17, 2025
1 parent 8984aa2 commit 65c56e9
Show file tree
Hide file tree
Showing 189 changed files with 222 additions and 6,103 deletions.
400 changes: 0 additions & 400 deletions MODULE.bazel
View file

Large diffs are not rendered by default.

123 changes: 54 additions & 69 deletions base/BUILD
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
load("@rules_java//java:defs.bzl", "java_library")
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
load(
"//:build-visibility.bzl",
"DEFAULT_TEST_VISIBILITY",
Expand All @@ -18,13 +19,15 @@ load(
"intellij_integration_test_suite",
"intellij_unit_test_suite",
)
load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")

kt_jvm_library(
name = "base",
srcs = glob(["src/**/*.java", "src/**/*.kt"]),
resources = glob(["src/resources/**/*"]),
srcs = glob([
"src/**/*.java",
"src/**/*.kt",
]),
resource_strip_prefix = "base/src",
resources = glob(["src/resources/**/*"]),
visibility = PLUGIN_PACKAGES_VISIBILITY,
deps = [
"//common/actions",
Expand All @@ -35,6 +38,8 @@ kt_jvm_library(
"//common/util:platform",
"//common/util:process",
"//common/util:transactions",
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
"//querysync",
"//sdkcompat",
Expand All @@ -44,37 +49,17 @@ kt_jvm_library(
"//shared:proto",
"//shared:vcs",
"//third_party/java/auto_value",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
"@error_prone_annotations//jar",
"@gson//jar",
],
)

intellij_plugin_library(
name = "plugin_library",
plugin_xmls = ["src/META-INF/blaze-base.xml"] + #api241
select_for_plugin_api({
"android-studio-2022.3": [],
"android-studio-2023.1": [],
"android-studio-2023.2": [],
"intellij-2022.3": [],
"intellij-ue-2022.3": [],
"intellij-2023.1": [],
"intellij-ue-2023.1": [],
"intellij-2023.2": [],
"intellij-ue-2023.2": [],
"intellij-2023.3": [],
"intellij-ue-2023.3": [],
"intellij-2024.1": [],
"intellij-ue-2024.1": [],
"clion-2022.3": [],
"clion-2023.1": [],
"clion-2023.2": [],
"clion-2023.3": [],
"clion-2024.1": [],
"default": ["src/META-INF/dependency-on-lvcs-impl.xml"],
}),
plugin_xmls = [
"src/META-INF/blaze-base.xml",
"src/META-INF/dependency-on-lvcs-impl.xml",
],
visibility = PLUGIN_PACKAGES_VISIBILITY,
deps = [
":base",
Expand All @@ -93,9 +78,9 @@ java_library(
deps = [
":base",
"//common/experiments",
"//proto:proto_deps",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
],
)

Expand All @@ -106,9 +91,9 @@ java_library(
neverlink = 1,
visibility = G3PLUGINS_VISIBILITY,
deps = [
"//sdkcompat",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//sdkcompat",
],
)

Expand All @@ -119,8 +104,8 @@ java_library(
srcs = glob(["src/com/google/idea/blaze/base/formatter/*.java"]),
visibility = G3PLUGINS_VISIBILITY,
deps = [
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305", # unuseddeps: keep (b/146560321)
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -145,11 +130,11 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":proto_wrapper",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
"//shared",
"//third_party/java/auto_value",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"@error_prone_annotations//jar",
],
)
Expand Down Expand Up @@ -192,8 +177,8 @@ java_library(
neverlink = 1,
visibility = G3PLUGINS_VISIBILITY,
deps = [
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -207,8 +192,8 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":vfs_api",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -228,9 +213,9 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":proto_wrapper",
"//proto:proto_deps",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
],
)

Expand All @@ -243,8 +228,8 @@ java_library(
neverlink = 1,
visibility = G3PLUGINS_VISIBILITY,
deps = [
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -260,8 +245,8 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":proto_wrapper",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -277,9 +262,9 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
"//common/experiments",
"//third_party/java/auto_value",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//third_party/java/auto_value",
],
)

Expand All @@ -295,8 +280,8 @@ java_library(
deps = [
":label_api",
":proto_wrapper",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Immutable
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -309,8 +294,8 @@ java_library(
neverlink = 1,
deps = [
":logging_api",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -330,10 +315,10 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":base",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
"//shared",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"@error_prone_annotations//jar",
],
)
Expand All @@ -353,9 +338,9 @@ java_library(
],
deps = [
":base",
"//third_party/java/auto_value",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//third_party/java/auto_value",
"@error_prone_annotations//jar",
],
)
Expand All @@ -380,8 +365,8 @@ java_library(
],
neverlink = 1,
deps = [
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305", # unuseddeps: keep for @Nullable
"//intellij_platform_sdk:plugin_api",
],
)

Expand All @@ -401,10 +386,10 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":base",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
"//shared:artifact",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"@error_prone_annotations//jar",
],
)
Expand Down Expand Up @@ -435,10 +420,10 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":base",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//proto:proto_deps",
"//shared:artifact",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"@error_prone_annotations//jar",
],
)
Expand All @@ -456,10 +441,10 @@ java_library(
visibility = G3PLUGINS_VISIBILITY,
deps = [
":base",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//shared",
"//shared:artifact",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"@error_prone_annotations//jar",
],
)
Expand All @@ -483,15 +468,15 @@ java_library(
visibility = PLUGIN_PACKAGES_VISIBILITY,
deps = [
":base",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests",
"//intellij_platform_sdk:test_libs",
"//shared:artifact",
"//shared:exception",
"//testing:lib",
"//third_party/bazel/src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
"//third_party/java/auto_value",
"//third_party/java/junit",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests",
"//intellij_platform_sdk:test_libs",
"@com_google_guava_guava//jar",
"@error_prone_annotations//jar",
],
Expand All @@ -512,15 +497,15 @@ java_library(
deps = [
":base",
":unit_test_utils",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests",
"//intellij_platform_sdk:test_libs",
"//proto:proto_deps",
"//sdkcompat",
"//shared:artifact",
"//shared:vcs",
"//testing:lib",
"//third_party/java/junit",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests",
"//intellij_platform_sdk:test_libs",
"@bazel_tools//tools/java/runfiles",
"@com_google_guava_guava//jar",
],
Expand All @@ -538,6 +523,9 @@ intellij_unit_test_suite(
"//common/experiments",
"//common/experiments:unit_test_utils",
"//common/util:process",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests",
"//intellij_platform_sdk:test_libs",
"//proto:proto_deps",
"//querysync",
"//querysync/javatests/com/google/idea/blaze/qsync:TestUtils",
Expand All @@ -549,9 +537,6 @@ intellij_unit_test_suite(
"//testing:lib",
"//third_party/java/auto_value",
"//third_party/java/junit",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests",
"//intellij_platform_sdk:test_libs",
"@com_google_guava_guava//jar",
],
)
Expand Down Expand Up @@ -585,18 +570,18 @@ intellij_integration_test_suite(
":base",
":integration_test_utils",
":unit_test_utils",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:plugin_api_for_tests", # unuseddeps: keep
"//intellij_platform_sdk:test_libs",
"//proto:proto_deps",
"//querysync",
"//querysync/javatests/com/google/idea/blaze/qsync/artifacts:mock_artifact_cache",
"//shared:exception",
"//shared/javatests/com/google/idea/blaze/common:test_utils",
"//intellij_platform_sdk:plugin_api",
"//intellij_platform_sdk:jsr305",
"//intellij_platform_sdk:plugin_api_for_tests", # unuseddeps: keep
"//intellij_platform_sdk:test_libs",
"//third_party/java/junit",
"@org_opentest4j_opentest4j//jar",
"@com_google_guava_guava//jar",
"@error_prone_annotations//jar",
"@org_opentest4j_opentest4j//jar",
],
)
2 changes: 0 additions & 2 deletions base/src/com/google/idea/blaze/base/sync/libraries/ExternalLibraryManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,13 @@
import com.google.idea.common.util.Transactions;
import com.google.idea.sdkcompat.general.AsyncVfsEventsPostProcessorCompat;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.components.ComponentManagerEx;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.AdditionalLibraryRootsProvider;
import com.intellij.openapi.roots.ex.ProjectRootManagerEx;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.newvfs.events.VFileDeleteEvent;
import com.intellij.openapi.vfs.newvfs.events.VFileEvent;
import com.intellij.vfs.AsyncVfsEventsPostProcessor;
import java.io.File;
import java.util.Map;
import java.util.Objects;
Expand Down
Loading

0 comments on commit 65c56e9

Please sign in to comment.