Bumps in ionic : ci_matching_branch/bump_ionic_gz-sim9 (#2211)

Signed-off-by: Addisu Z. Taddese <[email protected]>

.github/ci/packages.apt

@@ -2,34 +2,34 @@ freeglut3-dev
 libbenchmark-dev
 libfreeimage-dev
 libglew-dev
-libgz-cmake3-dev
-libgz-common5-dev
-libgz-fuel-tools9-dev
-libgz-gui8-dev
-libgz-math7-eigen3-dev
-libgz-msgs10-dev
-libgz-physics7-dev
-libgz-plugin2-dev
-libgz-rendering8-dev
-libgz-sensors8-dev
+libgz-cmake4-dev
+libgz-common6-dev
+libgz-fuel-tools10-dev
+libgz-gui9-dev
+libgz-math8-eigen3-dev
+libgz-msgs11-dev
+libgz-physics8-dev
+libgz-plugin3-dev
+libgz-rendering9-dev
+libgz-sensors9-dev
 libgz-tools2-dev
-libgz-transport13-dev
-libgz-utils2-cli-dev
+libgz-transport14-dev
+libgz-utils3-cli-dev
 libogre-1.9-dev
 libogre-next-2.3-dev
 libprotobuf-dev
 libprotoc-dev
-libsdformat14-dev
+libsdformat15-dev
 libtinyxml2-dev
 libxi-dev
 libxmu-dev
 python3-distutils
-python3-gz-math7
-python3-gz-msgs10
-python3-gz-transport13
+python3-gz-math8
+python3-gz-msgs11
+python3-gz-transport14
 python3-pybind11
 python3-pytest
-python3-sdformat14
+python3-sdformat15
 qml-module-qt-labs-folderlistmodel
 qml-module-qt-labs-settings
 qml-module-qtgraphicaleffects

CMakeLists.txt

@@ -10,7 +10,7 @@ set (GZ_DISTRIBUTION "Ionic")
 # Find gz-cmake
 #============================================================================
 # If you get an error at this line, you need to install gz-cmake
-find_package(gz-cmake3 REQUIRED)
+find_package(gz-cmake4 REQUIRED)
 
 #============================================================================
 # Configure the project
@@ -74,28 +74,28 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 # as protobuf could be find transitively by any dependency
 set(protobuf_MODULE_COMPATIBLE TRUE)
 
-gz_find_package(sdformat14 REQUIRED)
-set(SDF_VER ${sdformat14_VERSION_MAJOR})
+gz_find_package(sdformat15 REQUIRED)
+set(SDF_VER ${sdformat15_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-plugin
-gz_find_package(gz-plugin2 REQUIRED COMPONENTS loader register)
-set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
+gz_find_package(gz-plugin3 REQUIRED COMPONENTS loader register)
+set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-transport
-gz_find_package(gz-transport13 REQUIRED COMPONENTS log parameters)
-set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})
+gz_find_package(gz-transport14 REQUIRED COMPONENTS log parameters)
+set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-msgs
-gz_find_package(gz-msgs10 REQUIRED)
-set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR})
+gz_find_package(gz-msgs11 REQUIRED)
+set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-common
 # Always use the profiler component to get the headers, regardless of status.
