Prepare for --incompatible_load_java_rules_from_bzl.

...by load()-ing java_library and other rules wherever we use them. Fixes #122 Compare to CL 296727595 for bazel_common. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=297412705
google · Feb 27, 2020 · 561c0cb · 561c0cb
1 parent 921185b
commit 561c0cb
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 34 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -16,8 +16,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "google_bazel_common",
-    strip_prefix = "bazel-common-76d25d1921c2534c7654aebb2e7cf687cfb469aa",
-    urls = ["https://github.com/google/bazel-common/archive/76d25d1921c2534c7654aebb2e7cf687cfb469aa.zip"],
+    sha256 = "18f266d921db1daa2ee9837343938e37fa21e0a8b6a0e43a67eda4c30f62b812",
+    strip_prefix = "bazel-common-eb5c7e5d6d2c724fe410792c8be9f59130437e4a",
+    urls = ["https://github.com/google/bazel-common/archive/eb5c7e5d6d2c724fe410792c8be9f59130437e4a.zip"],
 )
 
 load("@google_bazel_common//:workspace_defs.bzl", "google_common_workspace_rules")

diff --git a/api/BUILD b/api/BUILD
@@ -4,6 +4,12 @@
 # Description:
 #   Flogger core libraries (google.github.io/flogger).
 
+load("@google_bazel_common//testing:test_defs.bzl", "gen_java_tests")
+load("@google_bazel_common//tools/jarjar:jarjar.bzl", "jarjar_library")
+load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
+load("@rules_java//java:defs.bzl", "java_binary", "java_import", "java_library")
+load("//tools:maven.bzl", "pom_file")
+
 package(default_visibility = ["//:internal"])
 
 CHECKS_SRCS = ["src/main/java/com/google/common/flogger/util/Checks.java"]
@@ -77,8 +83,6 @@ java_library(
     ],
 )
 
-load("//tools:maven.bzl", "pom_file")
-
 # This pom file and the two jarjar libraries below must contain the targets/jars for anything
 # that's released in open-source. If new targets are refactored out in the main codebase, they
 # must be included here.
@@ -101,8 +105,6 @@ pom_file(
     ],
 )
 
