From 2765c5fd42bf4f44940c5bd8f3d1a220b6e4fe3e Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Mon, 16 Oct 2023 19:10:48 -0500
Subject: [PATCH] Bumps in ionic: use gz-cmake4, gz-utils3, gz-math8 (#539)

---------

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
---
 .github/ci/packages.apt     |  6 +++---
 .github/workflows/ci.yml    | 13 ++-----------
 .github/workflows/macos.yml |  2 +-
 CMakeLists.txt              | 12 ++++++------
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
index 00715fab4..ab5c4d03a 100644
--- a/.github/ci/packages.apt
+++ b/.github/ci/packages.apt
@@ -6,9 +6,9 @@ libavutil-dev
 libfreeimage-dev
 libgdal-dev
 libgts-dev
-libgz-cmake3-dev
-libgz-math7-dev
-libgz-utils2-dev
+libgz-cmake4-dev
+libgz-math8-dev
+libgz-utils3-dev
 libswscale-dev
 libtinyxml2-dev
 pkg-config
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 329049cc6..29307b2ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,17 +3,6 @@ name: Ubuntu CI
 on: [push, pull_request]
 
 jobs:
-  focal-ci:
-    runs-on: ubuntu-latest
-    name: Ubuntu Focal CI
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Compile and test
-        id: ci
-        uses: gazebo-tooling/action-gz-ci@focal
-        with:
-          codecov-enabled: true
   jammy-ci:
     runs-on: ubuntu-latest
     name: Ubuntu Jammy CI
@@ -23,3 +12,5 @@ jobs:
       - name: Compile and test
         id: ci
         uses: gazebo-tooling/action-gz-ci@jammy
+        with:
+          codecov-enabled: true
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 866b25d2c..76164932e 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -39,7 +39,7 @@ jobs:
           popd
           echo '# END SECTION'
         fi
-        # gz-math7 has problems with swig, remove it for now
+        # gz-math8 has problems with swig, remove it for now
         brew remove swig || true
         brew install --only-dependencies ${PACKAGE};
     - run: mkdir build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf9e820b5..7f79a98e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,8 @@ set(GZ_COMMON_VER ${PROJECT_VERSION_MAJOR})
 #============================================================================
 # Find gz-cmake
 #============================================================================
-find_package(gz-cmake3 REQUIRED)
-set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
+find_package(gz-cmake4 REQUIRED)
+set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})
 
 #============================================================================
 # Configure the project
@@ -49,13 +49,13 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======")
 
 #--------------------------------------
 # Find gz-math
-gz_find_package(gz-math7 REQUIRED_BY geospatial graphics events)
-set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
+gz_find_package(gz-math8 REQUIRED_BY geospatial graphics events)
+set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-utils
-gz_find_package(gz-utils2 REQUIRED)
-set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
+gz_find_package(gz-utils3 REQUIRED)
+set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
 
 #--------------------------------------
 # Find Tinyxml2