-gz_find_package(gz-common5
+gz_find_package(gz-common6
   COMPONENTS
     av
     events
@@ -104,17 +104,17 @@ gz_find_package(gz-common5
     profiler
   REQUIRED
 )
-set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})
+set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-fuel_tools
-gz_find_package(gz-fuel_tools9 REQUIRED)
-set(GZ_FUEL_TOOLS_VER ${gz-fuel_tools9_VERSION_MAJOR})
+gz_find_package(gz-fuel_tools10 REQUIRED)
+set(GZ_FUEL_TOOLS_VER ${gz-fuel_tools10_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-gui
-gz_find_package(gz-gui8 REQUIRED)
-set(GZ_GUI_VER ${gz-gui8_VERSION_MAJOR})
+gz_find_package(gz-gui9 REQUIRED)
+set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 gz_find_package (Qt5
   COMPONENTS
     Core
@@ -125,18 +125,18 @@ gz_find_package (Qt5
 
 #--------------------------------------
 # Find gz-physics
-gz_find_package(gz-physics7
+gz_find_package(gz-physics8
   COMPONENTS
     heightmap
     mesh
     sdf
   REQUIRED
 )
-set(GZ_PHYSICS_VER ${gz-physics7_VERSION_MAJOR})
+set(GZ_PHYSICS_VER ${gz-physics8_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-sensors
-gz_find_package(gz-sensors8 REQUIRED
+gz_find_package(gz-sensors9 REQUIRED
   # component order is important
   COMPONENTS
     # non-rendering
@@ -164,17 +164,17 @@ gz_find_package(gz-sensors8 REQUIRED
     thermal_camera
     wide_angle_camera
 )
-set(GZ_SENSORS_VER ${gz-sensors8_VERSION_MAJOR})
+set(GZ_SENSORS_VER ${gz-sensors9_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-rendering
-gz_find_package(gz-rendering8 REQUIRED)
-set(GZ_RENDERING_VER ${gz-rendering8_VERSION_MAJOR})
+gz_find_package(gz-rendering9 REQUIRED)
+set(GZ_RENDERING_VER ${gz-rendering9_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-math
-gz_find_package(gz-math7 REQUIRED COMPONENTS eigen3)
-set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
+gz_find_package(gz-math8 REQUIRED COMPONENTS eigen3)
+set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})
 
 #--------------------------------------
 # Find if gz command is available
@@ -190,16 +190,16 @@ set(GZ_TOOLS_VER 2)
 
 #--------------------------------------
 # Find gz-utils
-gz_find_package(gz-utils2 REQUIRED COMPONENTS cli)
-set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
+gz_find_package(gz-utils3 REQUIRED COMPONENTS cli)
+set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
 
 #--------------------------------------
 # Find protobuf
 gz_find_package(GzProtobuf
                 REQUIRED
                 COMPONENTS all
                 PRETTY Protobuf)
-set(Protobuf_IMPORT_DIRS ${gz-msgs10_INCLUDE_DIRS})
+set(Protobuf_IMPORT_DIRS ${gz-msgs11_INCLUDE_DIRS})
 
 #--------------------------------------
 # Find python

README.md

@@ -115,7 +115,7 @@ line is using symbolic links to each library's YAML file.
 mkdir ~/.gz/tools/configs -p
 cd ~/.gz/tools/configs/
 ln -s /usr/local/share/gz/fuel8.yaml .
-ln -s /usr/local/share/gz/transport13.yaml .
+ln -s /usr/local/share/gz/transport14.yaml .
 ln -s /usr/local/share/gz/transportlog13.yaml .
 ...
 export GZ_CONFIG_PATH=$HOME/.gz/tools/configs

docker/Dockerfile.nightly

@@ -11,19 +11,19 @@ RUN scripts/enable_nightly.sh
 
 RUN apt-get update \
  && apt-get install -y \
-    libgz-cmake3-dev \
-    libgz-common5-dev \
-    libgz-fuel-tools9-dev \
-    libgz-math7-eigen3-dev \
-    libgz-plugin2-dev \
-    libgz-physics7-dev \
-    libgz-rendering8-dev \
+    libgz-cmake4-dev \
+    libgz-common6-dev \
+    libgz-fuel-tools10-dev \
+    libgz-math8-eigen3-dev \
+    libgz-plugin3-dev \
+    libgz-physics8-dev \
+    libgz-rendering9-dev \
     libgz-tools2-dev \
-    libgz-transport13-dev \
-    libgz-gui8-dev \
-    libgz-msgs10-dev \
-    libgz-sensors8-dev \
-    libsdformat14-dev
+    libgz-transport14-dev \
+    libgz-gui9-dev \
+    libgz-msgs11-dev \
+    libgz-sensors9-dev \
+    libsdformat15-dev
 
 COPY . gz-sim
 RUN cd gz-sim \

docker/scripts/build_gz.sh

@@ -2,7 +2,7 @@
 # Command line parameters:
 # 1 - github organization name. For example gazebosim or osrf.
 # 2 - the name of the Gazebo repository. For example gz-math.
-# 3 - the name of the branch. For example gz-math7
+# 3 - the name of the branch. For example gz-math8
 
 set -o errexit
 set -o verbose

docker/scripts/upload_json_benchmark.sh

@@ -2,7 +2,7 @@
 # Command line parameters:
 # 1 - github organization name. For example gazebosim or osrf.
 # 2 - the name of the Gazebo repository. For example gz-math.
-# 3 - the name of the branch. For example gz-math7
+# 3 - the name of the branch. For example gz-math8
 
 set -o errexit
 set -o verbose

examples/plugin/command_actor/CMakeLists.txt

@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(gz-cmake3 REQUIRED)
+find_package(gz-cmake4 REQUIRED)
 
 project(CommandActor)
 
-find_package(gz-plugin2 REQUIRED COMPONENTS register)
-set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
+find_package(gz-plugin3 REQUIRED COMPONENTS register)
+set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
 find_package(gz-sim9 REQUIRED)
 add_library(CommandActor SHARED CommandActor.cc)

examples/plugin/custom_component/CMakeLists.txt

@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(gz-cmake3 REQUIRED)
+find_package(gz-cmake4 REQUIRED)
 
 project(CustomComponentPlugin)
 
-find_package(gz-plugin2 REQUIRED COMPONENTS register)
-set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
+find_package(gz-plugin3 REQUIRED COMPONENTS register)
+set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
 find_package(gz-sim9 REQUIRED)
 add_library(CustomComponentPlugin SHARED

examples/plugin/custom_sensor_system/CMakeLists.txt

@@ -1,17 +1,17 @@
 cmake_minimum_required(VERSION 3.11.0 FATAL_ERROR)
 
-find_package(gz-cmake3 REQUIRED)
+find_package(gz-cmake4 REQUIRED)
 
 project(OdometerSystem)
 
-gz_find_package(gz-plugin2 REQUIRED COMPONENTS register)
-set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
+gz_find_package(gz-plugin3 REQUIRED COMPONENTS register)
+set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
 gz_find_package(gz-sim9 REQUIRED)
 set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})
 
-find_package(gz-sensors8 REQUIRED)
-set(GZ_SENSORS_VER ${gz-sensors8_VERSION_MAJOR})
+find_package(gz-sensors9 REQUIRED)
+set(GZ_SENSORS_VER ${gz-sensors9_VERSION_MAJOR})
 
 # Fetch the custom sensor example from gz-sensors
 # Users won't commonly use this to fetch their sensors. The sensor may be part
@@ -20,7 +20,7 @@ include(FetchContent)
 FetchContent_Declare(
   sensors_clone
   GIT_REPOSITORY https://github.com/gazebosim/gz-sensors
-  GIT_TAG gz-sensors8
+  GIT_TAG gz-sensors9
 )
 FetchContent_Populate(sensors_clone)
 add_subdirectory(${sensors_clone_SOURCE_DIR}/examples/custom_sensor ${sensors_clone_BINARY_DIR})

examples/plugin/hello_world/CMakeLists.txt

@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(gz-cmake3 REQUIRED)
+find_package(gz-cmake4 REQUIRED)
 
 project(Hello_world)
 
-gz_find_package(gz-plugin2 REQUIRED COMPONENTS register)
-set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
+gz_find_package(gz-plugin3 REQUIRED COMPONENTS register)
+set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
 gz_find_package(gz-sim9 REQUIRED)
 set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

examples/plugin/rendering_plugins/CMakeLists.txt

@@ -7,14 +7,14 @@ endif()
 project(RenderingPlugins)
 
 # Common to both plugins
-find_package(gz-rendering8 REQUIRED)
+find_package(gz-rendering9 REQUIRED)
 
 # GUI plugin
 set(GUI_PLUGIN RenderingGuiPlugin)
 
 set(CMAKE_AUTOMOC ON)
 
-find_package(gz-gui8 REQUIRED)
+find_package(gz-gui9 REQUIRED)
 
 QT5_ADD_RESOURCES(resources_RCC ${GUI_PLUGIN}.qrc)
 
@@ -24,21 +24,21 @@ add_library(${GUI_PLUGIN} SHARED
 )
 target_link_libraries(${GUI_PLUGIN}
   PRIVATE
-    gz-gui8::gz-gui8
-    gz-rendering8::gz-rendering8
+    gz-gui9::gz-gui9
+    gz-rendering9::gz-rendering9
 )
 
 # Server plugin
 set(SERVER_PLUGIN RenderingServerPlugin)
 
-find_package(gz-plugin2 REQUIRED COMPONENTS register)
+find_package(gz-plugin3 REQUIRED COMPONENTS register)
 find_package(gz-sim9 REQUIRED)
 
 add_library(${SERVER_PLUGIN} SHARED ${SERVER_PLUGIN}.cc)
 set_property(TARGET ${SERVER_PLUGIN} PROPERTY CXX_STANDARD 17)
 target_link_libraries(${SERVER_PLUGIN}
   PRIVATE
-    gz-plugin2::gz-plugin2
+    gz-plugin3::gz-plugin3
     gz-sim9::gz-sim9
-    gz-rendering8::gz-rendering8
+    gz-rendering9::gz-rendering9
 )

examples/plugin/reset_plugin/CMakeLists.txt

@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
 project(ResetPlugins)
 
-find_package(gz-plugin2 REQUIRED COMPONENTS register)
-set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
+find_package(gz-plugin3 REQUIRED COMPONENTS register)
+set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
 find_package(gz-sim9 REQUIRED)
 set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

examples/plugin/system_plugin/CMakeLists.txt

@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(gz-cmake3 REQUIRED)
+find_package(gz-cmake4 REQUIRED)
 
 project(SampleSystem)
 
-find_package(gz-plugin2 REQUIRED COMPONENTS register)
-set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
+find_package(gz-plugin3 REQUIRED COMPONENTS register)
+set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
 find_package(gz-sim9 REQUIRED)
 add_library(SampleSystem SHARED SampleSystem.cc SampleSystem2.cc)