diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 8c85a08a1b..8bcba178ad 100644 --- a/.github/ci/packages.apt +++ b/.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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b662b78b4..ac957230b7 100644 --- a/CMakeLists.txt +++ b/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,8 +190,8 @@ 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 @@ -199,7 +199,7 @@ 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 diff --git a/README.md b/README.md index 8c4a8c9f63..006190b7c7 100644 --- a/README.md +++ b/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 diff --git a/docker/Dockerfile.nightly b/docker/Dockerfile.nightly index 6fb0d6bf7b..4dee43a1d5 100644 --- a/docker/Dockerfile.nightly +++ b/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 \ diff --git a/docker/scripts/build_gz.sh b/docker/scripts/build_gz.sh index 914705f60f..d1ed98317e 100755 --- a/docker/scripts/build_gz.sh +++ b/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 diff --git a/docker/scripts/upload_json_benchmark.sh b/docker/scripts/upload_json_benchmark.sh index 1cbe1e8cef..10fb0a4349 100755 --- a/docker/scripts/upload_json_benchmark.sh +++ b/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 diff --git a/examples/plugin/command_actor/CMakeLists.txt b/examples/plugin/command_actor/CMakeLists.txt index e73b0d74c1..23fba669eb 100644 --- a/examples/plugin/command_actor/CMakeLists.txt +++ b/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) diff --git a/examples/plugin/custom_component/CMakeLists.txt b/examples/plugin/custom_component/CMakeLists.txt index 912ba8b1c1..a1e8a8dc50 100644 --- a/examples/plugin/custom_component/CMakeLists.txt +++ b/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 diff --git a/examples/plugin/custom_sensor_system/CMakeLists.txt b/examples/plugin/custom_sensor_system/CMakeLists.txt index 128253a38f..60bc0d3c63 100644 --- a/examples/plugin/custom_sensor_system/CMakeLists.txt +++ b/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}) diff --git a/examples/plugin/hello_world/CMakeLists.txt b/examples/plugin/hello_world/CMakeLists.txt index 0720a3ccd8..488050665e 100644 --- a/examples/plugin/hello_world/CMakeLists.txt +++ b/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}) diff --git a/examples/plugin/rendering_plugins/CMakeLists.txt b/examples/plugin/rendering_plugins/CMakeLists.txt index 0435e17633..f8c8bd14b8 100644 --- a/examples/plugin/rendering_plugins/CMakeLists.txt +++ b/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 ) diff --git a/examples/plugin/reset_plugin/CMakeLists.txt b/examples/plugin/reset_plugin/CMakeLists.txt index 3e1040aefe..3fb659aed3 100644 --- a/examples/plugin/reset_plugin/CMakeLists.txt +++ b/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}) diff --git a/examples/plugin/system_plugin/CMakeLists.txt b/examples/plugin/system_plugin/CMakeLists.txt index b887cf7708..08be7e0d48 100644 --- a/examples/plugin/system_plugin/CMakeLists.txt +++ b/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) diff --git a/examples/scripts/python_api/systems/test_system.py b/examples/scripts/python_api/systems/test_system.py index 7dd34a2ce4..a10aef1fec 100644 --- a/examples/scripts/python_api/systems/test_system.py +++ b/examples/scripts/python_api/systems/test_system.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from gz.math7 import Vector3d +from gz.math8 import Vector3d from gz.sim9 import Model, Link import random diff --git a/examples/scripts/python_api/testFixture.py b/examples/scripts/python_api/testFixture.py index 363c040b4e..820d281dd3 100755 --- a/examples/scripts/python_api/testFixture.py +++ b/examples/scripts/python_api/testFixture.py @@ -24,9 +24,9 @@ import os -from gz.common5 import set_verbosity +from gz.common6 import set_verbosity from gz.sim9 import TestFixture, World, world_entity -from gz.math7 import Vector3d +from gz.math8 import Vector3d set_verbosity(4) diff --git a/examples/standalone/acoustic_comms_demo/CMakeLists.txt b/examples/standalone/acoustic_comms_demo/CMakeLists.txt index 9beb0308f5..7e6f6582cd 100644 --- a/examples/standalone/acoustic_comms_demo/CMakeLists.txt +++ b/examples/standalone/acoustic_comms_demo/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-sim-acoustic-comms-demo) -find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) -set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) +find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log) +set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR}) find_package(gz-sim9 REQUIRED) set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR}) diff --git a/examples/standalone/comms/CMakeLists.txt b/examples/standalone/comms/CMakeLists.txt index 19d11f99f6..f909bbbeea 100644 --- a/examples/standalone/comms/CMakeLists.txt +++ b/examples/standalone/comms/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-sim-comms) -find_package(gz-transport13 QUIET REQUIRED) -set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) +find_package(gz-transport14 QUIET REQUIRED) +set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR}) add_executable(publisher publisher.cc) target_link_libraries(publisher diff --git a/examples/standalone/entity_creation/CMakeLists.txt b/examples/standalone/entity_creation/CMakeLists.txt index d41479eafa..29efcc96df 100644 --- a/examples/standalone/entity_creation/CMakeLists.txt +++ b/examples/standalone/entity_creation/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-sim-entity-creation) -find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) -set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) +find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log) +set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR}) add_executable(entity_creation entity_creation.cc) target_link_libraries(entity_creation diff --git a/examples/standalone/joy_to_twist/CMakeLists.txt b/examples/standalone/joy_to_twist/CMakeLists.txt index 2344583176..4f77908aa1 100644 --- a/examples/standalone/joy_to_twist/CMakeLists.txt +++ b/examples/standalone/joy_to_twist/CMakeLists.txt @@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-sim-joy-to-twist) -find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) -set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) +find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log) +set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR}) -find_package(sdformat14 REQUIRED) -set(SDF_VER ${sdformat14_VERSION_MAJOR}) +find_package(sdformat15 REQUIRED) +set(SDF_VER ${sdformat15_VERSION_MAJOR}) add_executable(joy_to_twist joy_to_twist.cc) target_link_libraries(joy_to_twist diff --git a/examples/standalone/joystick/CMakeLists.txt b/examples/standalone/joystick/CMakeLists.txt index 2a4f593633..6168fdef1f 100644 --- a/examples/standalone/joystick/CMakeLists.txt +++ b/examples/standalone/joystick/CMakeLists.txt @@ -4,11 +4,11 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-sim-joystick) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) - set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) + find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log) + set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR}) - find_package(sdformat14 REQUIRED) - set(SDF_VER ${sdformat14_VERSION_MAJOR}) + find_package(sdformat15 REQUIRED) + set(SDF_VER ${sdformat15_VERSION_MAJOR}) add_executable(joystick joystick.cc) target_link_libraries(joystick diff --git a/examples/standalone/keyboard/CMakeLists.txt b/examples/standalone/keyboard/CMakeLists.txt index 04227710c7..7f5f25c3d5 100644 --- a/examples/standalone/keyboard/CMakeLists.txt +++ b/examples/standalone/keyboard/CMakeLists.txt @@ -3,17 +3,17 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-sim-keyboard) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) - set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) + find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log) + set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR}) - find_package(sdformat14 REQUIRED) - set(SDF_VER ${sdformat14_VERSION_MAJOR}) + find_package(sdformat15 REQUIRED) + set(SDF_VER ${sdformat15_VERSION_MAJOR}) - find_package(gz-msgs10 REQUIRED) - set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR}) + find_package(gz-msgs11 REQUIRED) + set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR}) - find_package(gz-common5 REQUIRED) - set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) + find_package(gz-common6 REQUIRED) + set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) add_executable(keyboard keyboard.cc) target_link_libraries(keyboard diff --git a/examples/standalone/light_control/CMakeLists.txt b/examples/standalone/light_control/CMakeLists.txt index b54b5f8a5f..9464d76bdf 100644 --- a/examples/standalone/light_control/CMakeLists.txt +++ b/examples/standalone/light_control/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-sim-light-control) -find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) -set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) +find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log) +set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR}) find_package(gz-sim9 REQUIRED) set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR}) diff --git a/examples/standalone/lrauv_control/CMakeLists.txt b/examples/standalone/lrauv_control/CMakeLists.txt index cd17e2c16a..e55e371d8d 100644 --- a/examples/standalone/lrauv_control/CMakeLists.txt +++ b/examples/standalone/lrauv_control/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-sim-lrauv-control) -find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) -set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) +find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log) +set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR}) find_package(gz-sim9 REQUIRED) set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR}) diff --git a/examples/standalone/lrauv_control/lrauv_control.py b/examples/standalone/lrauv_control/lrauv_control.py index 8f7ad2cf21..56eb0088aa 100644 --- a/examples/standalone/lrauv_control/lrauv_control.py +++ b/examples/standalone/lrauv_control/lrauv_control.py @@ -26,10 +26,10 @@ # $ python3 lrauv_control.py 0.5 0.78 0.174 # -from gz.msgs10.double_pb2 import Double -from gz.msgs10.odometry_pb2 import Odometry -from gz.math7 import Quaterniond, Vector3d -from gz.transport13 import Node +from gz.msgs11.double_pb2 import Double +from gz.msgs11.odometry_pb2 import Odometry +from gz.math8 import Quaterniond, Vector3d +from gz.transport14 import Node from threading import Lock diff --git a/examples/standalone/marker/CMakeLists.txt b/examples/standalone/marker/CMakeLists.txt index bbca4e481d..29a590bae9 100644 --- a/examples/standalone/marker/CMakeLists.txt +++ b/examples/standalone/marker/CMakeLists.txt @@ -3,14 +3,14 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-sim-marker) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - find_package(gz-transport13 QUIET REQUIRED) - set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) + find_package(gz-transport14 QUIET REQUIRED) + set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR}) - find_package(gz-common5 REQUIRED) - set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR}) + find_package(gz-common6 REQUIRED) + set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR}) - find_package(gz-msgs10 REQUIRED) - set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR}) + find_package(gz-msgs11 REQUIRED) + set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR}) add_executable(marker marker.cc) target_link_libraries(marker diff --git a/examples/standalone/multi_lrauv_race/CMakeLists.txt b/examples/standalone/multi_lrauv_race/CMakeLists.txt index f34fd7b584..d80e811934 100644 --- a/examples/standalone/multi_lrauv_race/CMakeLists.txt +++ b/examples/standalone/multi_lrauv_race/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-sim-multi-lrauv-race) -find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) -set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) +find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log) +set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR}) find_package(gz-sim9 REQUIRED) set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR}) diff --git a/examples/standalone/multi_lrauv_race/multi_lrauv_race.py b/examples/standalone/multi_lrauv_race/multi_lrauv_race.py index fa565feed1..aff979c158 100644 --- a/examples/standalone/multi_lrauv_race/multi_lrauv_race.py +++ b/examples/standalone/multi_lrauv_race/multi_lrauv_race.py @@ -26,8 +26,8 @@ # before for other python examples. You can use then following: # $ export PYTHONPATH=$PYTHONPATH:/install/lib/python -from gz.msgs10.double_pb2 import Double -from gz.transport13 import Node +from gz.msgs11.double_pb2 import Double +from gz.transport14 import Node import random import time diff --git a/examples/standalone/scene_requester/CMakeLists.txt b/examples/standalone/scene_requester/CMakeLists.txt index e47e8eac87..542f3a9491 100644 --- a/examples/standalone/scene_requester/CMakeLists.txt +++ b/examples/standalone/scene_requester/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-sim-scene-requester) -find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log) -set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR}) +find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log) +set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR}) add_executable(scene_requester scene_requester.cc) target_link_libraries(scene_requester diff --git a/python/test/gz_test_deps/common.py b/python/test/gz_test_deps/common.py index d28e66e5e5..60f802749d 100644 --- a/python/test/gz_test_deps/common.py +++ b/python/test/gz_test_deps/common.py @@ -1 +1 @@ -from gz.common5 import * +from gz.common6 import * diff --git a/python/test/gz_test_deps/math.py b/python/test/gz_test_deps/math.py index cb2860c798..d84d0a4777 100644 --- a/python/test/gz_test_deps/math.py +++ b/python/test/gz_test_deps/math.py @@ -1 +1 @@ -from gz.math7 import * +from gz.math8 import * diff --git a/python/test/gz_test_deps/msgs.py b/python/test/gz_test_deps/msgs.py index e91bef7942..c28bb81ef3 100644 --- a/python/test/gz_test_deps/msgs.py +++ b/python/test/gz_test_deps/msgs.py @@ -1,3 +1,3 @@ import sys -import gz.msgs10 -sys.modules["gz_test_deps.msgs"] = gz.msgs10 +import gz.msgs11 +sys.modules["gz_test_deps.msgs"] = gz.msgs11 diff --git a/python/test/gz_test_deps/sdformat.py b/python/test/gz_test_deps/sdformat.py index 51cec2889b..5d34df703e 100644 --- a/python/test/gz_test_deps/sdformat.py +++ b/python/test/gz_test_deps/sdformat.py @@ -1 +1 @@ -from sdformat14 import * +from sdformat15 import * diff --git a/python/test/gz_test_deps/transport.py b/python/test/gz_test_deps/transport.py index 242eeb064a..0c95691f87 100644 --- a/python/test/gz_test_deps/transport.py +++ b/python/test/gz_test_deps/transport.py @@ -1 +1 @@ -from gz.transport13 import * +from gz.transport14 import * diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6e666dafc9..176fdf1039 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,11 +11,11 @@ get_target_property(msgs_desc_file gz_msgs_generate_messages_impl( MSGS_GEN_SCRIPT - ${gz-msgs10_PROTO_GENERATOR_SCRIPT} + ${gz-msgs11_PROTO_GENERATOR_SCRIPT} FACTORY_GEN_SCRIPT - ${gz-msgs10_FACTORY_GENERATOR_SCRIPT} + ${gz-msgs11_FACTORY_GENERATOR_SCRIPT} GZ_PROTOC_PLUGIN - ${gz-msgs10_PROTO_GENERATOR_PLUGIN} + ${gz-msgs11_PROTO_GENERATOR_PLUGIN} INPUT_PROTOS ${gz_msgs_proto_files} PROTO_PACKAGE diff --git a/tutorials/create_system_plugins.md b/tutorials/create_system_plugins.md index dec24591d0..62b0beb4e8 100644 --- a/tutorials/create_system_plugins.md +++ b/tutorials/create_system_plugins.md @@ -85,8 +85,8 @@ Implement the system class as usual, for example: In your `CMakeLists.txt` add the following ``` -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}) # Add sources for each plugin to be registered. add_library(SampleSystem SampleSystem.cc SampleSystem2.cc) diff --git a/tutorials/migrating_ardupilot_plugin.md b/tutorials/migrating_ardupilot_plugin.md index 20f834ca8f..69bebd3245 100644 --- a/tutorials/migrating_ardupilot_plugin.md +++ b/tutorials/migrating_ardupilot_plugin.md @@ -727,14 +727,14 @@ In the new code we explicitly reference each Gazebo package that we use: ``` # NEW -find_package(sdformat14 REQUIRED) -find_package(gz-common5-all REQUIRED) +find_package(sdformat15 REQUIRED) +find_package(gz-common6-all REQUIRED) find_package(gz-sim9-all REQUIRED) -find_package(gz-math7-all REQUIRED) -find_package(gz-msgs10-all REQUIRED) -find_package(gz-physics7-all REQUIRED) -find_package(gz-sensors8-all REQUIRED) -find_package(gz-transport13-all REQUIRED) +find_package(gz-math8-all REQUIRED) +find_package(gz-msgs11-all REQUIRED) +find_package(gz-physics8-all REQUIRED) +find_package(gz-sensors9-all REQUIRED) +find_package(gz-transport14-all REQUIRED) ``` In the old code we need only refer to the build configuration retrieved from the Gazebo package: diff --git a/tutorials/python_interfaces.md b/tutorials/python_interfaces.md index e35e7b2492..e314280a43 100644 --- a/tutorials/python_interfaces.md +++ b/tutorials/python_interfaces.md @@ -96,7 +96,7 @@ Example python system: ```python -from gz.math7 import Vector3d +from gz.math8 import Vector3d from gz.sim9 import Model, Link import random