From 928902abcc84330721f1c7bd51a3d252cf1ff357 Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Tue, 26 Mar 2024 23:50:42 -0700
Subject: [PATCH 1/3] Enable Bazel 5.x test suite

---
 .bazelci/presubmit.yml    | 16 ++++++++--------
 examples/android/.bazelrc |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 examples/android/.bazelrc

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index a284f2090..c3632477b 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -48,14 +48,14 @@ tasks:
       # cannot be used with remote builds)
       - "--strategy=KotlinCompile=remote"
       - "--config=rbe"
-# TODO: Enable these tests once this example is building against the release rules_kotlin binary
-#  example-android-5.x:
-#    name: "Example - Android using Bazel 5.x"
-#    platform: ubuntu1804
-#    working_directory: examples/android
-#    bazel: 5.4.1
-#    test_targets:
-#      - //app:all
+  # TODO: Enable these tests once this example is building against the release rules_kotlin binary
+  example-android-5.x:
+    name: "Example - Android using Bazel 5.x"
+    platform: ubuntu1804
+    working_directory: examples/android
+    bazel: 5.4.1
+    test_targets:
+      - //app:all
   example-android-6.x:
     name: "Example - Android using Bazel 6.x"
     platform: ubuntu1804
diff --git a/examples/android/.bazelrc b/examples/android/.bazelrc
deleted file mode 100644
index 96cefad8a..000000000
--- a/examples/android/.bazelrc
+++ /dev/null
@@ -1 +0,0 @@
-common --lockfile_mode=off
\ No newline at end of file

From 3bab7750ba44bcfa79d4d8c3c5f9e4057a6a500f Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Tue, 26 Mar 2024 23:56:04 -0700
Subject: [PATCH 2/3] Don't pass enable_bzlmod by default

---
 .bazelci/presubmit.yml | 1 -
 .bazelrc               | 2 --
 2 files changed, 3 deletions(-)

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index c3632477b..0ca16bd7f 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -48,7 +48,6 @@ tasks:
       # cannot be used with remote builds)
       - "--strategy=KotlinCompile=remote"
       - "--config=rbe"
-  # TODO: Enable these tests once this example is building against the release rules_kotlin binary
   example-android-5.x:
     name: "Example - Android using Bazel 5.x"
     platform: ubuntu1804
diff --git a/.bazelrc b/.bazelrc
index 382ca66b1..de8114c4a 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,5 +1,3 @@
-common --enable_bzlmod=true
-
 common:rbe --java_runtime_version=11
 common:rbe --tool_java_runtime_version=11
 

From 2beb99f8c13add94beacf2ac47fedca4a0634c6e Mon Sep 17 00:00:00 2001
From: Ben Lee <ben@ben.cm>
Date: Tue, 26 Mar 2024 23:57:46 -0700
Subject: [PATCH 3/3] Update Bzl

---
 .bazelci/presubmit.yml | 2 +-
 .bazelversion          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 0ca16bd7f..5d7d7ddc5 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -1,6 +1,6 @@
 ---
 validate_config: 1
-bazel: 7.1.0
+bazel: 7.1.1
 buildifier:
   version: 6.4.0
   # no lint warnings for the moment. They are basically a smoke alarm in hell.
diff --git a/.bazelversion b/.bazelversion
index a3fcc7121..21c8c7b46 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-7.1.0
+7.1.1