Bumps in harmonic : ci_matching_branch/bump_harmonic_gz-sim8 (#2062)

* Bumps in harmonic : ci_matching_branch/bump_harmonic_gz-sim8 * Fix sdformat deprecation --------- Signed-off-by: Addisu Z. Taddese <[email protected]>
gazebosim · Aug 8, 2023 · 65219b5 · 65219b5
1 parent e68ff3b
commit 65219b5
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 22 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -13,7 +13,7 @@ libgz-fuel-tools9-dev
 libgz-gui8-dev
 libgz-math7-eigen3-dev
 libgz-msgs10-dev
-libgz-physics6-dev
+libgz-physics7-dev
 libgz-plugin2-dev
 libgz-rendering8-dev
 libgz-sensors8-dev
@@ -24,7 +24,7 @@ libogre-1.9-dev
 libogre-next-2.3-dev
 libprotobuf-dev
 libprotoc-dev
-libsdformat13-dev
+libsdformat14-dev
 libtinyxml2-dev
 libxi-dev
 libxmu-dev

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,8 +67,8 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 # as protobuf could be find transitively by any dependency
 set(protobuf_MODULE_COMPATIBLE TRUE)
 
-gz_find_package(sdformat13 REQUIRED)
-set(SDF_VER ${sdformat13_VERSION_MAJOR})
+gz_find_package(sdformat14 REQUIRED)
+set(SDF_VER ${sdformat14_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-plugin
@@ -117,14 +117,14 @@ gz_find_package (Qt5
 
 #--------------------------------------
 # Find gz-physics
-gz_find_package(gz-physics6
+gz_find_package(gz-physics7
   COMPONENTS
     heightmap
     mesh
     sdf
   REQUIRED
 )
-set(GZ_PHYSICS_VER ${gz-physics6_VERSION_MAJOR})
+set(GZ_PHYSICS_VER ${gz-physics7_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-sensors

diff --git a/docker/Dockerfile.nightly b/docker/Dockerfile.nightly
@@ -16,14 +16,14 @@ RUN apt-get update \
     libgz-fuel-tools9-dev \
     libgz-math7-eigen3-dev \
     libgz-plugin2-dev \
-    libgz-physics6-dev \
+    libgz-physics7-dev \
     libgz-rendering8-dev \
     libgz-tools2-dev \
     libgz-transport13-dev \
     libgz-gui8-dev \
     libgz-msgs10-dev \
     libgz-sensors8-dev \
-    libsdformat13-dev
+    libsdformat14-dev
 
 COPY . gz-sim
 RUN cd gz-sim \

diff --git a/examples/scripts/python_api/testFixture.py b/examples/scripts/python_api/testFixture.py
@@ -25,7 +25,7 @@
 import os
 
 from gz.common import set_verbosity
-from gz.sim7 import TestFixture, World, world_entity
+from gz.sim8 import TestFixture, World, world_entity
 from gz.math7 import Vector3d
 
 set_verbosity(4)

diff --git a/examples/standalone/joy_to_twist/CMakeLists.txt b/examples/standalone/joy_to_twist/CMakeLists.txt
@@ -5,8 +5,8 @@ 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(sdformat13 REQUIRED)
-set(SDF_VER ${sdformat13_VERSION_MAJOR})
+find_package(sdformat14 REQUIRED)
+set(SDF_VER ${sdformat14_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
@@ -7,8 +7,8 @@ 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(sdformat13 REQUIRED)
-  set(SDF_VER ${sdformat13_VERSION_MAJOR})
+  find_package(sdformat14 REQUIRED)
+  set(SDF_VER ${sdformat14_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
@@ -6,8 +6,8 @@ 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(sdformat13 REQUIRED)
-  set(SDF_VER ${sdformat13_VERSION_MAJOR})
+  find_package(sdformat14 REQUIRED)
+  set(SDF_VER ${sdformat14_VERSION_MAJOR})
 
   find_package(gz-msgs10 REQUIRED)
   set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR})

diff --git a/src/SdfEntityCreator.cc b/src/SdfEntityCreator.cc
@@ -160,7 +160,7 @@ static Entity FindDescendentLinkEntityByName(const std::string &_name,
                                              const Entity &_model,
                                              const EntityComponentManager &_ecm)
 {
-  auto ind = _name.find(sdf::kSdfScopeDelimiter);
+  auto ind = _name.find(sdf::kScopeDelimiter);
   std::vector<Entity> candidates;
   if (ind != std::string::npos)
   {

diff --git a/tutorials/blender_distort_meshes.md b/tutorials/blender_distort_meshes.md
@@ -25,7 +25,7 @@ If newer versions do not work for you, Blender 2.92 can be found
 ## Usage
 
 Locate or download the Blender Python
-[script](https://github.com/gazebosim/gz-sim/blob/gz-sim7/examples/scripts/blender/distort_mesh.py).
+[script](https://github.com/gazebosim/gz-sim/blob/gz-sim8/examples/scripts/blender/distort_mesh.py).
 
 Launch the Blender GUI.
 

diff --git a/tutorials/blender_sdf_exporter.md b/tutorials/blender_sdf_exporter.md
@@ -12,7 +12,7 @@ mesh/materials/lights feature set. As such feel free to customize the script as
 
 ## Using the Blender SDF Exporter
 
-1. Download the blender script in [sdf_exporter.py](https://github.com/gazebosim/gz-sim/tree/gz-sim7/examples/scripts/blender/sdf_exporter.py).
+1. Download the blender script in [sdf_exporter.py](https://github.com/gazebosim/gz-sim/tree/gz-sim8/examples/scripts/blender/sdf_exporter.py).
 
 2. Open the script under Blender's Scripting tab and run it.
 

diff --git a/tutorials/migrating_ardupilot_plugin.md b/tutorials/migrating_ardupilot_plugin.md
@@ -729,12 +729,12 @@ In the new code we explicitly reference each Gazebo package that we use:
 
 ```
 # NEW
-find_package(sdformat13 REQUIRED)
+find_package(sdformat14 REQUIRED)
 find_package(gz-common5-all REQUIRED)
 find_package(gz-sim8-all REQUIRED)
 find_package(gz-math7-all REQUIRED)
 find_package(gz-msgs10-all REQUIRED)
-find_package(gz-physics6-all REQUIRED)
+find_package(gz-physics7-all REQUIRED)
 find_package(gz-sensors8-all REQUIRED)
 find_package(gz-transport13-all REQUIRED)
 ```

diff --git a/tutorials/python_interfaces.md b/tutorials/python_interfaces.md
@@ -43,7 +43,7 @@ server.run(True, 1000, False)
 # Run the example
 
 In the
-[examples/scripts/python_api](https://github.com/gazebosim/gz-sim/tree/gz-sim7/examples/scripts/python_api)
+[examples/scripts/python_api](https://github.com/gazebosim/gz-sim/tree/gz-sim8/examples/scripts/python_api)
 folder there is a Python script that shows how to make use of this API.
 
 If you compiled Gazebo from source you should modify your `PYTHONPATH`:

diff --git a/tutorials/reset_simulation.md b/tutorials/reset_simulation.md
@@ -9,7 +9,7 @@ In addition to the API, we have also expanded the simulation system API with a R
 System authors may now choose to implement the Reset interface to have a more intelligent
 reset process (avoiding reloading assets or regenerating scene graphs being the motivating examples).
 Since this interface is opt-in, systems that don't implement the API will still be reset via destruction and reconstruction.
-The [physics](https://github.com/gazebosim/gz-sim/blob/gz-sim7/src/systems/physics/Physics.cc#L928-L937) and [rendering systems](https://github.com/gazebosim/gz-sim/blob/gz-sim7/src/systems/scene_broadcaster/SceneBroadcaster.cc#L452-L458) are the first two to implement this optimized reset functionality, with more to come as it makes sense to.
+The [physics](https://github.com/gazebosim/gz-sim/blob/gz-sim8/src/systems/physics/Physics.cc#L928-L937) and [rendering systems](https://github.com/gazebosim/gz-sim/blob/gz-sim8/src/systems/scene_broadcaster/SceneBroadcaster.cc#L452-L458) are the first two to implement this optimized reset functionality, with more to come as it makes sense to.
 
 Following the tutorial \subpage createsystemplugins we should implement `ISystemReset` interface.