Skip to content

Commit 7a460cd

Browse files
azeeyazeey
authored
Bumps in ionic : ci_matching_branch/bump_ionic_gz-sim9 (#2211)
Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
1 parent 6686c03 commit 7a460cd

File tree

37 files changed

+149
-149
lines changed

37 files changed

+149
-149
lines changed

‎.github/ci/packages.apt

+17-17
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,34 @@ freeglut3-dev
22
libbenchmark-dev
33
libfreeimage-dev
44
libglew-dev
5-
libgz-cmake3-dev
6-
libgz-common5-dev
7-
libgz-fuel-tools9-dev
8-
libgz-gui8-dev
9-
libgz-math7-eigen3-dev
10-
libgz-msgs10-dev
11-
libgz-physics7-dev
12-
libgz-plugin2-dev
13-
libgz-rendering8-dev
14-
libgz-sensors8-dev
5+
libgz-cmake4-dev
6+
libgz-common6-dev
7+
libgz-fuel-tools10-dev
8+
libgz-gui9-dev
9+
libgz-math8-eigen3-dev
10+
libgz-msgs11-dev
11+
libgz-physics8-dev
12+
libgz-plugin3-dev
13+
libgz-rendering9-dev
14+
libgz-sensors9-dev
1515
libgz-tools2-dev
16-
libgz-transport13-dev
17-
libgz-utils2-cli-dev
16+
libgz-transport14-dev
17+
libgz-utils3-cli-dev
1818
libogre-1.9-dev
1919
libogre-next-2.3-dev
2020
libprotobuf-dev
2121
libprotoc-dev
22-
libsdformat14-dev
22+
libsdformat15-dev
2323
libtinyxml2-dev
2424
libxi-dev
2525
libxmu-dev
2626
python3-distutils
27-
python3-gz-math7
28-
python3-gz-msgs10
29-
python3-gz-transport13
27+
python3-gz-math8
28+
python3-gz-msgs11
29+
python3-gz-transport14
3030
python3-pybind11
3131
python3-pytest
32-
python3-sdformat14
32+
python3-sdformat15
3333
qml-module-qt-labs-folderlistmodel
3434
qml-module-qt-labs-settings
3535
qml-module-qtgraphicaleffects

‎CMakeLists.txt

+26-26
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set (GZ_DISTRIBUTION "Ionic")
1010
# Find gz-cmake
1111
#============================================================================
1212
# If you get an error at this line, you need to install gz-cmake
13-
find_package(gz-cmake3 REQUIRED)
13+
find_package(gz-cmake4 REQUIRED)
1414

1515
#============================================================================
1616
# Configure the project
@@ -74,28 +74,28 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
7474
# as protobuf could be find transitively by any dependency
7575
set(protobuf_MODULE_COMPATIBLE TRUE)
7676

77-
gz_find_package(sdformat14 REQUIRED)
78-
set(SDF_VER ${sdformat14_VERSION_MAJOR})
77+
gz_find_package(sdformat15 REQUIRED)
78+
set(SDF_VER ${sdformat15_VERSION_MAJOR})
7979

8080
#--------------------------------------
8181
# Find gz-plugin
82-
gz_find_package(gz-plugin2 REQUIRED COMPONENTS loader register)
83-
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
82+
gz_find_package(gz-plugin3 REQUIRED COMPONENTS loader register)
83+
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
8484

8585
#--------------------------------------
8686
# Find gz-transport
87-
gz_find_package(gz-transport13 REQUIRED COMPONENTS log parameters)
88-
set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})
87+
gz_find_package(gz-transport14 REQUIRED COMPONENTS log parameters)
88+
set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})
8989

9090
#--------------------------------------
9191
# Find gz-msgs
92-
gz_find_package(gz-msgs10 REQUIRED)
93-
set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR})
92+
gz_find_package(gz-msgs11 REQUIRED)
93+
set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})
9494

