Bumps in garden : ign-gui7 (#385)

Signed-off-by: methylDragon <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Louise Poubel <[email protected]>
gazebosim · Apr 14, 2022 · 47bddfc · 47bddfc
1 parent 57894fc
commit 47bddfc
Show file tree

Hide file tree

Showing 24 changed files with 31 additions and 25 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -2,10 +2,11 @@ libignition-cmake2-dev
 libignition-common5-dev
 libignition-math7-dev
 libignition-msgs9-dev
-libignition-plugin-dev
+libignition-plugin2-dev
 libignition-rendering7-dev
 libignition-tools-dev
 libignition-transport12-dev
+libignition-utils2-dev
 libprotobuf-dev
 libprotoc-dev
 libtinyxml2-dev

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,6 +37,11 @@ ign_find_package(IgnProtobuf
 # Find Tinyxml2
 ign_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2)
 
+#--------------------------------------
+# Find ignition-utils
+ign_find_package(ignition-utils2 REQUIRED)
+set(IGN_UTILS_VER ${ignition-utils2_VERSION_MAJOR})
+
 #--------------------------------------
 # Find ignition-math
 ign_find_package(ignition-math7 REQUIRED)
@@ -49,8 +54,8 @@ set(IGN_COMMON_VER ${ignition-common5_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-plugin
-ign_find_package(ignition-plugin1 REQUIRED COMPONENTS loader register)
-set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
+ign_find_package(ignition-plugin2 REQUIRED COMPONENTS loader register)
+set(IGN_PLUGIN_VER ${ignition-plugin2_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-transport

diff --git a/src/Application_TEST.cc b/src/Application_TEST.cc
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <gtest/gtest.h>
 #include <ignition/common/Console.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/src/Helpers_TEST.cc b/src/Helpers_TEST.cc
@@ -19,7 +19,7 @@
 #include <gtest/gtest.h>
 
 #include <ignition/math/Helpers.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/src/MainWindow_TEST.cc b/src/MainWindow_TEST.cc
@@ -25,7 +25,7 @@
 #include <ignition/msgs/boolean.pb.h>
 #include <ignition/msgs/server_control.pb.h>
 #include <ignition/transport/Node.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/src/PlottingInterface_TEST.cc b/src/PlottingInterface_TEST.cc
@@ -26,7 +26,7 @@
 
 #include <ignition/transport.hh>
 #include <ignition/common/Console.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Enums.hh"
 #include "ignition/gui/PlottingInterface.hh"

diff --git a/src/Plugin_TEST.cc b/src/Plugin_TEST.cc
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 
 #include <ignition/common/Console.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/src/ign_TEST.cc b/src/ign_TEST.cc
@@ -23,7 +23,7 @@
 
 #include <ignition/common/Filesystem.hh>
 #include <ignition/common/Util.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 

diff --git a/src/plugins/plotting/TransportPlotting.hh b/src/plugins/plotting/TransportPlotting.hh
@@ -19,7 +19,7 @@
 
 #include <ignition/gui/Plugin.hh>
 #include <ignition/gui/PlottingInterface.hh>
-#include <ignition/utilities/SuppressWarning.hh>
+#include <ignition/utils/SuppressWarning.hh>
 
 #include <memory>
 

diff --git a/src/plugins/point_cloud/PointCloud_TEST.cc b/src/plugins/point_cloud/PointCloud_TEST.cc
@@ -20,7 +20,7 @@
 
 #include <ignition/common/Console.hh>
 #include <ignition/common/Filesystem.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/src/plugins/publisher/Publisher_TEST.cc b/src/plugins/publisher/Publisher_TEST.cc
@@ -24,7 +24,7 @@
 #pragma warning(pop)
 #endif
 #include <ignition/transport/Node.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/src/plugins/screenshot/Screenshot_TEST.cc b/src/plugins/screenshot/Screenshot_TEST.cc
@@ -30,7 +30,7 @@
 #include <ignition/common/Console.hh>
 #include <ignition/common/Filesystem.hh>
 #include <ignition/transport/Node.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/src/plugins/shutdown_button/ShutdownButton_TEST.cc b/src/plugins/shutdown_button/ShutdownButton_TEST.cc
@@ -19,7 +19,7 @@
 
 #include <ignition/common/Console.hh>
 #include <ignition/transport/Node.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/src/plugins/teleop/Teleop_TEST.cc b/src/plugins/teleop/Teleop_TEST.cc
@@ -24,7 +24,7 @@
 #pragma warning(pop)
 #endif
 
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/src/plugins/topic_viewer/TopicViewer_TEST.cc b/src/plugins/topic_viewer/TopicViewer_TEST.cc
@@ -18,7 +18,7 @@
 
 #include <ignition/common/Console.hh>
 #include <ignition/transport/Node.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/src/plugins/world_control/WorldControl_TEST.cc b/src/plugins/world_control/WorldControl_TEST.cc
@@ -19,7 +19,7 @@
 
 #include <ignition/common/Console.hh>
 #include <ignition/transport/Node.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/src/plugins/world_stats/WorldStats_TEST.cc b/src/plugins/world_stats/WorldStats_TEST.cc
@@ -19,7 +19,7 @@
 
 #include <ignition/common/Console.hh>
 #include <ignition/transport/Node.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/test/integration/ExamplesBuild_TEST.cc b/test/integration/ExamplesBuild_TEST.cc
@@ -20,7 +20,7 @@
 
 #include <ignition/common/Console.hh>
 #include <ignition/common/Filesystem.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 

diff --git a/test/integration/Examples_TEST.cc b/test/integration/Examples_TEST.cc
@@ -19,7 +19,7 @@
 
 #include <ignition/common/Console.hh>
 #include <ignition/common/Filesystem.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/test/integration/camera_tracking.cc b/test/integration/camera_tracking.cc
@@ -33,7 +33,7 @@
 #include <ignition/rendering/RenderingIface.hh>
 #include <ignition/rendering/Scene.hh>
 #include <ignition/transport/Node.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/test/integration/marker_manager.cc b/test/integration/marker_manager.cc
@@ -30,7 +30,7 @@
 #include <ignition/common/Console.hh>
 #include <ignition/common/Filesystem.hh>
 #include <ignition/transport/Node.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "ignition/gui/Application.hh"

diff --git a/test/integration/minimal_scene.cc b/test/integration/minimal_scene.cc
@@ -24,7 +24,7 @@
 #include <ignition/rendering/RenderEngine.hh>
 #include <ignition/rendering/RenderingIface.hh>
 #include <ignition/rendering/Scene.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "../helpers/TestHelper.hh"

diff --git a/test/integration/scene3d.cc b/test/integration/scene3d.cc
@@ -24,7 +24,7 @@
 #include <ignition/rendering/RenderEngine.hh>
 #include <ignition/rendering/RenderingIface.hh>
 #include <ignition/rendering/Scene.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "../helpers/TestHelper.hh"

diff --git a/test/integration/transport_scene_manager.cc b/test/integration/transport_scene_manager.cc
@@ -27,7 +27,7 @@
 #include <ignition/rendering/RenderingIface.hh>
 #include <ignition/rendering/Scene.hh>
 #include <ignition/transport/Node.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
 #include "../helpers/TestHelper.hh"