Merge pull request #18343 from protocolbuffers/revert-18339-bazel-rules2

Revert "Cherry-pick changes related to new Bazel rules"

MODULE.bazel

@@ -13,7 +13,7 @@ module(
 # https://bazel.build/versions/6.0.0/build/bzlmod#version-resolution
 # Thus the highest version in their module graph is resolved.
 bazel_dep(name = "abseil-cpp", version = "20230802.0.bcr.1", repo_name = "com_google_absl")
-bazel_dep(name = "bazel_skylib", version = "1.7.0")
+bazel_dep(name = "bazel_skylib", version = "1.4.1")
 bazel_dep(name = "jsoncpp", version = "1.9.5")
 bazel_dep(name = "rules_cc", version = "0.0.9")
 bazel_dep(name = "rules_fuzzing", version = "0.5.2")
@@ -24,7 +24,9 @@ bazel_dep(name = "rules_python", version = "0.28.0")
 bazel_dep(name = "rules_rust", version = "0.45.1")
 bazel_dep(name = "platforms", version = "0.0.8")
 bazel_dep(name = "zlib", version = "1.3.1")
-bazel_dep(name = "bazel_features", version = "1.13.0", repo_name = "proto_bazel_features")
+
+# TODO: remove after toolchain types are moved to protobuf
+bazel_dep(name = "rules_proto", version = "4.0.0")
 
 SUPPORTED_PYTHON_VERSIONS = [
     "3.8",
@@ -68,8 +70,3 @@ crate.spec(
 )
 crate.from_specs()
 use_repo(crate, crate_index = "crates")
-
-# Development dependencies
-bazel_dep(name = "rules_testing", version = "0.6.0", dev_dependency = True)
-# rules_proto are needed for @com_google_protobuf_v25.0 used in //compatibility/... tests
-bazel_dep(name = "rules_proto", version = "4.0.0", dev_dependency = True)

WORKSPACE

@@ -241,12 +241,3 @@ http_archive(
 # Needed as a dependency of @com_google_protobuf_v25.0
 load("@com_google_protobuf_v25.0//:protobuf_deps.bzl", protobuf_v25_deps="protobuf_deps")
 protobuf_v25_deps()
-
-# Needed for testing only
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-http_archive(
-    name = "rules_testing",
-    sha256 = "02c62574631876a4e3b02a1820cb51167bb9cdcdea2381b2fa9d9b8b11c407c4",
-    strip_prefix = "rules_testing-0.6.0",
-    url = "https://github.com/bazelbuild/rules_testing/releases/download/v0.6.0/rules_testing-v0.6.0.tar.gz",
-)

bazel/BUILD.bazel

@@ -40,7 +40,6 @@ bzl_library(
     deps = [
         "//bazel/common:proto_common_bzl",
         "//bazel/common:proto_info_bzl",
-        "//bazel/private:toolchain_helpers_bzl",
         "@rules_python//python:py_info_bzl",
     ],
 )

bazel/common/BUILD → bazel/common/BUILD.bazel

@@ -7,9 +7,7 @@ bzl_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        ":proto_lang_toolchain_info_bzl",
-        "//bazel/private:toolchain_helpers_bzl",
-        "@proto_bazel_features//:features",
+        "//bazel/private:native_bzl",
     ],
 )
 
@@ -31,14 +29,6 @@ bzl_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//bazel/private:native_bzl",
-    ],
-)
-
-filegroup(
-    name = "bazel_osx_p4deps",
-    srcs = glob(["**"]) + ["@proto_bazel_features//:features"],
-    visibility = [
-        "//bazel:__pkg__",
+        ":proto_common.bzl",
     ],
 )