From 3cdfe62841afe106c18feafecd81020863449d19 Mon Sep 17 00:00:00 2001 From: Corbin McNeely-Smith <58151731+restingbull@users.noreply.github.com> Date: Sun, 1 Dec 2024 19:46:29 -0600 Subject: [PATCH] Fix module definitions. rbe_preconfig -- unneeded? --- MODULE.bazel | 8 ++++---- third_party/buildkite_config/MODULE.bazel | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index a7a481bef..cf5e35b09 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -7,7 +7,7 @@ module( bazel_dep(name = "platforms", version = "0.0.10") bazel_dep(name = "bazel_skylib", version = "1.7.1") -bazel_dep(name = "rules_java", version = "7.2.0") +bazel_dep(name = "rules_java", version = "7.6.5") bazel_dep(name = "rules_python", version = "0.23.1") bazel_dep(name = "rules_cc", version = "0.0.9") bazel_dep(name = "rules_android", version = "0.1.1") @@ -15,7 +15,6 @@ bazel_dep(name = "rules_android", version = "0.1.1") rules_kotlin_extensions = use_extension("//src/main/starlark/core/repositories:bzlmod_setup.bzl", "rules_kotlin_extensions") use_repo( rules_kotlin_extensions, - "bazelci_rules", "com_github_google_ksp", "com_github_jetbrains_kotlin", "com_github_jetbrains_kotlin_git", @@ -53,8 +52,9 @@ use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools") bazel_dep(name = "rules_jvm_external", version = "5.3") bazel_dep(name = "bazel_ci_rules", version = "1.0.0") -use_repo_rule("@bazel_ci_rules//rules:rbe_repo.bzl", "rbe_preconfig") +rbe_preconfig = use_repo_rule("@bazel_ci_rules//:rbe_repo.bzl", "rbe_preconfig") rbe_preconfig( + name = "rbe_preconfig", toolchain = "ubuntu2004", ) @@ -118,4 +118,4 @@ use_repo( ) bazel_dep(name = "buildkite_config") -local_path_override("buildkite_config", "//third_party/buildkite_config") +local_path_override(module_name = "buildkite_config", path = "third_party/buildkite_config") diff --git a/third_party/buildkite_config/MODULE.bazel b/third_party/buildkite_config/MODULE.bazel index e69de29bb..d07887cec 100644 --- a/third_party/buildkite_config/MODULE.bazel +++ b/third_party/buildkite_config/MODULE.bazel @@ -0,0 +1,3 @@ +module( + name = "buildkite_config", +)