Merge pull request #16484 from BetsyMcPhail/upgrades

Upgrade externals to latest releases (Feb 2022)
RobotLocomotion · Feb 2, 2022 · 3016205 · 3016205
2 parents 969457a + 6bdf87a
commit 3016205
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 24 deletions.
diff --git a/solvers/scs_solver.cc b/solvers/scs_solver.cc
@@ -726,7 +726,7 @@ void ScsSolver::DoSolve(
   // This guard will free cone, scs_problem_data, and scs_stgs (together with
   // their instantiated members) upon return from the DoSolve function.
   ScopeExit scs_free_guard([&cone, &scs_problem_data, &scs_stgs]() {
-    scs_free_data(scs_problem_data, cone, scs_stgs);
+    _scs_free_data(scs_problem_data, cone, scs_stgs);
   });
 
   // Set the parameters to default values.
@@ -797,7 +797,7 @@ void ScsSolver::DoSolve(
 
   ScsSolution* scs_sol =
       static_cast<ScsSolution*>(scs_calloc(1, sizeof(ScsSolution)));
-  ScopeExit sol_guard([&scs_sol]() { scs_free_sol(scs_sol); });
+  ScopeExit sol_guard([&scs_sol]() { _scs_free_sol(scs_sol); });
 
   ScsSolverDetails& solver_details =
       result->SetSolverDetailsType<ScsSolverDetails>();

diff --git a/tools/workspace/buildifier/repository.bzl b/tools/workspace/buildifier/repository.bzl
@@ -32,17 +32,17 @@ def _impl(repository_ctx):
     # Enumerate the possible binaries.  Note that the buildifier binaries are
     # fully statically linked, so the particular distribution doesn't matter,
     # only the kernel.
-    version = "4.2.4"
+    version = "4.2.5"
     darwin_urls = [
         x.format(version = version, filename = "buildifier-darwin-amd64")
         for x in repository_ctx.attr.mirrors.get("buildifier")
     ]
-    darwin_sha256 = "97be071d70249b06cfe2dc1b2fa3f846c991400911b7a5e418c9082373b61736"  # noqa
+    darwin_sha256 = "757f246040aceb2c9550d02ef5d1f22d3ef1ff53405fe76ef4c6239ef1ea2cc1"  # noqa
     linux_urls = [
         x.format(version = version, filename = "buildifier-linux-amd64")
         for x in repository_ctx.attr.mirrors.get("buildifier")
     ]
-    linux_sha256 = "b0b15dc1d59ec75d8720ba7ae5363cac349bad54a86866367f17808c68790b33"  # noqa
+    linux_sha256 = "f94e71b22925aff76ce01a49e1c6c6d31f521bbbccff047b81f2ea01fd01a945"  # noqa
 
     # Choose which binary to use.
     os_result = determine_os(repository_ctx)

diff --git a/tools/workspace/common_robotics_utilities/repository.bzl b/tools/workspace/common_robotics_utilities/repository.bzl
@@ -16,8 +16,8 @@ def common_robotics_utilities_repository(
         # package.BUILD.bazel and BUILD.bazel in drake. Tests may have been
         # updated in ToyotaResearchInstitute/common_robotics_utilities/test/ or
         # ToyotaResearchInstitute/common_robotics_utilities/CMakeLists.txt.ros2
-        commit = "17aabe9898494dbf2d61228ad5cef6fb00d06f94",
-        sha256 = "014b9d082d6c65a997aacad56d0eb0c937be190daa62796b583384524c4f9c73",  # noqa
+        commit = "d4f55193d9d44ba26c672f00931644c97b7cf3a5",
+        sha256 = "bb6fe78f416d19823d93156752647d973f87e3a4f66a53a23f85414c8bb99e80",  # noqa
         build_file = "@drake//tools/workspace/common_robotics_utilities:package.BUILD.bazel",  # noqa
         mirrors = mirrors,
     )
diff --git a/tools/workspace/dm_control/repository.bzl b/tools/workspace/dm_control/repository.bzl
@@ -8,8 +8,8 @@ def dm_control_repository(
     github_archive(
         name = name,
         repository = "deepmind/dm_control",
-        commit = "2346e9f6c8fb15e6ea8d8f8bffd0a23854e650ce",
-        sha256 = "c4aabeb47bf1332a7b407766800aac3944e42a4d67259a766de15eb4417df8ee",  # noqa
+        commit = "fe4449606742a7b8bec81930790b98244cddc538",
+        sha256 = "f1c8a58f1a30f4d8e414c1cf6e18426bf7b2df61cae3dea127f2884033d502eb",  # noqa
         build_file = "@drake//tools/workspace/dm_control:package.BUILD.bazel",
         mirrors = mirrors,
     )
diff --git a/tools/workspace/googlebenchmark/repository.bzl b/tools/workspace/googlebenchmark/repository.bzl
@@ -8,7 +8,7 @@ def googlebenchmark_repository(
     github_archive(
         name = name,
         repository = "google/benchmark",
-        commit = "v1.6.0",
-        sha256 = "1f71c72ce08d2c1310011ea6436b31e39ccab8c2db94186d26657d41747c85d6",  # noqa
+        commit = "v1.6.1",
+        sha256 = "6132883bc8c9b0df5375b16ab520fac1a85dc9e4cf5be59480448ece74b278d4",  # noqa
         mirrors = mirrors,
     )
diff --git a/tools/workspace/ignition_math/package.BUILD.bazel b/tools/workspace/ignition_math/package.BUILD.bazel
@@ -33,7 +33,7 @@ config_setting(
 
 PROJECT_MAJOR = 6
 
-PROJECT_MINOR = 8
+PROJECT_MINOR = 10
 
 PROJECT_PATCH = 0
 

diff --git a/tools/workspace/ignition_math/repository.bzl b/tools/workspace/ignition_math/repository.bzl
@@ -7,15 +7,11 @@ def ignition_math_repository(
         mirrors = None):
     # When updating this commit, also remember to adjust the PROJECT_*
     # constants in ./package.BUILD.bazel to match the new version number.
-    # TODO(jwnimmer-tri) Until we remove the CMake config stuff on 2021-12-01,
-    # any version upgrades will also need to manually fix up the *.cmake files
-    # in this directory. Once remove the *.cmake installation rules, we should
-    # also nix this comment.
     github_archive(
         name = name,
         repository = "ignitionrobotics/ign-math",
-        commit = "ignition-math6_6.9.2",
-        sha256 = "0b932e633d550ab2d25cd12c62b999a2ccfb141035fff1de87147e103e271f50",  # noqa
+        commit = "ignition-math6_6.10.0",
+        sha256 = "9e00284cd6d51afe190165b2b44258e19bd4a28781cbacf21fd6b0bae43c16aa",  # noqa
         build_file = "@drake//tools/workspace/ignition_math:package.BUILD.bazel",  # noqa
         mirrors = mirrors,
     )
diff --git a/tools/workspace/ros_xacro/repository.bzl b/tools/workspace/ros_xacro/repository.bzl
@@ -11,8 +11,8 @@ def ros_xacro_repository(
         # N.B. Even though 1.13.x series is not the highst-numbered release, we
         # are using it here because it aligns with the ROS Melodic version
         # released for Ubuntu 18.04.
-        commit = "1.13.14",
-        sha256 = "6e25ad71600f710244048f8a0e6c19e38d11546a77dbf499fa251c2d217b53e4",  # noqa
+        commit = "1.13.16",
+        sha256 = "25a61daf74509ba3413c3f6425f4461b6276e633b519bb204cd24d898ee20059",  # noqa
         build_file = "@drake//tools/workspace/ros_xacro:package.BUILD.bazel",
         patches = [
             "@drake//tools/workspace/ros_xacro:disable-console-print.patch",

diff --git a/tools/workspace/scs/repository.bzl b/tools/workspace/scs/repository.bzl
@@ -9,8 +9,8 @@ def scs_repository(
         name = name,
         repository = "cvxgrp/scs",
         # When updating this commit, see drake/tools/workspace/qdldl/README.md.
-        commit = "v3.0.0",
-        sha256 = "95ab61495db72b18d6bb690cd2ae2ce88134d078c473da6cb8750857ea17f732",  # noqa
+        commit = "3.1.0",
+        sha256 = "90a7e58364ed3ea3375945a7f6f013de81c46100df80664a18f1c9b45a56be9c",  # noqa
         build_file = "@drake//tools/workspace/scs:package.BUILD.bazel",
         patches = [
             # Fix some include paths for our build of QDLDL.

diff --git a/tools/workspace/uwebsockets/repository.bzl b/tools/workspace/uwebsockets/repository.bzl
@@ -8,6 +8,9 @@ def uwebsockets_repository(
     github_archive(
         name = name,
         repository = "uNetworking/uWebSockets",
+        # TODO(BetsyMcPhail) v20.11.0 requires a header not available on
+        # the GCC7 used on Ubuntu 18.04 (Bionic). Do not upgrade until
+        # Bionic support is dropped.
         commit = "v20.9.0",
         sha256 = "91897568291a2081ffc1ae27c354446cc130c168a25892b2289f25e185af8676",  # noqa
         build_file = "@drake//tools/workspace/uwebsockets:package.BUILD.bazel",

diff --git a/tools/workspace/voxelized_geometry_tools/repository.bzl b/tools/workspace/voxelized_geometry_tools/repository.bzl
@@ -14,8 +14,8 @@ def voxelized_geometry_tools_repository(
         repository = "ToyotaResearchInstitute/voxelized_geometry_tools",
         # When updating, ensure that any new unit tests are reflected in
         # package.BUILD.bazel and BUILD.bazel in drake.
-        commit = "3928899e8493b9a812bb7b0998fd5fe9a5c98b8f",
-        sha256 = "f3d9841fc156da574470fe7c650ef76a9cc76da2dfcae1738657d67f1a921848",  # noqa
+        commit = "a439f6db09ec5fdc61ff44e79c1fa7b87469ab49",
+        sha256 = "ba9918ca9f56f3572cfdf4b1e76336bb27246d29aa525390ce9eae70de957602",  # noqa
         build_file = "@drake//tools/workspace/voxelized_geometry_tools:package.BUILD.bazel",  # noqa
         mirrors = mirrors,
     )