From 96f3968c53106c7efbb83e2b634a2d21cc15ce06 Mon Sep 17 00:00:00 2001 From: Vaidas Pilkauskas Date: Tue, 9 Feb 2021 21:00:28 +0200 Subject: [PATCH] Remove JMH binds (#1207) --- jmh/BUILD | 14 +++++++------- jmh/jmh.bzl | 28 ---------------------------- 2 files changed, 7 insertions(+), 35 deletions(-) diff --git a/jmh/BUILD b/jmh/BUILD index 79c71205e..f4932c292 100644 --- a/jmh/BUILD +++ b/jmh/BUILD @@ -17,7 +17,7 @@ declare_deps_provider( deps_id = "jmh_core", visibility = ["//visibility:public"], deps = [ - "//external:io_bazel_rules_scala/dependency/jmh/jmh_core", + "@io_bazel_rules_scala_org_openjdk_jmh_jmh_core", ], ) @@ -26,8 +26,8 @@ declare_deps_provider( deps_id = "jmh_classpath", visibility = ["//visibility:public"], deps = [ - "//external:io_bazel_rules_scala/dependency/jmh/net_sf_jopt_simple_jopt_simple", - "//external:io_bazel_rules_scala/dependency/jmh/org_apache_commons_commons_math3", + "@io_bazel_rules_scala_net_sf_jopt_simple_jopt_simple", + "@io_bazel_rules_scala_org_apache_commons_commons_math3", ], ) @@ -36,10 +36,10 @@ declare_deps_provider( deps_id = "benchmark_generator", visibility = ["//visibility:public"], deps = [ - "//external:io_bazel_rules_scala/dependency/jmh/jmh_core", - "//external:io_bazel_rules_scala/dependency/jmh/jmh_generator_asm", - "//external:io_bazel_rules_scala/dependency/jmh/jmh_generator_reflection", "//src/java/io/bazel/rulesscala/jar", + "@io_bazel_rules_scala_org_openjdk_jmh_jmh_core", + "@io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm", + "@io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_reflection", ], ) @@ -48,7 +48,7 @@ declare_deps_provider( deps_id = "benchmark_generator_runtime", visibility = ["//visibility:public"], deps = [ - "//external:io_bazel_rules_scala/dependency/jmh/org_ows2_asm_asm", + "@io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm", ], ) diff --git a/jmh/jmh.bzl b/jmh/jmh.bzl index e929fd534..71562ff00 100644 --- a/jmh/jmh.bzl +++ b/jmh/jmh.bzl @@ -23,34 +23,6 @@ def jmh_repositories( overriden_artifacts = {}, ) - native.bind( - name = "io_bazel_rules_scala/dependency/jmh/jmh_core", - actual = "@io_bazel_rules_scala_org_openjdk_jmh_jmh_core//jar", - ) - native.bind( - name = "io_bazel_rules_scala/dependency/jmh/jmh_generator_asm", - actual = "@io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm//jar", - ) - native.bind( - name = "io_bazel_rules_scala/dependency/jmh/jmh_generator_reflection", - actual = - "@io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_reflection//jar", - ) - native.bind( - name = "io_bazel_rules_scala/dependency/jmh/org_ows2_asm_asm", - actual = "@io_bazel_rules_scala_org_ows2_asm_asm//jar", - ) - native.bind( - name = - "io_bazel_rules_scala/dependency/jmh/net_sf_jopt_simple_jopt_simple", - actual = "@io_bazel_rules_scala_net_sf_jopt_simple_jopt_simple//jar", - ) - native.bind( - name = - "io_bazel_rules_scala/dependency/jmh/org_apache_commons_commons_math3", - actual = "@io_bazel_rules_scala_org_apache_commons_commons_math3//jar", - ) - native.register_toolchains("@io_bazel_rules_scala//jmh:jmh_toolchain") def _scala_generate_benchmark(ctx):