diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index a284f2090..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. @@ -48,14 +48,13 @@ 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 + 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/.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 diff --git a/.bazelversion b/.bazelversion index a3fcc7121..21c8c7b46 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -7.1.0 +7.1.1 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