From e784965893340b3c0bfdeefa35d5e0f19ea819f9 Mon Sep 17 00:00:00 2001 From: Ivo List Date: Fri, 11 Aug 2023 14:09:05 +0200 Subject: [PATCH] Update rules_go, skylib and catch2 to obtain new release of platforms (#300) * Update rules_go, skylib and catch2 to obtain new release of platforms * Importing less headers * Downgrade catch2, gtest to support older Bazel/STL --- third-party-dependencies/BUILD | 1 + .../third_party/bazel_skylib/direct.bzl | 6 +++--- .../third_party/catch2/catch2.BUILD | 11 ----------- .../third_party/catch2/direct.bzl | 7 +++---- .../third_party/rules_go/direct.bzl | 6 +++--- .../third_party/rules_go/transitive.bzl | 2 +- 6 files changed, 11 insertions(+), 22 deletions(-) delete mode 100644 third-party-dependencies/third_party/catch2/catch2.BUILD diff --git a/third-party-dependencies/BUILD b/third-party-dependencies/BUILD index dd6be5a96..605c56ba5 100644 --- a/third-party-dependencies/BUILD +++ b/third-party-dependencies/BUILD @@ -28,6 +28,7 @@ cc_test( deps = [ ":my_lib", "@catch2", + "@catch2//:catch2_with_main", ], ) diff --git a/third-party-dependencies/third_party/bazel_skylib/direct.bzl b/third-party-dependencies/third_party/bazel_skylib/direct.bzl index e3bbe301e..6cd1c0d27 100644 --- a/third-party-dependencies/third_party/bazel_skylib/direct.bzl +++ b/third-party-dependencies/third_party/bazel_skylib/direct.bzl @@ -9,9 +9,9 @@ def load_bazel_skylib(): maybe( http_archive, name = "bazel_skylib", + sha256 = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa", urls = [ - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz", ], - sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c", ) diff --git a/third-party-dependencies/third_party/catch2/catch2.BUILD b/third-party-dependencies/third_party/catch2/catch2.BUILD deleted file mode 100644 index 7c24f0b4c..000000000 --- a/third-party-dependencies/third_party/catch2/catch2.BUILD +++ /dev/null @@ -1,11 +0,0 @@ -load("@rules_cc//cc:defs.bzl", "cc_library") - -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -cc_library( - name = "catch2", - hdrs = ["single_include/catch2/catch.hpp"], - includes = ["single_include"], -) diff --git a/third-party-dependencies/third_party/catch2/direct.bzl b/third-party-dependencies/third_party/catch2/direct.bzl index 2a9e6d7be..9d89da4e6 100644 --- a/third-party-dependencies/third_party/catch2/direct.bzl +++ b/third-party-dependencies/third_party/catch2/direct.bzl @@ -21,8 +21,7 @@ def load_catch2(): maybe( http_archive, name = "catch2", - url = "https://github.com/catchorg/Catch2/archive/v2.6.1.zip", - sha256 = "cc21033c8085c83a867153982e90514c6b6072bed8cec0e688663cfcdaa8bb32", - strip_prefix = "Catch2-2.6.1", - build_file = "//third_party/catch2:catch2.BUILD", + url = "https://github.com/catchorg/Catch2/archive/refs/tags/v2.13.9.zip", + sha256 = "860e3917f07d7ee75654f86900d50a03acf0047f6fe5ba31d437e1e9cda5b456", + strip_prefix = "Catch2-2.13.9", ) diff --git a/third-party-dependencies/third_party/rules_go/direct.bzl b/third-party-dependencies/third_party/rules_go/direct.bzl index f0d8765ca..3693c711b 100644 --- a/third-party-dependencies/third_party/rules_go/direct.bzl +++ b/third-party-dependencies/third_party/rules_go/direct.bzl @@ -21,9 +21,9 @@ def load_rules_go(): maybe( http_archive, name = "io_bazel_rules_go", - sha256 = "b725e6497741d7fc2d55fcc29a276627d10e43fa5d0bb692692890ae30d98d00", + sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.24.3/rules_go-v0.24.3.tar.gz", - "https://github.com/bazelbuild/rules_go/releases/download/v0.24.3/rules_go-v0.24.3.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", ], ) diff --git a/third-party-dependencies/third_party/rules_go/transitive.bzl b/third-party-dependencies/third_party/rules_go/transitive.bzl index 2dd580f9a..12fdb3e66 100644 --- a/third-party-dependencies/third_party/rules_go/transitive.bzl +++ b/third-party-dependencies/third_party/rules_go/transitive.bzl @@ -8,4 +8,4 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe def load_rules_go_transitive_dependencies(): load_protobuf_transitive_dependencies() go_rules_dependencies() - go_register_toolchains() + go_register_toolchains(version = "1.20.5")