Skip to content

Commit

Permalink
Merge pull request RobotLocomotion#12395 from jwnimmer-tri/new-release
Browse files Browse the repository at this point in the history
workspace: Update externals to latest
  • Loading branch information
jwnimmer-tri authored Nov 26, 2019
2 parents 6aad81a + bbe628d commit cadebe4
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 deletions.
4 changes: 0 additions & 4 deletions common/filesystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,9 @@ namespace drake { namespace filesystem = std::filesystem; }

#else

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#define GHC_FILESYSTEM_FWD
#include "ghc/filesystem.hpp"
#undef GHC_FILESYSTEM_FWD
#pragma GCC diagnostic pop
namespace drake { namespace filesystem = ghc::filesystem; }

#endif
4 changes: 2 additions & 2 deletions tools/workspace/fcl/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ def fcl_repository(
github_archive(
name = name,
repository = "flexible-collision-library/fcl",
commit = "08d0bb25c290a4a5e713851d2a5ac514e4355801",
sha256 = "1b8213a2c25fbcf8a9dbc0fa45bf32c7de222671fafc0bdcdfe248b95dc4c56b", # noqa
commit = "cb60d9eea9bf1fef6376ca8f190f793b52049bc9",
sha256 = "3c6a23ce1ed0269728b8d68f89a0994f431787235b260548d29af621bbdabf25", # noqa
build_file = "@drake//tools/workspace/fcl:package.BUILD.bazel",
mirrors = mirrors,
)
4 changes: 2 additions & 2 deletions tools/workspace/ghc_filesystem/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ def ghc_filesystem_repository(
github_archive(
name = name,
repository = "gulrak/filesystem",
commit = "v1.2.6",
sha256 = "ba752e7f6e468d65520bdd18e22218c9ba841e7bbe5bec9690092b7d46ae7f3e", # noqa
commit = "v1.2.8",
sha256 = "0b818b2a692603c0a939656f7d3d8e0451f853ec1c64d75707e96c1467cb84c0", # noqa
build_file = "@drake//tools/workspace/ghc_filesystem:package.BUILD.bazel", # noqa
mirrors = mirrors,
)
4 changes: 4 additions & 0 deletions tools/workspace/ignition_math/package.BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public_headers_no_gen = [
"include/ignition/math/Box.hh",
"include/ignition/math/Color.hh",
"include/ignition/math/Cylinder.hh",
"include/ignition/math/DiffDriveOdometry.hh",
"include/ignition/math/Filter.hh",
"include/ignition/math/Frustum.hh",
"include/ignition/math/Helpers.hh",
Expand All @@ -104,6 +105,7 @@ public_headers_no_gen = [
"include/ignition/math/Pose3.hh",
"include/ignition/math/Quaternion.hh",
"include/ignition/math/Rand.hh",
"include/ignition/math/RollingMean.hh",
"include/ignition/math/RotationSpline.hh",
"include/ignition/math/SemanticVersion.hh",
"include/ignition/math/SignalStats.hh",
Expand Down Expand Up @@ -170,12 +172,14 @@ cc_binary(
"src/Angle.cc",
"src/AxisAlignedBox.cc",
"src/Color.cc",
"src/DiffDriveOdometry.cc",
"src/Frustum.cc",
"src/Helpers.cc",
"src/Kmeans.cc",
"src/Material.cc",
"src/PID.cc",
"src/Rand.cc",
"src/RollingMean.cc",
"src/RotationSpline.cc",
"src/RotationSplinePrivate.cc",
"src/SemanticVersion.cc",
Expand Down
4 changes: 2 additions & 2 deletions tools/workspace/ignition_math/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ 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.
commit = "5a9c634ae009"
commit = "11bba67b3176" # tag/ignition-math6_6.4.0
bitbucket_archive(
name = name,
repository = "ignitionrobotics/ign-math",
commit = commit,
sha256 = "d8cb6eebd8db3eb60d1d7b8643b35e9275595b8ed9bf12e80854df1d6fdc6fda", # noqa
sha256 = "5b9835f07771946dbc051c4677928bf578a874464d8ada1d6b4d6fa5881e5427", # noqa
strip_prefix = "ignitionrobotics-ign-math-%s" % (commit),
build_file = "@drake//tools/workspace/ignition_math:package.BUILD.bazel", # noqa
mirrors = mirrors,
Expand Down
4 changes: 2 additions & 2 deletions tools/workspace/json/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ def json_repository(
github_archive(
name = name,
repository = "nlohmann/json",
commit = "v3.7.0",
sha256 = "d51a3a8d3efbb1139d7608e28782ea9efea7e7933157e8ff8184901efd8ee760", # noqa
commit = "v3.7.3",
sha256 = "249548f4867417d66ae46b338dfe0a2805f3323e81c9e9b83c89f3adbfde6f31", # noqa
build_file = "@drake//tools/workspace/json:package.BUILD.bazel",
mirrors = mirrors,
)
4 changes: 2 additions & 2 deletions tools/workspace/lcm/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ def lcm_repository(
github_archive(
name = name,
repository = "lcm-proj/lcm",
commit = "c22669c32b40f49a4b5e986480167dbc7783ebd6",
sha256 = "fd1a170bb9c73c63b49d13bb7ddd3dc0fe1316621a67aa4cadec9c33492f3c32", # noqa
commit = "fd9600a573a4feac7607216c00866d5824e9d1e2",
sha256 = "b2f512b473a852f82970899b6dcc2580f17df933fd16b3ca3560db18060effac", # noqa
build_file = "@drake//tools/workspace/lcm:package.BUILD.bazel",
mirrors = mirrors,
)
4 changes: 2 additions & 2 deletions tools/workspace/meshcat/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ def meshcat_repository(
github_archive(
name = name,
repository = "rdeits/meshcat",
commit = "2628e6020f510ffa8fef52123e2941f7fef39428",
sha256 = "a244a6e57125248372e97400063f31877f4871d397a0b1b50ac4b609240c7aec", # noqa
commit = "9fa020fd110a09be44dcb4522b9ce55ef671f34c",
sha256 = "561f04736e98d704a9c8246dd84aedac7ea234d6710a420eca4c61be482c09e2", # noqa
build_file = "@drake//tools/workspace/meshcat:package.BUILD.bazel", # noqa
mirrors = mirrors,
)
4 changes: 2 additions & 2 deletions tools/workspace/sdformat/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ def sdformat_repository(
mirrors = None):
# From the following branch:
# https://bitbucket.org/osrf/sdformat/commits/branch/default
commit = "6bb8c1cc6615" # v8.4.0
commit = "0a5596a6aac2" # tag/sdformat8_8.6.0
bitbucket_archive(
name = name,
repository = "osrf/sdformat",
commit = commit,
sha256 = "02258edb7f97de7b08c39132fc70228dc690aae0efcd0b27f3ea50d059f274e2", # noqa
sha256 = "b5f893a8e44b9580ddc74008c2ffe04c920343bfb04c4b508f5821a609f699e1", # noqa
strip_prefix = "osrf-sdformat-%s" % (commit),
build_file = "@drake//tools/workspace/sdformat:package.BUILD.bazel",
mirrors = mirrors,
Expand Down
4 changes: 2 additions & 2 deletions tools/workspace/semantic_version/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ def semantic_version_repository(
pypi_archive(
name = name,
package = "semantic_version",
version = "2.8.2",
sha256 = "71c716e99086c44d068262b86e4775aa6db7fabee0743e4e33b00fbf6f672585", # noqa
version = "2.8.3",
sha256 = "9dcc6fbad58da3c4d5eee2287025e226bb05c39463f14b741357801baae9dcce", # noqa
strip_prefix = "semantic_version",
build_file = "@drake//tools/workspace/semantic_version:package.BUILD.bazel", # noqa
mirrors = mirrors,
Expand Down

0 comments on commit cadebe4

Please sign in to comment.