Merge branch 'main' of github.com:gazebosim/gz-utils into main

gazebosim · Jul 27, 2023 · d322f1f · d322f1f
2 parents 6df06c6 + 215e325
commit d322f1f
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     name: Ubuntu Focal CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@focal
@@ -21,7 +21,7 @@ jobs:
     name: Ubuntu Jammy CI
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@jammy
diff --git a/Changelog.md b/Changelog.md
@@ -42,6 +42,30 @@
 
 ## Gazebo Utils 1.x
 
+## Gazebo Utils 1.5.1 (2022-12-15)
+
+1. Add missing config.hh include to gz headers
+    * [Pull request #90](https://github.com/gazebosim/gz-utils/pull/90)
+
+## Gazebo Utils 1.5.0 (2022-12-08)
+
+1. Ignition to Gazebo header migration.
+    * [Pull request #84](https://github.com/gazebosim/gz-utils/pull/84)
+
+1. CI workflow: use checkout v3.
+    * [Pull request #85](https://github.com/gazebosim/gz-utils/pull/85)
+
+## Gazebo Utils 1.4.1 (2022-11-17)
+
+1. Include <functional> in FormatterFwd.
+    * [Pull request #58](https://github.com/gazebosim/gz-utils/pull/58)
+
+1. cli_TEST: Fix compatibility with CLI11 2.0.
+    * [Pull request #60](https://github.com/gazebosim/gz-utils/pull/60)
+
+1. Add code coverage ignore file.
+    * [Pull request #72](https://github.com/gazebosim/gz-utils/pull/72)
+
 ## Gazebo Utils 1.4.0 (2022-03-29)
 
 1. Enable cpplint

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 Build | Status
 -- | --
 Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-utils/branch/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-utils)
-Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_utils-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_utils-ci-main-focal-amd64)
+Ubuntu Focal  | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_utils-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_utils-ci-main-focal-amd64)
 Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_utils-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_utils-ci-main-homebrew-amd64)
 Windows       | [![Build Status](https://build.osrfoundation.org/job/ign_utils-ci-win/badge/icon)](https://build.osrfoundation.org/job/ign_utils-ci-win/)
 
@@ -110,7 +110,7 @@ Refer to the following table for information about important directories and fil
 ```
 gz-utils
 ├── examples                 Example programs.
-├── include/gz/utils   Header files.
+├── include/gz/utils         Header files.
 ├── src                      Source files and unit tests.
 ├── test
 │    ├── integration         Integration tests.

diff --git a/include/ignition/utils/Environment.hh b/include/ignition/utils/Environment.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/include/ignition/utils/NeverDestroyed.hh b/include/ignition/utils/NeverDestroyed.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Open Source Robotics Foundation
+ * Copyright (C) 2022 Open Source Robotics Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/NeverDestroyed_TEST.cc b/src/NeverDestroyed_TEST.cc
@@ -22,6 +22,8 @@
 #include <random>
 #include <unordered_map>
 
+using namespace gz;
+
 class Boom : public std::exception
 {
 };
@@ -63,7 +65,7 @@ GTEST_TEST(NeverDestroyed, NoBoomTest)
   try
   {
     {
-      gz::utils::NeverDestroyed<DtorGoesBoom> foo;
+      utils::NeverDestroyed<DtorGoesBoom> foo;
     }
     ASSERT_TRUE(true);
   }
@@ -83,11 +85,11 @@ class Singleton
   public: void operator=(Singleton &&) = delete;
   public: static Singleton &getInstance()
   {
-    static gz::utils::NeverDestroyed<Singleton> instance;
+    static utils::NeverDestroyed<Singleton> instance;
     return instance.Access();
   }
 
-  private: friend gz::utils::NeverDestroyed<Singleton>;
+  private: friend utils::NeverDestroyed<Singleton>;
   private: Singleton() = default;
 };
 
@@ -108,7 +110,7 @@ enum class Foo
 Foo ParseFoo(const std::string &foo_string)
 {
   using Dict = std::unordered_map<std::string, Foo>;
-  static const gz::utils::NeverDestroyed<Dict> string_to_enum{
+  static const utils::NeverDestroyed<Dict> string_to_enum{
       std::initializer_list<Dict::value_type>{
           {"bar", Foo::kBar},
           {"baz", Foo::kBaz},
@@ -127,7 +129,7 @@ GTEST_TEST(NeverDestroyedExample, ParseFoo)
 using Result = std::vector<std::uint_fast32_t>;
 const Result &GetConstantMagicNumbers()
 {
-  static const gz::utils::NeverDestroyed<Result> result{
+  static const utils::NeverDestroyed<Result> result{
       []()
       {
         Result prototype;