Remove bazel-federation
diff --git a/MODULE.bazel b/MODULE.bazel index ef768b8..e69a7e9 100644 --- a/MODULE.bazel +++ b/MODULE.bazel
@@ -1,7 +1,7 @@ module( name = "rules_java", - compatibility_level = 1, version = "5.4.0", + compatibility_level = 1, ) bazel_dep(name = "platforms", version = "0.0.4") @@ -17,11 +17,8 @@ # Declare remote java tools repos use_repo(toolchains, "remote_java_tools") - use_repo(toolchains, "remote_java_tools_linux") - use_repo(toolchains, "remote_java_tools_windows") - use_repo(toolchains, "remote_java_tools_darwin") # Declare local jdk repo @@ -61,4 +58,4 @@ [register_toolchains("@" + name + "_toolchain_config_repo//:toolchain") for name in REMOTE_JDK_REPOS] # Dev dependencies -bazel_dep(name = "rules_pkg", dev_dependency = True, version = "0.5.1") +bazel_dep(name = "rules_pkg", version = "0.5.1", dev_dependency = True)
diff --git a/WORKSPACE b/WORKSPACE index 4a8ef2b..775ad29 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,28 +3,29 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( - name = "bazel_federation", - sha256 = "0d6893f0d18f417a3324ce7f0ed2e6e5b825d6d5ab42f0f3d7877cb313f36453", - strip_prefix = "bazel-federation-6ad33bc586701e9836a2bf4432c7aff1235b04d2", - type = "zip", - url = "https://github.com/bazelbuild/bazel-federation/archive/6ad33bc586701e9836a2bf4432c7aff1235b04d2.zip", # 2021-07-12 + name = "bazel_skylib", + sha256 = "af87959afe497dc8dfd4c6cb66e1279cb98ccc84284619ebfec27d9c09a903de", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.2.0/bazel-skylib-1.2.0.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.0/bazel-skylib-1.2.0.tar.gz", + ], ) -load("@bazel_federation//:repositories.bzl", "rules_java_deps") +load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") -rules_java_deps() +bazel_skylib_workspace() -load("@bazel_federation//setup:rules_java.bzl", "rules_java_setup") +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -rules_java_setup() +http_archive( + name = "rules_pkg", + sha256 = "a89e203d3cf264e564fcb96b6e06dd70bc0557356eb48400ce4b5d97c2c3720d", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.5.1/rules_pkg-0.5.1.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.5.1/rules_pkg-0.5.1.tar.gz", + ], +) -# -# Dependencies for development of rules_java itself. -# -load("//:internal_deps.bzl", "rules_java_internal_deps") +load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies") -rules_java_internal_deps() - -load("//:internal_setup.bzl", "rules_java_internal_setup") - -rules_java_internal_setup() +rules_pkg_dependencies()
diff --git a/internal_deps.bzl b/internal_deps.bzl deleted file mode 100644 index 1629dac..0000000 --- a/internal_deps.bzl +++ /dev/null
@@ -1,22 +0,0 @@ -# Copyright 2019 The Bazel Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Dependencies that are needed for rules_java tests and tools.""" - -load("@bazel_federation//:repositories.bzl", "bazel_skylib", "rules_pkg") - -def rules_java_internal_deps(): - """Fetches all required dependencies for rules_java tests and tools.""" - bazel_skylib() - rules_pkg()
diff --git a/internal_setup.bzl b/internal_setup.bzl deleted file mode 100644 index 8c8ea19..0000000 --- a/internal_setup.bzl +++ /dev/null
@@ -1,18 +0,0 @@ -# Copyright 2019 The Bazel Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""Setup for rules_java tests and tools.""" - -def rules_java_internal_setup(): - pass # placeholder for the federation