Bumps in garden : ign-launch6 (#156)

* Bumps in garden : ign-launch6 Signed-off-by: methylDragon <[email protected]> * Retarget badge links to main Co-authored-by: Louise Poubel <[email protected]> * Bumps in garden : ign-launch6 Signed-off-by: methylDragon <[email protected]> * tools2, utils Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Louise Poubel <[email protected]>
gazebosim · Apr 15, 2022 · b662933 · b662933
1 parent f40d7a7
commit b662933
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -1,6 +1,6 @@
 binutils-dev
 libgflags-dev
-libignition-cmake2-dev
+libignition-cmake3-dev
 libignition-common5-dev
 libignition-fuel-tools8-dev
 libignition-gazebo7-dev
@@ -9,10 +9,10 @@ libignition-math7-dev
 libignition-math7-eigen3-dev
 libignition-msgs9-dev
 libignition-physics6-dev
-libignition-plugin-dev
+libignition-plugin2-dev
 libignition-rendering7-dev
 libignition-sensors7-dev
-libignition-tools-dev
+libignition-tools2-dev
 libignition-transport12-dev
 libsdformat13-dev
 libtinyxml2-dev

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,8 +8,8 @@ project(ignition-launch6 VERSION 6.0.0)
 #============================================================================
 # Find ignition-cmake
 #============================================================================
-find_package(ignition-cmake2 2.8.0 REQUIRED)
-set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
+find_package(ignition-cmake3 REQUIRED)
+set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR})
 
 #============================================================================
 # Configure the project
@@ -38,17 +38,17 @@ set(IGN_COMMON_MAJOR_VER ${ignition-common5_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-utils
-ign_find_package(ignition-utils1 REQUIRED COMPONENTS cli)
-set(IGN_UTILS_VER ${ignition-utils1_VERSION_MAJOR})
+ign_find_package(ignition-utils2 REQUIRED COMPONENTS cli)
+set(IGN_UTILS_VER ${ignition-utils2_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-plugin
-ign_find_package(ignition-plugin1 REQUIRED_BY launch COMPONENTS loader register)
-set(IGN_PLUGIN_MAJOR_VER ${ignition-plugin1_VERSION_MAJOR})
+ign_find_package(ignition-plugin2 REQUIRED_BY launch COMPONENTS loader register)
+set(IGN_PLUGIN_MAJOR_VER ${ignition-plugin2_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-tools
-ign_find_package(ignition-tools
+ign_find_package(ignition-tools2
   REQUIRED
   PKGCONFIG "ignition-tools")
 

diff --git a/README.md b/README.md
@@ -9,9 +9,9 @@
 
 Build | Status
 -- | --
-Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-launch/branch/ign-launch5/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-launch)
-Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_launch-ci-ign-launch5-focal-amd64)](https://build.osrfoundation.org/job/ignition_launch-ci-ign-launch5-focal-amd64)
-Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_launch-ci-ign-launch5-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_launch-ci-ign-launch5-homebrew-amd64)
+Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-launch/branch/main/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-launch)
+Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_launch-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_launch-ci-main-focal-amd64)
+Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_launch-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_launch-ci-main-homebrew-amd64)
 Windows       | [![Build Status](https://build.osrfoundation.org/job/ign_launch-ign-5-win/badge/icon)](https://build.osrfoundation.org/job/ign_launch-ign-5-win/)
 
 Ignition Launch, a component of [Ignition

diff --git a/src/Manager_TEST.cc b/src/Manager_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 <sys/stat.h>
 

diff --git a/tutorials/install.md b/tutorials/install.md
@@ -71,7 +71,7 @@ necessary prerequisites followed by building from source.
     sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
     wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -
     sudo apt-get update
-    sudo apt-get -y install libignition-cmake2-dev libignition-gazebo2-dev
+    sudo apt-get -y install libignition-cmake3-dev libignition-gazebo2-dev
     ```
 
 ### Building from source