⬆️ Bump main to 8.0.0~pre1 (#1640)

Signed-off-by: Louise Poubel <[email protected]> Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Aug 10, 2022 · 734ff3a · 734ff3a
1 parent d90fab2
commit 734ff3a
Show file tree

Hide file tree

Showing 17 changed files with 36 additions and 31 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,8 +3,9 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-sim7 VERSION 7.0.0)
-set (GZ_DISTRIBUTION "Garden")
+project(gz-sim8 VERSION 8.0.0)
+# TODO(chapulina) Update name when it's chosen and the version bumped
+set (GZ_DISTRIBUTION "?")
 
 #============================================================================
 # Find gz-cmake

diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,7 @@
+## Gazebo Sim 8.x
+
+### Gazebo Sim 8.X.X (20XX-XX-XX)
+
 ## Gazebo Sim 7.x
 
 ### Gazebo Sim 7.X.X (20XX-XX-XX)

diff --git a/examples/plugin/command_actor/CMakeLists.txt b/examples/plugin/command_actor/CMakeLists.txt
@@ -7,9 +7,9 @@ project(CommandActor)
 find_package(gz-plugin2 REQUIRED COMPONENTS register)
 set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
 
-find_package(gz-sim7 REQUIRED)
+find_package(gz-sim8 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-sim7::gz-sim7)
+  PRIVATE gz-sim8::gz-sim8)
diff --git a/examples/plugin/custom_component/CMakeLists.txt b/examples/plugin/custom_component/CMakeLists.txt
@@ -7,11 +7,11 @@ project(CustomComponentPlugin)
 find_package(gz-plugin2 REQUIRED COMPONENTS register)
 set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
 
-find_package(gz-sim7 REQUIRED)
+find_package(gz-sim8 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-sim7::gz-sim7)
+  PRIVATE gz-sim8::gz-sim8)
diff --git a/examples/plugin/custom_sensor_system/CMakeLists.txt b/examples/plugin/custom_sensor_system/CMakeLists.txt
@@ -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-sim7 REQUIRED)
-set(GZ_SIM_VER ${gz-sim7_VERSION_MAJOR})
+gz_find_package(gz-sim8 REQUIRED)
+set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
 
 find_package(gz-sensors7 REQUIRED)
 set(GZ_SENSORS_VER ${gz-sensors7_VERSION_MAJOR})

diff --git a/examples/plugin/gui_system_plugin/CMakeLists.txt b/examples/plugin/gui_system_plugin/CMakeLists.txt
@@ -8,7 +8,7 @@ project(GuiSystemPlugin)
 
 set(CMAKE_AUTOMOC ON)
 
-find_package(gz-sim7 REQUIRED COMPONENTS gui)
+find_package(gz-sim8 REQUIRED COMPONENTS gui)
 
 QT5_ADD_RESOURCES(resources_RCC ${PROJECT_NAME}.qrc)
 
@@ -17,5 +17,5 @@ add_library(${PROJECT_NAME} SHARED
   ${resources_RCC}
 )
 target_link_libraries(${PROJECT_NAME}
-  PRIVATE gz-sim7::gui
+  PRIVATE gz-sim8::gui
 )
diff --git a/examples/plugin/hello_world/CMakeLists.txt b/examples/plugin/hello_world/CMakeLists.txt
@@ -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-sim7 REQUIRED)
-set(GZ_SIM_VER ${gz-sim7_VERSION_MAJOR})
+gz_find_package(gz-sim8 REQUIRED)
+set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
 
 add_library(HelloWorld SHARED HelloWorld)
 set_property(TARGET HelloWorld PROPERTY CXX_STANDARD 17)

