diff options
author | David Pursehouse <david.pursehouse@gmail.com> | 2019-11-26 17:42:10 +0900 |
---|---|---|
committer | David Pursehouse <david.pursehouse@gmail.com> | 2019-11-26 17:42:14 +0900 |
commit | 839359425d619db31584955f4e0fb0d19ed4cfb8 (patch) | |
tree | 685d4da1e4decfd5f7255e484b62888f2ef4d47d /tools | |
parent | 5c40f12e20d339653f6d6964990c3eff11fa491c (diff) | |
parent | da06f23c9289445effde55b506c55c49ffdb31eb (diff) | |
download | jgit-839359425d619db31584955f4e0fb0d19ed4cfb8.tar.gz jgit-839359425d619db31584955f4e0fb0d19ed4cfb8.zip |
Merge branch 'stable-5.2' into stable-5.3
* stable-5.2:
Bazel: Use java_plugin and java_binary from @rules_java in jmh.bzl
Bazel: Add missing newlines at end of BUILD files
Change-Id: Ie5e66f2e26c057c81101b0d110f91ea479eb362d
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/bzl/jmh.bzl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/bzl/jmh.bzl b/tools/bzl/jmh.bzl index eee9ed02c6..a51a42cf33 100644 --- a/tools/bzl/jmh.bzl +++ b/tools/bzl/jmh.bzl @@ -41,6 +41,8 @@ # Definitions to run jmh microbenchmarks +load("@rules_java//java:defs.bzl", "java_binary", "java_plugin") + def jmh_java_benchmarks(name, srcs, deps = [], tags = [], plugins = [], **kwargs): """Builds runnable JMH benchmarks. This rule builds a runnable target for one or more JMH benchmarks @@ -48,14 +50,14 @@ def jmh_java_benchmarks(name, srcs, deps = [], tags = [], plugins = [], **kwargs except for main_class. """ plugin_name = "_{}_jmh_annotation_processor".format(name) - native.java_plugin( + java_plugin( name = plugin_name, deps = ["//lib/jmh:jmh"], processor_class = "org.openjdk.jmh.generators.BenchmarkProcessor", visibility = ["//visibility:private"], tags = tags, ) - native.java_binary( + java_binary( name = name, srcs = srcs, main_class = "org.openjdk.jmh.Main", @@ -63,4 +65,4 @@ def jmh_java_benchmarks(name, srcs, deps = [], tags = [], plugins = [], **kwargs plugins = plugins + [plugin_name], tags = tags, **kwargs - )
\ No newline at end of file + ) |