Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bumps in Ionic: gz-sim9 #2205

Merged
merged 4 commits into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
pull_request:
push:
branches:
- 'gz-sim8'
- 'main'

# Every time you make a push to your PR, it cancel immediately the previous checks,
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
#============================================================================
# Initialize the project
#============================================================================
project(gz-sim8 VERSION 8.0.0)
set (GZ_DISTRIBUTION "Harmonic")
project(gz-sim9 VERSION 9.0.0)
set (GZ_DISTRIBUTION "Ionic")

#============================================================================
# Find gz-cmake
Expand Down
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Gazebo Sim 9.x

### Gazebo Sim 9.0.0 (2024-XX-XX)

## Gazebo Sim 8.x

### Gazebo Sim 8.0.0 (2023-09-29)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ introspection and control.

# Install

See the [installation tutorial](https://gazebosim.org/api/sim/8/install.html).
See the [installation tutorial](https://gazebosim.org/api/sim/9/install.html).

# Usage

Expand Down Expand Up @@ -125,11 +125,11 @@ This issue is tracked [here](https://github.com/gazebosim/gz-tools/issues/8).

# Documentation

See the [installation tutorial](https://gazebosim.org/api/sim/8/install.html).
See the [installation tutorial](https://gazebosim.org/api/sim/9/install.html).

# Testing

See the [installation tutorial](https://gazebosim.org/api/sim/8/install.html).
See the [installation tutorial](https://gazebosim.org/api/sim/9/install.html).

See the [Writing Tests section of the contributor guide](https://github.com/gazebosim/gz-sim/blob/main/CONTRIBUTING.md#writing-tests) for help creating or modifying tests.

Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/command_actor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ project(CommandActor)
find_package(gz-plugin2 REQUIRED COMPONENTS register)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

find_package(gz-sim8 REQUIRED)
find_package(gz-sim9 REQUIRED)
add_library(CommandActor SHARED CommandActor.cc)
set_property(TARGET CommandActor PROPERTY CXX_STANDARD 17)
target_link_libraries(CommandActor
PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
PRIVATE gz-sim8::gz-sim8)
PRIVATE gz-sim9::gz-sim9)
4 changes: 2 additions & 2 deletions examples/plugin/custom_component/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ project(CustomComponentPlugin)
find_package(gz-plugin2 REQUIRED COMPONENTS register)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

find_package(gz-sim8 REQUIRED)
find_package(gz-sim9 REQUIRED)
add_library(CustomComponentPlugin SHARED
CustomComponentPlugin.cc
)
set_property(TARGET CustomComponentPlugin PROPERTY CXX_STANDARD 17)
target_link_libraries(CustomComponentPlugin
PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
PRIVATE gz-sim8::gz-sim8)
PRIVATE gz-sim9::gz-sim9)
4 changes: 2 additions & 2 deletions examples/plugin/custom_sensor_system/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ project(OdometerSystem)
gz_find_package(gz-plugin2 REQUIRED COMPONENTS register)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

gz_find_package(gz-sim8 REQUIRED)
set(GZ_SIM_VER ${gz-sim8_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})
Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/gui_system_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ project(GuiSystemPlugin)

set(CMAKE_AUTOMOC ON)

find_package(gz-sim8 REQUIRED COMPONENTS gui)
find_package(gz-sim9 REQUIRED COMPONENTS gui)

QT5_ADD_RESOURCES(resources_RCC ${PROJECT_NAME}.qrc)

Expand All @@ -17,5 +17,5 @@ add_library(${PROJECT_NAME} SHARED
${resources_RCC}
)
target_link_libraries(${PROJECT_NAME}
PRIVATE gz-sim8::gui
PRIVATE gz-sim9::gui
)
4 changes: 2 additions & 2 deletions examples/plugin/hello_world/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ project(Hello_world)
gz_find_package(gz-plugin2 REQUIRED COMPONENTS register)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

gz_find_package(gz-sim8 REQUIRED)
set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
gz_find_package(gz-sim9 REQUIRED)
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

add_library(HelloWorld SHARED HelloWorld.cc)
set_property(TARGET HelloWorld PROPERTY CXX_STANDARD 17)
Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/rendering_plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ target_link_libraries(${GUI_PLUGIN}
set(SERVER_PLUGIN RenderingServerPlugin)

find_package(gz-plugin2 REQUIRED COMPONENTS register)
find_package(gz-sim8 REQUIRED)
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-sim8::gz-sim8
gz-sim9::gz-sim9
gz-rendering8::gz-rendering8
)
4 changes: 2 additions & 2 deletions examples/plugin/reset_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ project(ResetPlugins)
find_package(gz-plugin2 REQUIRED COMPONENTS register)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

find_package(gz-sim8 REQUIRED)
set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
find_package(gz-sim9 REQUIRED)
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

add_library(JointPositionRandomizer SHARED JointPositionRandomizer.cc)
target_link_libraries(JointPositionRandomizer
Expand Down
4 changes: 2 additions & 2 deletions examples/plugin/system_plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ project(SampleSystem)
find_package(gz-plugin2 REQUIRED COMPONENTS register)
set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

find_package(gz-sim8 REQUIRED)
find_package(gz-sim9 REQUIRED)
add_library(SampleSystem SHARED SampleSystem.cc SampleSystem2.cc)
set_property(TARGET SampleSystem PROPERTY CXX_STANDARD 17)
target_link_libraries(SampleSystem
PRIVATE gz-plugin${GZ_PLUGIN_VER}::gz-plugin${GZ_PLUGIN_VER}
PRIVATE gz-sim8::gz-sim8)
PRIVATE gz-sim9::gz-sim9)
2 changes: 1 addition & 1 deletion examples/scripts/python_api/systems/test_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

from gz.math7 import Vector3d
from gz.sim8 import Model, Link
from gz.sim9 import Model, Link
import random


Expand Down
2 changes: 1 addition & 1 deletion examples/scripts/python_api/testFixture.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import os

from gz.common5 import set_verbosity
from gz.sim8 import TestFixture, World, world_entity
from gz.sim9 import TestFixture, World, world_entity
from gz.math7 import Vector3d

set_verbosity(4)
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/acoustic_comms_demo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ 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-sim8 REQUIRED)
set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
find_package(gz-sim9 REQUIRED)
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

add_executable(acoustic_comms_demo acoustic_comms_demo.cc)
target_link_libraries(acoustic_comms_demo
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/custom_server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-sim-custom-server)

if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
find_package(gz-sim8 REQUIRED)
set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
find_package(gz-sim9 REQUIRED)
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

add_executable(custom_server custom_server.cc)
target_link_libraries(custom_server
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/each_performance/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

project(gz-sim-each-performance)

find_package(gz-sim8 QUIET REQUIRED)
find_package(gz-sim9 QUIET REQUIRED)

add_executable(each each.cc)
target_link_libraries(each
gz-sim8::core)
gz-sim9::core)
4 changes: 2 additions & 2 deletions examples/standalone/external_ecm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

project(gz-sim-external-ecm)

find_package(gz-sim8 REQUIRED)
find_package(gz-sim9 REQUIRED)

add_executable(external_ecm external_ecm.cc)
target_link_libraries(external_ecm
gz-sim8::core)
gz-sim9::core)
4 changes: 2 additions & 2 deletions examples/standalone/gtest_setup/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.11.0 FATAL_ERROR)
project(GTestSetup)

# Find Gazebo
find_package(gz-sim8 REQUIRED)
set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
find_package(gz-sim9 REQUIRED)
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

# Fetch and configure GTest
include(FetchContent)
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/light_control/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ 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-sim8 REQUIRED)
set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
find_package(gz-sim9 REQUIRED)
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

add_executable(light_control light_control.cc)
target_link_libraries(light_control
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/lrauv_control/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ 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-sim8 REQUIRED)
set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
find_package(gz-sim9 REQUIRED)
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

add_executable(lrauv_control lrauv_control.cc)
target_link_libraries(lrauv_control
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/multi_lrauv_race/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ 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-sim8 REQUIRED)
set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
find_package(gz-sim9 REQUIRED)
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})

