Skip to content

Commit

Permalink
Remove support for the Java singlejar implementation.
Browse files Browse the repository at this point in the history
Fixes #7365

PiperOrigin-RevId: 354917951
  • Loading branch information
comius authored and copybara-github committed Feb 1, 2021
1 parent 207283b commit 4fc4868
Show file tree
Hide file tree
Showing 20 changed files with 9 additions and 1,947 deletions.
1 change: 0 additions & 1 deletion src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,6 @@ JAVA_TOOLS_DEPLOY_JARS = [
"//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:turbine_direct_binary_deploy.jar",
"//src/java_tools/junitrunner/java/com/google/testing/coverage:JacocoCoverage_jarjar_deploy.jar",
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar",
"//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bazel-singlejar_deploy.jar",
]

release_archive(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ genrule(
cmd = "\n".join([
"JARJAR=\"$$(mktemp -t bazel.XXXXXXXX)\"",
"\"$(JAVA)\" -jar \"$(location //third_party/jarjar:jarjar_command_deploy.jar)\" process \"$(location :JacocoCoverage.jarjar)\" \"$(location :JacocoCoverage_deploy.jar)\" \"$${JARJAR}\"",
"\"$(JAVA)\" -jar \"$(location //src/java_tools/singlejar:SingleJar_deploy.jar)\" --normalize --sources \"$${JARJAR}\" --output \"$@\"",
"\"$(location //src/tools/singlejar:singlejar)\" --normalize --sources \"$${JARJAR}\" --output \"$@\"",
"rm -fr \"$${JARJAR}\"",
]),
tags = ["manual"],
toolchains = ["@bazel_tools//tools/jdk:current_host_java_runtime"],
tools = [
"//src/java_tools/singlejar:SingleJar_deploy.jar",
"//src/tools/singlejar",
"//third_party/jarjar:jarjar_command_deploy.jar",
"@bazel_tools//tools/jdk:current_host_java_runtime",
],
Expand Down
22 changes: 0 additions & 22 deletions src/java_tools/singlejar/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,3 @@ alias(
actual = "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:libSingleJar",
visibility = ["//visibility:public"],
)

alias(
name = "SingleJar",
actual = "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bazel-singlejar",
visibility = ["//visibility:public"],
)

alias(
name = "SingleJar_deploy.jar",
actual = "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bazel-singlejar_deploy.jar",
visibility = ["//visibility:public"],
)

alias(
name = "bootstrap",
actual = "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bootstrap",
)

alias(
name = "bootstrap_deploy.jar",
actual = "//src/java_tools/singlejar/java/com/google/devtools/build/singlejar:bootstrap_deploy.jar",
)
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
load("@rules_java//java:defs.bzl", "java_binary", "java_library")
load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_binary", "bootstrap_java_library")
load("@rules_java//java:defs.bzl", "java_library")

# Description:
# SingleJar combines multiple zip files and additional files
Expand Down Expand Up @@ -35,68 +34,3 @@ java_library(
"//third_party:jsr305",
],
)

java_library(
name = "libSingleJarMain",
srcs = glob(["**/*.java"]),
# Avoid adding dependencies here - this is a very low-level library and we don't want to pull in
# the world, even including commons.
deps = [
"//src/java_tools/singlejar/java/com/google/devtools/build/zip",
"//src/main/java/com/google/devtools/build/lib/shell",
"//src/main/protobuf:desugar_deps_java_proto",
"//src/main/protobuf:worker_protocol_java_proto",
"//third_party:jsr305",
"//third_party/protobuf:protobuf_java",
],
)

java_binary(
name = "bazel-singlejar",
srcs = glob(["*.java"]),
main_class = "com.google.devtools.build.singlejar.SingleJar",
visibility = [
"//:__subpackages__",
"//src/java_tools/singlejar:singlejar_package_group",
],
deps = [
"//src/java_tools/singlejar/java/com/google/devtools/build/zip",
"//src/main/java/com/google/devtools/build/lib/shell",
"//src/main/protobuf:desugar_deps_java_proto",
"//src/main/protobuf:worker_protocol_java_proto",
"//third_party:jsr305",
"//third_party/protobuf:protobuf_java",
],
)

#
# Bootstrapping using Starlark rules
#

bootstrap_java_library(
name = "starlark-deps",
jars = [
"//third_party:jsr305-jars",
],
tags = ["manual"],
)

bootstrap_java_binary(
name = "bootstrap",
srcs = glob(
["**/*.java"],
exclude = [
"Java8DesugarDepsJarEntryFilter.java",
"SingleJarWorker.java",
],
) + [
"//src/java_tools/singlejar/java/com/google/devtools/build/zip:java-srcs",
],
main_class = "com.google.devtools.build.singlejar.SingleJar",
tags = ["manual"],
visibility = ["//visibility:public"],
deps = [
":starlark-deps",
"//src/main/java/com/google/devtools/build/lib/shell:shell-starlark",
],
)

This file was deleted.

This file was deleted.

Loading

0 comments on commit 4fc4868

Please sign in to comment.