From 10a18cc12c2ebbcc0ed3aac1e61ae75d9bfc69d8 Mon Sep 17 00:00:00 2001
From: Matthew Sotoudeh <masotoudeh@ucdavis.edu>
Date: Mon, 21 Oct 2019 14:13:47 -0700
Subject: Removed references to bazel_version

---
 bazel/repository_defs.bzl   | 15 ---------------
 bazel/upb_proto_library.bzl | 29 -----------------------------
 bazel/workspace_deps.bzl    |  5 -----
 3 files changed, 49 deletions(-)
 delete mode 100644 bazel/repository_defs.bzl

diff --git a/bazel/repository_defs.bzl b/bazel/repository_defs.bzl
deleted file mode 100644
index 7b6e78e..0000000
--- a/bazel/repository_defs.bzl
+++ /dev/null
@@ -1,15 +0,0 @@
-# A hacky way to work around the fact that native.bazel_version is only
-# available from WORKSPACE macros, not BUILD macros or rules.
-#
-# Hopefully we can remove this if/when this is fixed:
-#   https://github.com/bazelbuild/bazel/issues/8305
-
-def _impl(repository_ctx):
-    s = "bazel_version = \"" + native.bazel_version + "\""
-    repository_ctx.file("bazel_version.bzl", s)
-    repository_ctx.file("BUILD", "")
-
-bazel_version_repository = repository_rule(
-    implementation = _impl,
-    local = True,
-)
diff --git a/bazel/upb_proto_library.bzl b/bazel/upb_proto_library.bzl
index cc6bcff..2913633 100644
--- a/bazel/upb_proto_library.bzl
+++ b/bazel/upb_proto_library.bzl
@@ -8,7 +8,6 @@ load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 
 # copybara:strip_for_google3_begin
 load("@bazel_skylib//lib:versions.bzl", "versions")
-load("@bazel_version//:bazel_version.bzl", "bazel_version")
 # copybara:strip_end
 
 # Generic support code #########################################################
@@ -74,34 +73,6 @@ def _cc_library_func(ctx, name, hdrs, srcs, dep_ccinfos):
         unsupported_features = ctx.disabled_features,
     )
 
-    # copybara:strip_for_google3_begin
-    if bazel_version == "0.24.1":
-        # Compatibility code until gRPC is on 0.25.2 or later.
-        compilation_info = cc_common.compile(
-            ctx = ctx,
-            feature_configuration = feature_configuration,
-            cc_toolchain = toolchain,
-            srcs = srcs,
-            hdrs = hdrs,
-            compilation_contexts = compilation_contexts,
-        )
-        linking_info = cc_common.link(
-            ctx = ctx,
-            feature_configuration = feature_configuration,
-            cc_toolchain = toolchain,
-            cc_compilation_outputs = compilation_info.cc_compilation_outputs,
-            linking_contexts = linking_contexts,
-        )
-        return CcInfo(
-            compilation_context = compilation_info.compilation_context,
-            linking_context = linking_info.linking_context,
-        )
-
-    if not versions.is_at_least("0.25.2", bazel_version):
-        fail("upb requires Bazel >=0.25.2 or 0.24.1")
-
-    # copybara:strip_end
-
     blaze_only_args = {}
 
     if not _is_bazel:
diff --git a/bazel/workspace_deps.bzl b/bazel/workspace_deps.bzl
index 39bf524..a60b0f5 100644
--- a/bazel/workspace_deps.bzl
+++ b/bazel/workspace_deps.bzl
@@ -1,13 +1,8 @@
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-load("//bazel:repository_defs.bzl", "bazel_version_repository")
 
 def upb_deps():
-    bazel_version_repository(
-        name = "bazel_version",
-    )
-
     git_repository(
         name = "absl",
         commit = "070f6e47b33a2909d039e620c873204f78809492",
-- 
cgit v1.2.3