diff --git a/examples/plugin/rendering_plugins/CMakeLists.txt b/examples/plugin/rendering_plugins/CMakeLists.txt
@@ -32,13 +32,13 @@ target_link_libraries(${GUI_PLUGIN}
 set(SERVER_PLUGIN RenderingServerPlugin)
 
 find_package(gz-plugin2 REQUIRED COMPONENTS register)
-find_package(gz-sim7 REQUIRED)
+find_package(gz-sim8 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-sim7::gz-sim7
+    gz-sim8::gz-sim8
     gz-rendering7::gz-rendering7
 )
diff --git a/examples/plugin/reset_plugin/CMakeLists.txt b/examples/plugin/reset_plugin/CMakeLists.txt
@@ -5,8 +5,8 @@ project(ResetPlugins)
 find_package(gz-plugin2 REQUIRED COMPONENTS register)
 set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
 
-find_package(gz-sim7 REQUIRED)
-set(GZ_SIM_VER ${gz-sim7_VERSION_MAJOR})
+find_package(gz-sim8 REQUIRED)
+set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
 
 add_library(JointPositionRandomizer SHARED JointPositionRandomizer.cc)
 target_link_libraries(JointPositionRandomizer 

diff --git a/examples/plugin/system_plugin/CMakeLists.txt b/examples/plugin/system_plugin/CMakeLists.txt
@@ -7,9 +7,9 @@ project(SampleSystem)
 find_package(gz-plugin2 REQUIRED COMPONENTS register)
 set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
 
-find_package(gz-sim7 REQUIRED)
+find_package(gz-sim8 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-sim7::gz-sim7)
+  PRIVATE gz-sim8::gz-sim8)
diff --git a/examples/standalone/custom_server/CMakeLists.txt b/examples/standalone/custom_server/CMakeLists.txt
@@ -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-sim7 REQUIRED)
-  set(GZ_SIM_VER ${gz-sim7_VERSION_MAJOR})
+  find_package(gz-sim8 REQUIRED)
+  set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
 
   add_executable(custom_server custom_server.cc)
   target_link_libraries(custom_server

diff --git a/examples/standalone/each_performance/CMakeLists.txt b/examples/standalone/each_performance/CMakeLists.txt
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
 project(gz-sim-each-performance)
 
-find_package(gz-sim7 QUIET REQUIRED)
+find_package(gz-sim8 QUIET REQUIRED)
 
 add_executable(each each.cc)
 target_link_libraries(each
-  gz-sim7::core)
+  gz-sim8::core)
 
diff --git a/examples/standalone/external_ecm/CMakeLists.txt b/examples/standalone/external_ecm/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
 project(gz-sim-external-ecm)
 
-find_package(gz-sim7 REQUIRED)
+find_package(gz-sim8 REQUIRED)
 
 add_executable(external_ecm external_ecm.cc)
 target_link_libraries(external_ecm
-  gz-sim7::core)
+  gz-sim8::core)
diff --git a/examples/standalone/gtest_setup/CMakeLists.txt b/examples/standalone/gtest_setup/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.11.0 FATAL_ERROR)
 project(GTestSetup)
 
 # Find Gazebo
-find_package(gz-sim7 REQUIRED)
-set(GZ_SIM_VER ${gz-sim7_VERSION_MAJOR})
+find_package(gz-sim8 REQUIRED)
+set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
 
 # Fetch and configure GTest
 include(FetchContent)

diff --git a/examples/standalone/light_control/CMakeLists.txt b/examples/standalone/light_control/CMakeLists.txt
@@ -5,8 +5,8 @@ project(gz-sim-light-control)
 find_package(gz-transport12 QUIET REQUIRED OPTIONAL_COMPONENTS log)
 set(GZ_TRANSPORT_VER ${gz-transport12_VERSION_MAJOR})
 
-find_package(gz-sim7 REQUIRED)
-set(GZ_SIM_VER ${gz-sim7_VERSION_MAJOR})
+find_package(gz-sim8 REQUIRED)
+set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
 
 add_executable(light_control light_control.cc)
 target_link_libraries(light_control

diff --git a/examples/standalone/multi_lrauv_race/CMakeLists.txt b/examples/standalone/multi_lrauv_race/CMakeLists.txt
@@ -5,8 +5,8 @@ project(gz-sim-multi-lrauv-race)
 find_package(gz-transport12 QUIET REQUIRED OPTIONAL_COMPONENTS log)
 set(GZ_TRANSPORT_VER ${gz-transport12_VERSION_MAJOR})
 
-find_package(gz-sim7 REQUIRED)
-set(GZ_SIM_VER ${gz-sim7_VERSION_MAJOR})
+find_package(gz-sim8 REQUIRED)
+set(GZ_SIM_VER ${gz-sim8_VERSION_MAJOR})
 
 add_executable(multi_lrauv_race multi_lrauv_race.cc)
 target_link_libraries(multi_lrauv_race

diff --git a/tutorials/migrating_ardupilot_plugin.md b/tutorials/migrating_ardupilot_plugin.md
@@ -731,7 +731,7 @@ In the new code we explicitly reference each Gazebo package that we use:
 # NEW
 find_package(sdformat13 REQUIRED)
 find_package(gz-common5-all REQUIRED)
-find_package(gz-sim7-all REQUIRED)
+find_package(gz-sim8-all REQUIRED)
 find_package(gz-math7-all REQUIRED)
 find_package(gz-msgs9-all REQUIRED)
 find_package(gz-physics6-all REQUIRED)