aboutsummaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authorcpovirk <cpovirk@google.com>2020-02-27 08:53:21 -0800
committerChris Povirk <beigetangerine@gmail.com>2020-02-27 13:02:13 -0500
commit072ece89562ad5a7e413aabc56cabb4c2384a9c7 (patch)
tree9a99d0bb892d01d686bf91e7818ca07bffc64806 /BUILD
parent355ec532e0f36bd67695fe4697b581a0020743c4 (diff)
downloaddagger2-072ece89562ad5a7e413aabc56cabb4c2384a9c7.tar.gz
Prepare for external Bazel change --incompatible_load_java_rules_from_bzl.
...by load()-ing java_library and other rules wherever we use them. Compare to CL 297412705 for Flogger. This CL includes updating to a new version of bazel_common to avoid --incompatible_load_java_rules_from_bzl errors in bazel_common. See https://github.com/google/bazel-common/pull/104. Note that this CL also changes the way we get zlib() (a dependency of protobuf) from bind() to http_archive(). http_archive() seems to be the more recommended pattern: - https://docs.bazel.build/versions/master/external.html#repository-rules - https://github.com/bazelbuild/bazel/issues/1952 But my immediate motivation was that bind() wasn't working with the new version of protobuf. (The new version of protobuf is necessary to avoid --incompatible_load_java_rules_from_bzl errors inside protobuf. It comes with the new version of bazel_common.) ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=297608393
Diffstat (limited to 'BUILD')
-rw-r--r--BUILD8
1 files changed, 4 insertions, 4 deletions
diff --git a/BUILD b/BUILD
index 3cb50470a..509837b87 100644
--- a/BUILD
+++ b/BUILD
@@ -12,6 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+load("@rules_java//java:defs.bzl", "java_library")
+load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
+load("@google_bazel_common//tools/jarjar:jarjar.bzl", "jarjar_library")
+
package(default_visibility = ["//visibility:public"])
package_group(
@@ -19,8 +23,6 @@ package_group(
packages = ["//..."],
)
-load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
-
java_library(
name = "dagger_with_compiler",
exported_plugins = ["//java/dagger/internal/codegen:component-codegen"],
@@ -49,8 +51,6 @@ android_library(
],
)
-load("@google_bazel_common//tools/jarjar:jarjar.bzl", "jarjar_library")
-
SHADE_RULES = ["rule com.google.auto.common.** dagger.shaded.auto.common.@1"]
jarjar_library(