-load("@google_bazel_common//tools/jarjar:jarjar.bzl", "jarjar_library")
-
 jarjar_library(
     name = "merged_api",
     jars = [
@@ -136,8 +138,6 @@ jarjar_library(
     ],
 )
 
-load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
-
 javadoc_library(
     name = "api_javadoc",
     srcs = glob(
@@ -356,8 +356,6 @@ filegroup(
 
 # ---- Unit Tests ----
 
-load("@google_bazel_common//testing:test_defs.bzl", "gen_java_tests")
-
 gen_java_tests(
     name = "api_tests",
     srcs = glob(

diff --git a/google/BUILD b/google/BUILD
@@ -6,6 +6,11 @@
 # package).
 #
 
+load("@google_bazel_common//testing:test_defs.bzl", "gen_java_tests")
+load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
+load("@rules_java//java:defs.bzl", "java_library")
+load("//tools:maven.bzl", "pom_file")
+
 package(default_visibility = ["//:internal"])
 
 GOOGLE_LOGGER_SRCS = glob(["src/main/java/com/google/common/flogger/*.java"])
@@ -26,17 +31,13 @@ java_library(
     ],
 )
 
-load("//tools:maven.bzl", "pom_file")
-
 pom_file(
     name = "google_logger_pom",
     artifact_id = "google-extensions",
     artifact_name = "Google Logger",
     targets = [":flogger"],
 )
 
-load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
-
 javadoc_library(
     name = "flogger_javadoc",
     srcs = GOOGLE_LOGGER_SRCS,
@@ -51,8 +52,6 @@ filegroup(
 
 # ---- Tests ----
 
-load("@google_bazel_common//testing:test_defs.bzl", "gen_java_tests")
-
 gen_java_tests(
     name = "google_logger_tests",
     srcs = glob(["src/test/java/**/*.java"]),

diff --git a/log4j/BUILD b/log4j/BUILD
@@ -4,6 +4,11 @@
 # Description:
 #   Flogger log4j backend (google.github.io/flogger).
 
+load("@google_bazel_common//testing:test_defs.bzl", "gen_java_tests")
+load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
+load("@rules_java//java:defs.bzl", "java_library")
+load("//tools:maven.bzl", "pom_file")
+
 package(default_visibility = ["//:internal"])
 
 LOG4J_BACKEND_SRCS = glob(["src/main/java/**/*.java"])
@@ -20,17 +25,13 @@ java_library(
     ],
 )
 
-load("//tools:maven.bzl", "pom_file")
-
 pom_file(
     name = "pom",
     artifact_id = "flogger-log4j-backend",
     artifact_name = "Flogger Log4j Backend",
     targets = [":log4j_backend"],
 )
 
-load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
-
 javadoc_library(
     name = "javadoc",
     srcs = LOG4J_BACKEND_SRCS,
@@ -40,8 +41,6 @@ javadoc_library(
 
 # ---- Unit Tests ----
 
-load("@google_bazel_common//testing:test_defs.bzl", "gen_java_tests")
-
 gen_java_tests(
     name = "log4j_tests",
     srcs = glob(["src/test/java/**/*.java"]),

diff --git a/log4j2/BUILD b/log4j2/BUILD
@@ -3,6 +3,11 @@
 # Description:
 #   Flogger log4j2 backend (google.github.io/flogger).
 
+load("@google_bazel_common//testing:test_defs.bzl", "gen_java_tests")
+load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
+load("@rules_java//java:defs.bzl", "java_library")
+load("//tools:maven.bzl", "pom_file")
+
 package(default_visibility = ["//:internal"])
 
 LOG4J2_BACKEND_SRCS = glob(["src/main/java/**/*.java"])
@@ -19,17 +24,13 @@ java_library(
     ],
 )
 
-load("//tools:maven.bzl", "pom_file")
-
 pom_file(
     name = "pom",
     artifact_id = "flogger-log4j2-backend",
     artifact_name = "Flogger Log4j2 Backend",
     targets = [":log4j2_backend"],
 )
 
-load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
-
 javadoc_library(
     name = "javadoc",
     srcs = LOG4J2_BACKEND_SRCS,
@@ -39,8 +40,6 @@ javadoc_library(
 
 # ---- Unit Tests ----
 
-load("@google_bazel_common//testing:test_defs.bzl", "gen_java_tests")
-
 gen_java_tests(
     name = "log4j2_tests",
     srcs = glob(["src/test/java/**/*.java"]),

diff --git a/slf4j/BUILD b/slf4j/BUILD
@@ -3,6 +3,11 @@
 # Description:
 #   Flogger slf4j backend (google.github.io/flogger).
 
+load("@google_bazel_common//testing:test_defs.bzl", "gen_java_tests")
+load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
+load("@rules_java//java:defs.bzl", "java_library")
+load("//tools:maven.bzl", "pom_file")
+
 package(default_visibility = ["//:internal"])
 
 SLF4J_BACKEND_SRCS = glob(["src/main/java/**/*.java"])
@@ -19,17 +24,13 @@ java_library(
     ],
 )
 
-load("//tools:maven.bzl", "pom_file")
-
 pom_file(
     name = "pom",
     artifact_id = "flogger-slf4j-backend",
     artifact_name = "Flogger SLF4J Backend",
     targets = [":slf4j_backend"],
 )
 
-load("@google_bazel_common//tools/javadoc:javadoc.bzl", "javadoc_library")
-
 javadoc_library(
     name = "javadoc",
     srcs = SLF4J_BACKEND_SRCS,
@@ -39,8 +40,6 @@ javadoc_library(
 
 # ---- Unit Tests ----
 
-load("@google_bazel_common//testing:test_defs.bzl", "gen_java_tests")
-
 gen_java_tests(
     name = "slf4j_tests",
     srcs = glob(["src/test/java/**/*.java"]),