From e3a2310482c54ed026ee7c8079efa44f0e97f935 Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Wed, 15 Jan 2025 15:36:58 -0800
Subject: [PATCH 1/3] Update buildifier_prebuilt -> 8.0.0

---
 MODULE.bazel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index ff99c53..8f274e9 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -11,7 +11,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "platforms", version = "0.0.8")
 
 bazel_dep(name = "aspect_bazel_lib", version = "2.11.0", dev_dependency = True)
-bazel_dep(name = "buildifier_prebuilt", version = "6.1.2", dev_dependency = True)
+bazel_dep(name = "buildifier_prebuilt", version = "8.0.0", dev_dependency = True)
 
 register_toolchains("//toolchains:android_lint_default_toolchain")
 

From 88b363ae4824f9bade41bf21f40564d888f5a089 Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Wed, 15 Jan 2025 15:43:25 -0800
Subject: [PATCH 2/3] Run buildifier.fix

---
 rules/android_lint.bzl      | 12 ++++++------
 rules/android_lint_test.bzl | 12 ++++++------
 rules/impl.bzl              |  1 +
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/rules/android_lint.bzl b/rules/android_lint.bzl
index 4668539..9a37259 100644
--- a/rules/android_lint.bzl
+++ b/rules/android_lint.bzl
@@ -1,20 +1,20 @@
 """Android lint rule."""
 
 load(
-    ":impl.bzl",
-    _process_android_lint_issues = "process_android_lint_issues",
+    "@bazel_skylib//lib:dicts.bzl",
+    _dicts = "dicts",
 )
 load(
     ":attrs.bzl",
     _ATTRS = "ATTRS",
 )
 load(
-    ":providers.bzl",
-    _AndroidLintResultsInfo = "AndroidLintResultsInfo",
+    ":impl.bzl",
+    _process_android_lint_issues = "process_android_lint_issues",
 )
 load(
-    "@bazel_skylib//lib:dicts.bzl",
-    _dicts = "dicts",
+    ":providers.bzl",
+    _AndroidLintResultsInfo = "AndroidLintResultsInfo",
 )
 
 def _impl(ctx):
diff --git a/rules/android_lint_test.bzl b/rules/android_lint_test.bzl
index cc2739f..5cc4994 100644
--- a/rules/android_lint_test.bzl
+++ b/rules/android_lint_test.bzl
@@ -1,20 +1,20 @@
 """Android lint test rule."""
 
 load(
-    ":impl.bzl",
-    _process_android_lint_issues = "process_android_lint_issues",
+    "@bazel_skylib//lib:dicts.bzl",
+    _dicts = "dicts",
 )
 load(
     ":attrs.bzl",
     _ATTRS = "ATTRS",
 )
 load(
-    ":providers.bzl",
-    _AndroidLintResultsInfo = "AndroidLintResultsInfo",
+    ":impl.bzl",
+    _process_android_lint_issues = "process_android_lint_issues",
 )
 load(
-    "@bazel_skylib//lib:dicts.bzl",
-    _dicts = "dicts",
+    ":providers.bzl",
+    _AndroidLintResultsInfo = "AndroidLintResultsInfo",
 )
 
 def _test_impl(ctx):
diff --git a/rules/impl.bzl b/rules/impl.bzl
index fa9444c..f4f8258 100644
--- a/rules/impl.bzl
+++ b/rules/impl.bzl
@@ -1,6 +1,7 @@
 """Rule implementation for Android Lint
 """
 
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 load(
     ":collect_aar_outputs_aspect.bzl",
     _AndroidLintAARInfo = "AndroidLintAARInfo",

From 40bb7e990634ba4919170cab8089c46ff4b1dd55 Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Wed, 15 Jan 2025 15:55:10 -0800
Subject: [PATCH 3/3] Fix bzl_library import issues

---
 rules/BUILD.bazel | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/BUILD.bazel b/rules/BUILD.bazel
index 9fb6137..dd6ef00 100644
--- a/rules/BUILD.bazel
+++ b/rules/BUILD.bazel
@@ -72,6 +72,8 @@ bzl_library(
     deps = [
         ":collect_aar_outputs_aspect",
         "@bazel_skylib//lib:dicts",
+        "@rules_java//java:rules",
+        "@rules_java//java/private:proto_support",
     ],
 )