Skip to content

Commit

Permalink
Fix base resource strip prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
@simuons
simuons committed Jan 15, 2025
1 parent 167dd28 commit 60bfd89
Showing 1 changed file with 49 additions and 46 deletions.
95 changes: 49 additions & 46 deletions base/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")

kt_jvm_library(
name = "base",
srcs = glob(["src/**/*.java", "src/**/*.kt"]),
srcs = glob([
"src/**/*.java",
"src/**/*.kt",
]),
resource_strip_prefix = package_name() + "/src",
resources = glob(["src/resources/**/*"]),
resource_strip_prefix = "base/src",
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,8 +49,6 @@ 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",
],
Expand Down Expand Up @@ -93,9 +96,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 +109,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 +122,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 +148,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 +195,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 +210,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 +231,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 +246,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 +263,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 +280,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 +298,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 +312,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 +333,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 +356,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 +383,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 +404,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 +438,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 +459,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 +486,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 +515,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 +541,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 +555,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 +588,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",
],
)

0 comments on commit 60bfd89

Please sign in to comment.