add_executable(multi_lrauv_race multi_lrauv_race.cc)
target_link_libraries(multi_lrauv_race
Expand Down
2 changes: 1 addition & 1 deletion python/test/gz_test_deps/sim.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from gz.sim8 import *
from gz.sim9 import *
2 changes: 1 addition & 1 deletion tutorials/blender_distort_meshes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-sim8/examples/scripts/blender/distort_mesh.py).
[script](https://github.com/gazebosim/gz-sim/blob/main/examples/scripts/blender/distort_mesh.py).

Launch the Blender GUI.

Expand Down
2 changes: 1 addition & 1 deletion tutorials/blender_sdf_exporter.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-sim8/examples/scripts/blender/sdf_exporter.py).
1. Download the blender script in [sdf_exporter.py](https://github.com/gazebosim/gz-sim/tree/main/examples/scripts/blender/sdf_exporter.py).

2. Open the script under Blender's Scripting tab and run it.

Expand Down
2 changes: 1 addition & 1 deletion tutorials/migrating_ardupilot_plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ 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(gz-sim8-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)
Expand Down
4 changes: 2 additions & 2 deletions tutorials/python_interfaces.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-sim8/examples/scripts/python_api)
[examples/scripts/python_api](https://github.com/gazebosim/gz-sim/tree/main/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`:
Expand Down Expand Up @@ -97,7 +97,7 @@ Example python system:
<!-- \include examples/scripts/python_api/systems/test_system.py -->
```python
from gz.math7 import Vector3d
from gz.sim8 import Model, Link
from gz.sim9 import Model, Link
import random


Expand Down
4 changes: 2 additions & 2 deletions tutorials/triggered_publisher.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ Publisher systems can be chained together by showing how the falling of the box
can trigger another box to fall. Last, it covers how a service call can be
triggered to reset the robot pose. The finished world SDFormat file for this
tutorial can be found in
[examples/worlds/triggered_publisher.sdf](https://github.com/gazebosim/gz-sim/blob/gz-sim8/examples/worlds/triggered_publisher.sdf)
[examples/worlds/triggered_publisher.sdf](https://github.com/gazebosim/gz-sim/blob/main/examples/worlds/triggered_publisher.sdf)

We will use the differential drive vehicle from
[examples/worlds/diff_drive.sdf](https://github.com/gazebosim/gz-sim/blob/gz-sim8/examples/worlds/diff_drive.sdf),
[examples/worlds/diff_drive.sdf](https://github.com/gazebosim/gz-sim/blob/main/examples/worlds/diff_drive.sdf),
but modify the input topic of the `DiffDrive` system to `cmd_vel`. A snippet of
the change to the `DiffDrive` system is shown below:

Expand Down
Loading