Bumps in garden: use ign-common5 (#224)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Dec 29, 2021 · c47d85f · c47d85f
1 parent 67af73e
commit c47d85f
Show file tree

Hide file tree

Showing 8 changed files with 146 additions and 141 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -2,8 +2,8 @@ curl
 libcurl4-openssl-dev
 libgflags-dev
 libignition-cmake2-dev
-libignition-common4-dev
-libignition-math6-dev
+libignition-common5-dev
+libignition-math7-dev
 libignition-msgs9-dev
 libignition-tools-dev
 libjsoncpp-dev

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,13 +47,13 @@ ign_find_package(ZIP REQUIRED PRIVATE)
 
 #--------------------------------------
 # Find ignition-common
-ign_find_package(ignition-common4 REQUIRED PRIVATE)
-set(IGN_COMMON_MAJOR_VER ${ignition-common4_VERSION_MAJOR})
+ign_find_package(ignition-common5 REQUIRED PRIVATE)
+set(IGN_COMMON_MAJOR_VER ${ignition-common5_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-math
-ign_find_package(ignition-math6 REQUIRED PRIVATE)
-set(IGN_MSGS_MAJOR_VER ${ignition-math6_VERSION_MAJOR})
+ign_find_package(ignition-math7 REQUIRED PRIVATE)
+set(IGN_MSGS_MAJOR_VER ${ignition-math7_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-msgs

diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc
@@ -413,7 +413,7 @@ TEST(ServerConfig, Url)
   // Trailing /
   {
     ServerConfig srv;
-    srv.SetUrl(common::URI("http://banana:8080/"));
+    srv.SetUrl(common::URI("http://banana:8080"));
     EXPECT_EQ("http://banana:8080", srv.Url().Str());
     EXPECT_EQ("http", srv.Url().Scheme());
     EXPECT_EQ("banana:8080", srv.Url().Path().Str());

diff --git a/src/CollectionIdentifier_TEST.cc b/src/CollectionIdentifier_TEST.cc
@@ -46,7 +46,7 @@ TEST(CollectionIdentifier, SetFields)
 TEST(CollectionIdentifier, UniqueName)
 {
   ignition::fuel_tools::ServerConfig srv1;
-  srv1.SetUrl(common::URI("https://localhost:8001/"));
+  srv1.SetUrl(common::URI("https://localhost:8001"));
 
   ignition::fuel_tools::ServerConfig srv2;
   srv2.SetUrl(common::URI("https://localhost:8002"));