diff --git a/WORKSPACE b/WORKSPACE index 93e07c04b2..4a673e6f5a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -111,9 +111,9 @@ http_archive( http_archive( name = "rules_doxygen", - sha256 = "5d154d3d011208510392b5aee8ea23ec61ab858cc1f3382b6eb8c729d3b4b336", - strip_prefix = "rules_doxygen-2.4.2", - url = "https://github.com/TendTo/rules_doxygen/releases/download/2.4.2/rules_doxygen-2.4.2.tar.gz", + sha256 = "ab17caade4e4427578b545fa2890c55ee3898f8a7a5597416230227bbec8e61a", + strip_prefix = "rules_doxygen-2.5.0", + url = "https://github.com/TendTo/rules_doxygen/releases/download/2.5.0/rules_doxygen-2.5.0.tar.gz", ) # This gives us a repository layout which matches what normal BCR modules expect. @@ -418,7 +418,7 @@ bazel_skylib_workspace() load("@rules_doxygen//:extensions.bzl", "doxygen_repository") -# Download the os specific version 1.12.0 of doxygen supporting all the indicated platforms +# Download the os specific version 1.15.0 of doxygen supporting all the indicated platforms doxygen_repository( name = "doxygen", executables = [ @@ -432,13 +432,13 @@ doxygen_repository( "linux", ], sha256s = [ - "07f1c92cbbb32816689c725539c0951f92c6371d3d7f66dfa3192cbe88dd3138", - "6ace7dde967d41f4e293d034a67eb2c7edd61318491ee3131112173a77344001", - "3c42c3f3fb206732b503862d9c9c11978920a8214f223a3950bbf2520be5f647", + "44658b9cc5c91749e6e3cc426ba63e2550b4a4a7619065acd77029aa234719c6", + "b7630eaa0d97bb50b0333929ef5dc1c18f9e38faf1e22dca3166189a9718faf0", + "0ec2e5b2c3cd82b7106d19cb42d8466450730b8cb7a9e85af712be38bf4523a1", ], versions = [ - "1.12.0", - "1.12.0", - "1.12.0", + "1.15.0", + "1.15.0", + "1.15.0", ], ) diff --git a/docs/build.gradle b/docs/build.gradle index e34741b093..89cb8148fd 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -62,7 +62,7 @@ doxygen { // Note: has no effect if not on an x86_64 platform - you need to // have a global install available on your PATH for the Doxygen // plugin to run. - executableByVersion('1.12.0') + executableByVersion('1.15.0') String arch = System.getProperty("os.arch"); if (!(arch.equals("x86_64") || arch.equals("amd64"))) { diff --git a/upstream_utils/json_patches/0005-Fix-Doxygen-warnings.patch b/upstream_utils/json_patches/0005-Fix-Doxygen-warnings.patch index f1909b2417..43bf9b9c25 100644 --- a/upstream_utils/json_patches/0005-Fix-Doxygen-warnings.patch +++ b/upstream_utils/json_patches/0005-Fix-Doxygen-warnings.patch @@ -4,11 +4,11 @@ Date: Tue, 27 May 2025 23:39:02 -0400 Subject: [PATCH 5/5] Fix Doxygen warnings --- - include/nlohmann/json.hpp | 31 ++++++------------------------- - 1 file changed, 6 insertions(+), 25 deletions(-) + include/nlohmann/json.hpp | 33 +++++++-------------------------- + 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp -index a89e2151e589663ba487a462c3d15cd247ff06cf..a5b4f8b4a118c1f5763ec6ba596a8a2d3d5791eb 100644 +index a89e2151e589663ba487a462c3d15cd247ff06cf..d5d6d6d51f1df4fd030e69a54941fe0911bdba93 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -161,7 +161,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec @@ -75,6 +75,15 @@ index a89e2151e589663ba487a462c3d15cd247ff06cf..a5b4f8b4a118c1f5763ec6ba596a8a2d @sa see @ref get_ptr() for explicit pointer-member access +@@ -1869,7 +1857,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec + @brief get a value (implicit) + + Implicit type conversion between the JSON value and a compatible value. +- The call is realized by calling @ref get() const. ++ The call is realized by calling @ref get(). + + @tparam ValueType non-pointer type compatible to the JSON value, for + instance `int` for JSON integer numbers, `bool` for JSON booleans, or @@ -1883,14 +1871,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec to the JSON value type (e.g., the JSON value is of type boolean, but a string is requested); see example below diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.h b/wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.h index 40588dd58a..23bb6d9cab 100644 --- a/wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.h +++ b/wpilibc/src/main/native/include/frc/smartdashboard/SendableChooser.h @@ -84,8 +84,8 @@ class SendableChooser : public SendableChooserBase { } /** - * Returns a copy of the selected option (a std::weak_ptr if T = - * std::shared_ptr). + * Returns a copy of the selected option (a std::weak_ptr<U> if T = + * std::shared_ptr<U>). * * If there is none selected, it will return the default. If there is none * selected and no default, then it will return a value-initialized instance. diff --git a/wpiutil/src/main/native/include/wpi/protobuf/Protobuf.h b/wpiutil/src/main/native/include/wpi/protobuf/Protobuf.h index 381ae698a2..4541e5521c 100644 --- a/wpiutil/src/main/native/include/wpi/protobuf/Protobuf.h +++ b/wpiutil/src/main/native/include/wpi/protobuf/Protobuf.h @@ -136,7 +136,7 @@ class ProtoOutputStream { /** * Constructs a nanopb ostream from a buffer. * - * This constructor will cause `Encode` to call pb_encode_ex` + * This constructor will cause `Encode` to call `pb_encode_ex` * * @param[in] out the stream buffer */ @@ -153,7 +153,7 @@ class ProtoOutputStream { /** * Constructs a nanopb ostream from a buffer. * - * This constructor will cause `Encode` to call pb_encode_ex` + * This constructor will cause `Encode` to call `pb_encode_ex` * * @param[in] out the stream buffer */ @@ -171,7 +171,7 @@ class ProtoOutputStream { * Constructs a empty nanopb stream. You must fill out the stream * returned from `Stream` before calling Encode. * - * This constructor exists to cause `Encode` to call pb_encode_ex`, + * This constructor exists to cause `Encode` to call `pb_encode_ex`, * but allow manipulating the stream manually. */ ProtoOutputStream() @@ -274,9 +274,9 @@ concept ProtobufSerializable = requires( * Specifies that a type is capable of in-place protobuf deserialization. * * In addition to meeting ProtobufSerializable, implementations must define a - * wpi::Protobuf static member - * - bool UnpackInto(T*, wpi::ProtoInputStream&)` to update the - * pointed-to T with the contents of the message. + * wpi::Protobuf static member - + * `bool UnpackInto(T*, wpi::ProtoInputStream&)` to update the pointed-to T + * with the contents of the message. */ template concept MutableProtobufSerializable = diff --git a/wpiutil/src/main/native/thirdparty/json/include/wpi/json.h b/wpiutil/src/main/native/thirdparty/json/include/wpi/json.h index 3f854e6add..aba5397add 100644 --- a/wpiutil/src/main/native/thirdparty/json/include/wpi/json.h +++ b/wpiutil/src/main/native/thirdparty/json/include/wpi/json.h @@ -1857,7 +1857,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec @brief get a value (implicit) Implicit type conversion between the JSON value and a compatible value. - The call is realized by calling @ref get() const. + The call is realized by calling @ref get(). @tparam ValueType non-pointer type compatible to the JSON value, for instance `int` for JSON integer numbers, `bool` for JSON booleans, or