Remove support for the Java singlejar implememntation

Resolves bazelbuild#7365
comius · Jan 14, 2021 · cf583a3 · cf583a3
1 parent c750c52
commit cf583a3
Show file tree

Hide file tree

Showing 36 changed files with 33 additions and 5,039 deletions.
diff --git a/scripts/ij.bazelproject b/scripts/ij.bazelproject
@@ -16,7 +16,6 @@ targets:
   //src/java_tools/buildjar/javatests/...
   //src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner
   //src/java_tools/junitrunner/javatests/...
-  //src/java_tools/singlejar:SingleJar
   //src/test/...
   //src/tools/remote/...
   //src/tools/starlark/...
diff --git a/src/BUILD b/src/BUILD
@@ -433,7 +433,6 @@ filegroup(
         "//src/java_tools/buildjar:srcs",
         "//src/java_tools/import_deps_checker:srcs",
         "//src/java_tools/junitrunner:srcs",
-        "//src/java_tools/singlejar:srcs",
         "//src/main/cpp:srcs",
         "//src/main/res:srcs",
         "//src/main/java/com/google/devtools/build/docgen:srcs",
@@ -569,7 +568,6 @@ genrule(
     srcs = [
         "//src/java_tools/buildjar:srcs",
         "//src/java_tools/junitrunner:srcs",
-        "//src/java_tools/singlejar:srcs",
         "//src/tools/singlejar:embedded_java_tools",
         "//third_party/checker_framework_dataflow:srcs",
         "//third_party/checker_framework_javacutil:srcs",

diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD b/src/java_tools/junitrunner/java/com/google/testing/coverage/BUILD
@@ -54,14 +54,14 @@ genrule(
     outs = ["JacocoCoverage_jarjar_deploy.jar"],
     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}\"",
+        "\"$(location //src/tools/singlejar:singlejar_local)\" process \"$(location :JacocoCoverage.jarjar)\" \"$(location :JacocoCoverage_deploy.jar)\" \"$${JARJAR}\"",
         "\"$(JAVA)\" -jar \"$(location //src/java_tools/singlejar:SingleJar_deploy.jar)\" --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:singlejar_local",
         "//third_party/jarjar:jarjar_command_deploy.jar",
         "@bazel_tools//tools/jdk:current_host_java_runtime",
     ],

diff --git a/src/java_tools/singlejar/BUILD b/src/java_tools/singlejar/BUILD
diff --git a/src/java_tools/singlejar/README b/src/java_tools/singlejar/README
diff --git a/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD
diff --git a/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/ConcatenateStrategy.java b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/ConcatenateStrategy.java
diff --git a/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/CopyEntryFilter.java b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/CopyEntryFilter.java