Address review comments (part 1)
diff --git a/.bazelrc b/.bazelrc index 1127338..e04bf92 100644 --- a/.bazelrc +++ b/.bazelrc
@@ -1,6 +1,6 @@ build:bzlmod --experimental_enable_bzlmod # @local_config_cc and @local_config_xcode are no longer available as canonical repo name, # therefore we have to override the default value of the following flags. -# TODO: Figure out a way to get rid of this. +# TODO: Remove after fixing https://github.com/bazelbuild/bazel/issues/14279 build:bzlmod --crosstool_top=@rules_cc.0.0.1.cc_configure.local_config_cc//:toolchain build:bzlmod --xcode_version_config=@rules_cc.0.0.1.cc_configure.local_config_xcode//:host_xcodes
diff --git a/MODULE.bazel b/MODULE.bazel index a60ddb7..fdb4090 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -22,11 +22,11 @@ ] + REMOTE_JAVA_TOOLCHAINS, ) -bazel_dep(name = "bazel_skylib", version = "1.0.3") bazel_dep(name = "platforms", version = "0.0.4") bazel_dep(name = "rules_cc", version = "0.0.1") +# rules_proto is required by @remote_java_tools, which is loaded via module extension. +# TODO: perhaps java tools should have its own Bazel module, then we don't need this in rules_java. bazel_dep(name = "rules_proto", version = "4.0.0") -bazel_dep(name = "rules_python", version = "0.4.0") toolchains = use_extension("//java:extensions.bzl", "toolchains")
diff --git a/examples/hello-world/HelloWorld.java b/examples/hello-world/HelloWorld.java index b033ce7..7956769 100644 --- a/examples/hello-world/HelloWorld.java +++ b/examples/hello-world/HelloWorld.java
@@ -14,6 +14,6 @@ public class HelloWorld { public static void main (String[] args) { - System.out.println("Hello World!"); + System.out.println("Hello World!\n"); } } \ No newline at end of file
diff --git a/java/repositories.bzl b/java/repositories.bzl index 80ec481..5f40242 100644 --- a/java/repositories.bzl +++ b/java/repositories.bzl
@@ -24,7 +24,6 @@ """Development and production dependencies of rules_java.""" load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") load("//toolchains:local_java_repository.bzl", "local_java_repository") load("//toolchains:remote_java_repository.bzl", "remote_java_repository") @@ -360,24 +359,6 @@ version = "17", ) -def bazel_skylib(): - maybe( - http_archive, - name = "bazel_skylib", - type = "tar.gz", - url = "https://github.com/bazelbuild/bazel-skylib/releases/download/0.9.0/bazel_skylib-0.9.0.tar.gz", - sha256 = "1dde365491125a3db70731e25658dfdd3bc5dbdfd11b840b3e987ecf043c7ca0", - ) - -def rules_python(): - maybe( - http_archive, - name = "rules_python", - type = "tar.gz", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.4.0/rules_python-0.4.0.tar.gz", - sha256 = "954aa89b491be4a083304a2cb838019c8b8c3720a7abb9c4cb81ac7a24230cea", - ) - def rules_java_dependencies(): """An utility method to load all dependencies of rules_java. @@ -392,8 +373,6 @@ # TODO: load this will break compatibility with Bazel 4.2.1 # java_tools_javac11_repos() - bazel_skylib() - rules_python() def rules_java_toolchains(name = "toolchains"): """An utility method to load all Java toolchains. @@ -412,8 +391,8 @@ ] REMOTE_JDK_REPOS = [("remotejdk" + version + "_" + platform) for version in JDK_VERSIONS for platform in PLATFORMS] + EXTRA_REMOTE_JDK11_REPOS - native.register_toolchains("//toolchains:all") + native.register_toolchains("//toolchains:all") native.register_toolchains("@local_jdk//:runtime_toolchain_definition") for name in REMOTE_JDK_REPOS: native.register_toolchains("@" + name + "_toolchain_config_repo//:toolchain")
diff --git a/toolchains/BUILD b/toolchains/BUILD index 585452d..65afb7b 100644 --- a/toolchains/BUILD +++ b/toolchains/BUILD
@@ -1,10 +1,7 @@ load("@rules_cc//cc:defs.bzl", "cc_library") -load("@rules_java//java:defs.bzl", "java_import") -load("@rules_python//python:defs.bzl", "py_binary", "py_test") load( "//toolchains:default_java_toolchain.bzl", "DEFAULT_TOOLCHAIN_CONFIGURATION", - "JVM8_TOOLCHAIN_CONFIGURATION", "PREBUILT_TOOLCHAIN_CONFIGURATION", "bootclasspath", "default_java_toolchain", @@ -45,15 +42,6 @@ # Points to toolchain[":toolchain_type"] (was :legacy_current_java_toolchain) java_toolchain_alias(name = "current_java_toolchain") -# This is necessary to get the *host* Java runtime. Depending on -# //tools/jdk:current_java_runtime from an attribute with the host transition -# does not work because the dependency is determined based on the configuration -# *before* the transition. -alias( - name = "java_runtime_alias", - actual = ":current_java_runtime", -) - # These individual jni_* targets are exposed for legacy reasons. # Most users should depend on :jni. @@ -123,26 +111,6 @@ }), ) -alias( - name = "java", - actual = "@local_jdk//:java", -) - -alias( - name = "jar", - actual = "@local_jdk//:jar", -) - -alias( - name = "javac", - actual = "@local_jdk//:javac", -) - -alias( - name = "javadoc", - actual = "@local_jdk//:javadoc", -) - [ ( alias( @@ -220,114 +188,6 @@ }), ) -exports_files(["BUILD.java_tools"]) - -alias( - name = "genclass", - actual = "@remote_java_tools//:GenClass", -) - -alias( - name = "GenClass_deploy.jar", - actual = "@remote_java_tools//:GenClass", -) - -alias( - name = "turbine", - actual = "@remote_java_tools//:Turbine", -) - -alias( - name = "turbine_deploy.jar", - actual = "@remote_java_tools//:Turbine", -) - -alias( - name = "turbine_direct", - actual = "@remote_java_tools//:TurbineDirect", -) - -alias( - name = "turbine_direct_binary_deploy.jar", - actual = "@remote_java_tools//:TurbineDirect", -) - -alias( - name = "javabuilder", - actual = "@remote_java_tools//:JavaBuilder", -) - -alias( - name = "JavaBuilder_deploy.jar", - actual = "@remote_java_tools//:JavaBuilder", -) - -alias( - name = "vanillajavabuilder", - actual = "@remote_java_tools//:VanillaJavaBuilder", -) - -alias( - name = "javac_jar", - actual = "@remote_java_tools//:javac_jar", -) - -alias( - name = "jdk_compiler_jar", - actual = "@remote_java_tools//:jdk_compiler_jar", -) - -alias( - name = "java_compiler_jar", - actual = "@remote_java_tools//:java_compiler_jar", -) - -alias( - name = "JacocoCoverageRunner", - actual = "@remote_java_tools//:jacoco_coverage_runner", -) - -alias( - name = "JacocoCoverage", - actual = "@remote_java_tools//:jacoco_coverage_runner", -) - -java_import( - name = "TestRunner", - jars = ["@remote_java_tools//:Runner"], -) - -alias( - name = "TestRunner_deploy.jar", - actual = "@remote_java_tools//:Runner", -) - -alias( - name = "proguard", - actual = "@remote_java_tools//:proguard", -) - -# TODO(cushon): this isn't compatible with JDK 9 -alias( - name = "bootclasspath", - actual = "@local_jdk//:bootclasspath", -) - -alias( - name = "jre", - actual = "@local_jdk//:jre", -) - -alias( - name = "jdk", - actual = "@local_jdk//:jdk", -) - -alias( - name = "host_jdk", - actual = ":remote_jdk11", -) - bootclasspath( name = "platformclasspath", src = "DumpPlatformClassPath.java", @@ -385,17 +245,6 @@ target_version = "17", ) -# Deprecated, do not use. -# It will be removed after migration to Java toolchain resolution. -default_java_toolchain( - name = "toolchain_hostjdk8", - configuration = JVM8_TOOLCHAIN_CONFIGURATION, - java_runtime = ":current_host_java_runtime", - source_version = "8", - target_version = "8", - toolchain_definition = False, -) - default_java_toolchain( name = "prebuilt_toolchain", configuration = PREBUILT_TOOLCHAIN_CONFIGURATION, @@ -408,25 +257,6 @@ visibility = ["//tools:__pkg__"], ) -py_binary( - name = "proguard_whitelister", - srcs = [ - "proguard_whitelister.py", - ], - deps = [ - "//third_party/py/abseil", - ], -) - -py_test( - name = "proguard_whitelister_test", - srcs = ["proguard_whitelister_test.py"], - data = ["proguard_whitelister_test_input.pgcfg"], - deps = [ - ":proguard_whitelister", - ], -) - # Aliases for JDKs, so that they are only downloaded when needed. _JDKS = [ "remotejdk11_macos",