9595
#--------------------------------------
9696
# Find gz-common
9797
# Always use the profiler component to get the headers, regardless of status.
98-
gz_find_package(gz-common5
98+
gz_find_package(gz-common6
9999
COMPONENTS
100100
av
101101
events
@@ -104,17 +104,17 @@ gz_find_package(gz-common5
104104
profiler
105105
REQUIRED
106106
)
107-
set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})
107+
set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})
108108

109109
#--------------------------------------
110110
# Find gz-fuel_tools
111-
gz_find_package(gz-fuel_tools9 REQUIRED)
112-
set(GZ_FUEL_TOOLS_VER ${gz-fuel_tools9_VERSION_MAJOR})
111+
gz_find_package(gz-fuel_tools10 REQUIRED)
112+
set(GZ_FUEL_TOOLS_VER ${gz-fuel_tools10_VERSION_MAJOR})
113113

114114
#--------------------------------------
115115
# Find gz-gui
116-
gz_find_package(gz-gui8 REQUIRED)
117-
set(GZ_GUI_VER ${gz-gui8_VERSION_MAJOR})
116+
gz_find_package(gz-gui9 REQUIRED)
117+
set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
118118
gz_find_package (Qt5
119119
COMPONENTS
120120
Core
@@ -125,18 +125,18 @@ gz_find_package (Qt5
125125

126126
#--------------------------------------
127127
# Find gz-physics
128-
gz_find_package(gz-physics7
128+
gz_find_package(gz-physics8
129129
COMPONENTS
130130
heightmap
131131
mesh
132132
sdf
133133
REQUIRED
134134
)
135-
set(GZ_PHYSICS_VER ${gz-physics7_VERSION_MAJOR})
135+
set(GZ_PHYSICS_VER ${gz-physics8_VERSION_MAJOR})
136136

137137
#--------------------------------------
138138
# Find gz-sensors
139-
gz_find_package(gz-sensors8 REQUIRED
139+
gz_find_package(gz-sensors9 REQUIRED
140140
# component order is important
141141
COMPONENTS
142142
# non-rendering
@@ -164,17 +164,17 @@ gz_find_package(gz-sensors8 REQUIRED
164164
thermal_camera
165165
wide_angle_camera
166166
)
167-
set(GZ_SENSORS_VER ${gz-sensors8_VERSION_MAJOR})
167+
set(GZ_SENSORS_VER ${gz-sensors9_VERSION_MAJOR})
168168

169169
#--------------------------------------
170170
# Find gz-rendering
171-
gz_find_package(gz-rendering8 REQUIRED)
172-
set(GZ_RENDERING_VER ${gz-rendering8_VERSION_MAJOR})
171+
gz_find_package(gz-rendering9 REQUIRED)
172+
set(GZ_RENDERING_VER ${gz-rendering9_VERSION_MAJOR})
173173

174174
#--------------------------------------
175175
# Find gz-math
176-
gz_find_package(gz-math7 REQUIRED COMPONENTS eigen3)
177-
set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
176+
gz_find_package(gz-math8 REQUIRED COMPONENTS eigen3)
177+
set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})
178178

179179
#--------------------------------------
180180
# Find if gz command is available
@@ -190,16 +190,16 @@ set(GZ_TOOLS_VER 2)
190190

191191
#--------------------------------------
192192
# Find gz-utils
193-
gz_find_package(gz-utils2 REQUIRED COMPONENTS cli)
194-
set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
193+
gz_find_package(gz-utils3 REQUIRED COMPONENTS cli)
194+
set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
195195

196196
#--------------------------------------
197197
# Find protobuf
198198
gz_find_package(GzProtobuf
199199
REQUIRED
200200
COMPONENTS all
201201
PRETTY Protobuf)
202-
set(Protobuf_IMPORT_DIRS ${gz-msgs10_INCLUDE_DIRS})
202+
set(Protobuf_IMPORT_DIRS ${gz-msgs11_INCLUDE_DIRS})
203203

204204
#--------------------------------------
205205
# Find python

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ line is using symbolic links to each library's YAML file.
115115
mkdir ~/.gz/tools/configs -p
116116
cd ~/.gz/tools/configs/
117117
ln -s /usr/local/share/gz/fuel8.yaml .
118-
ln -s /usr/local/share/gz/transport13.yaml .
118+
ln -s /usr/local/share/gz/transport14.yaml .
119119
ln -s /usr/local/share/gz/transportlog13.yaml .
120120
...
121121
export GZ_CONFIG_PATH=$HOME/.gz/tools/configs

‎docker/Dockerfile.nightly

+12-12
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ RUN scripts/enable_nightly.sh
1111

1212
RUN apt-get update \
1313
&& apt-get install -y \
14-
libgz-cmake3-dev \
15-
libgz-common5-dev \
16-
libgz-fuel-tools9-dev \
17-
libgz-math7-eigen3-dev \
18-
libgz-plugin2-dev \
19-
libgz-physics7-dev \
20-
libgz-rendering8-dev \
14+
libgz-cmake4-dev \
15+
libgz-common6-dev \
16+
libgz-fuel-tools10-dev \
17+
libgz-math8-eigen3-dev \
18+
libgz-plugin3-dev \
19+
libgz-physics8-dev \
20+
libgz-rendering9-dev \
2121
libgz-tools2-dev \
22-
libgz-transport13-dev \
23-
libgz-gui8-dev \
24-
libgz-msgs10-dev \
25-
libgz-sensors8-dev \
26-
libsdformat14-dev
22+
libgz-transport14-dev \
23+
libgz-gui9-dev \
24+
libgz-msgs11-dev \
25+
libgz-sensors9-dev \
26+
libsdformat15-dev
2727

2828
COPY . gz-sim
2929
RUN cd gz-sim \

‎docker/scripts/build_gz.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Command line parameters:
33
# 1 - github organization name. For example gazebosim or osrf.
44
# 2 - the name of the Gazebo repository. For example gz-math.
5-
# 3 - the name of the branch. For example gz-math7
5+
# 3 - the name of the branch. For example gz-math8
66

77
set -o errexit
88
set -o verbose

‎docker/scripts/upload_json_benchmark.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Command line parameters:
33
# 1 - github organization name. For example gazebosim or osrf.
44
# 2 - the name of the Gazebo repository. For example gz-math.
5-
# 3 - the name of the branch. For example gz-math7
5+
# 3 - the name of the branch. For example gz-math8
66

77
set -o errexit
88
set -o verbose

‎examples/plugin/command_actor/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
22

3-
find_package(gz-cmake3 REQUIRED)
3+
find_package(gz-cmake4 REQUIRED)
44

55
project(CommandActor)
66

7-
find_package(gz-plugin2 REQUIRED COMPONENTS register)
8-
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
7+
find_package(gz-plugin3 REQUIRED COMPONENTS register)
8+
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
99

1010
find_package(gz-sim9 REQUIRED)
1111
add_library(CommandActor SHARED CommandActor.cc)

‎examples/plugin/custom_component/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
22

3-
find_package(gz-cmake3 REQUIRED)
3+
find_package(gz-cmake4 REQUIRED)
44

55
project(CustomComponentPlugin)
66

7-
find_package(gz-plugin2 REQUIRED COMPONENTS register)
8-
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
7+
find_package(gz-plugin3 REQUIRED COMPONENTS register)
8+
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
99

1010
find_package(gz-sim9 REQUIRED)
1111
add_library(CustomComponentPlugin SHARED

‎examples/plugin/custom_sensor_system/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
cmake_minimum_required(VERSION 3.11.0 FATAL_ERROR)
22

3-
find_package(gz-cmake3 REQUIRED)
3+
find_package(gz-cmake4 REQUIRED)
44

55
project(OdometerSystem)
66

7-
gz_find_package(gz-plugin2 REQUIRED COMPONENTS register)
8-
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
7+
gz_find_package(gz-plugin3 REQUIRED COMPONENTS register)
8+
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
99

1010
gz_find_package(gz-sim9 REQUIRED)
1111
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})
1212

13-
find_package(gz-sensors8 REQUIRED)
14-
set(GZ_SENSORS_VER ${gz-sensors8_VERSION_MAJOR})
13+
find_package(gz-sensors9 REQUIRED)
14+
set(GZ_SENSORS_VER ${gz-sensors9_VERSION_MAJOR})
1515

1616
# Fetch the custom sensor example from gz-sensors
1717
# Users won't commonly use this to fetch their sensors. The sensor may be part
@@ -20,7 +20,7 @@ include(FetchContent)
2020
FetchContent_Declare(
2121
sensors_clone
2222
GIT_REPOSITORY https://github.com/gazebosim/gz-sensors
23-
GIT_TAG gz-sensors8
23+
GIT_TAG gz-sensors9
2424
)
2525
FetchContent_Populate(sensors_clone)
2626
add_subdirectory(${sensors_clone_SOURCE_DIR}/examples/custom_sensor ${sensors_clone_BINARY_DIR})

‎examples/plugin/hello_world/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
22

3-
find_package(gz-cmake3 REQUIRED)
3+
find_package(gz-cmake4 REQUIRED)
44

55
project(Hello_world)
66

7-
gz_find_package(gz-plugin2 REQUIRED COMPONENTS register)
8-
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
7+
gz_find_package(gz-plugin3 REQUIRED COMPONENTS register)
8+
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
99

1010
gz_find_package(gz-sim9 REQUIRED)
1111
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

‎examples/plugin/rendering_plugins/CMakeLists.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ endif()
77
project(RenderingPlugins)
88

99
# Common to both plugins
10-
find_package(gz-rendering8 REQUIRED)
10+
find_package(gz-rendering9 REQUIRED)
1111

1212
# GUI plugin
1313
set(GUI_PLUGIN RenderingGuiPlugin)
1414

1515
set(CMAKE_AUTOMOC ON)
1616

17-
find_package(gz-gui8 REQUIRED)
17+
find_package(gz-gui9 REQUIRED)
1818

1919
QT5_ADD_RESOURCES(resources_RCC ${GUI_PLUGIN}.qrc)
2020

@@ -24,21 +24,21 @@ add_library(${GUI_PLUGIN} SHARED
2424
)
2525
target_link_libraries(${GUI_PLUGIN}
2626
PRIVATE
27-
gz-gui8::gz-gui8
28-
gz-rendering8::gz-rendering8
27+
gz-gui9::gz-gui9
28+
gz-rendering9::gz-rendering9
2929
)
3030

3131
# Server plugin
3232
set(SERVER_PLUGIN RenderingServerPlugin)
3333

34-
find_package(gz-plugin2 REQUIRED COMPONENTS register)
34+
find_package(gz-plugin3 REQUIRED COMPONENTS register)
3535
find_package(gz-sim9 REQUIRED)
3636

3737
add_library(${SERVER_PLUGIN} SHARED ${SERVER_PLUGIN}.cc)
3838
set_property(TARGET ${SERVER_PLUGIN} PROPERTY CXX_STANDARD 17)
3939
target_link_libraries(${SERVER_PLUGIN}
4040
PRIVATE
41-
gz-plugin2::gz-plugin2
41+
gz-plugin3::gz-plugin3
4242
gz-sim9::gz-sim9
43-
gz-rendering8::gz-rendering8
43+
gz-rendering9::gz-rendering9
4444
)

‎examples/plugin/reset_plugin/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
22

33
project(ResetPlugins)
44

5-
find_package(gz-plugin2 REQUIRED COMPONENTS register)
6-
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
5+
find_package(gz-plugin3 REQUIRED COMPONENTS register)
6+
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
77

88
find_package(gz-sim9 REQUIRED)
99
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

‎examples/plugin/system_plugin/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
22

3-
find_package(gz-cmake3 REQUIRED)
3+
find_package(gz-cmake4 REQUIRED)
44

55
project(SampleSystem)
66

7-
find_package(gz-plugin2 REQUIRED COMPONENTS register)
8-
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
7+
find_package(gz-plugin3 REQUIRED COMPONENTS register)
8+
set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
99

1010
find_package(gz-sim9 REQUIRED)
1111
add_library(SampleSystem SHARED SampleSystem.cc SampleSystem2.cc)

0 commit comments

Comments
 (0)