Bump main to 7.0.0~pre1 (#1094)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Oct 15, 2021 · 5bde564 · 5bde564
1 parent 30df078
commit 5bde564
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 31 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(ignition-gazebo6 VERSION 6.0.0)
+project(ignition-gazebo7 VERSION 7.0.0)
 
 #============================================================================
 # Find ignition-cmake

diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,7 @@
+## Ignition Gazebo 7.x
+
+### Ignition Gazebo 7.X.X (20XX-XX-XX)
+
 ## Ignition Gazebo 6.x
 
 ### Ignition Gazebo 6.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(ignition-plugin1 REQUIRED COMPONENTS register)
 set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
 
-find_package(ignition-gazebo6 REQUIRED)
+find_package(ignition-gazebo7 REQUIRED)
 add_library(CommandActor SHARED CommandActor.cc)
 set_property(TARGET CommandActor PROPERTY CXX_STANDARD 17)
 target_link_libraries(CommandActor
  PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
- PRIVATE ignition-gazebo6::ignition-gazebo6)
+ PRIVATE ignition-gazebo7::ignition-gazebo7)
diff --git a/examples/plugin/custom_component/CMakeLists.txt b/examples/plugin/custom_component/CMakeLists.txt
@@ -7,11 +7,11 @@ project(CustomComponentPlugin)
 find_package(ignition-plugin1 REQUIRED COMPONENTS register)
 set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
 
-find_package(ignition-gazebo6 REQUIRED)
+find_package(ignition-gazebo7 REQUIRED)
 add_library(CustomComponentPlugin SHARED
  CustomComponentPlugin.cc
 )
 set_property(TARGET CustomComponentPlugin PROPERTY CXX_STANDARD 17)
 target_link_libraries(CustomComponentPlugin
  PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
- PRIVATE ignition-gazebo6::ignition-gazebo6)
+ PRIVATE ignition-gazebo7::ignition-gazebo7)
diff --git a/examples/plugin/custom_sensor_system/CMakeLists.txt b/examples/plugin/custom_sensor_system/CMakeLists.txt
@@ -7,8 +7,8 @@ project(OdometerSystem)
 ign_find_package(ignition-plugin1 REQUIRED COMPONENTS register)
 set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
 
-ign_find_package(ignition-gazebo6 REQUIRED)
-set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR})
+ign_find_package(ignition-gazebo7 REQUIRED)
+set(IGN_GAZEBO_VER ${ignition-gazebo7_VERSION_MAJOR})
 
 find_package(ignition-sensors6 REQUIRED)
 set(IGN_SENSORS_VER ${ignition-sensors6_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(ignition-gazebo6 REQUIRED COMPONENTS gui)
+find_package(ignition-gazebo7 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 ignition-gazebo6::gui
+ PRIVATE ignition-gazebo7::gui
 )
diff --git a/examples/plugin/hello_world/CMakeLists.txt b/examples/plugin/hello_world/CMakeLists.txt
@@ -7,8 +7,8 @@ project(Hello_world)
 ign_find_package(ignition-plugin1 REQUIRED COMPONENTS register)
 set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
 
-ign_find_package(ignition-gazebo6 REQUIRED)
-set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR})
+ign_find_package(ignition-gazebo7 REQUIRED)
+set(IGN_GAZEBO_VER ${ignition-gazebo7_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(ignition-plugin1 REQUIRED COMPONENTS register)
-find_package(ignition-gazebo6 REQUIRED)
+find_package(ignition-gazebo7 REQUIRED)
 
 add_library(${SERVER_PLUGIN} SHARED ${SERVER_PLUGIN}.cc)
 set_property(TARGET ${SERVER_PLUGIN} PROPERTY CXX_STANDARD 17)
 target_link_libraries(${SERVER_PLUGIN}
  PRIVATE
  ignition-plugin1::ignition-plugin1
- ignition-gazebo6::ignition-gazebo6
+ ignition-gazebo7::ignition-gazebo7
  ignition-rendering6::ignition-rendering6
 )
diff --git a/examples/plugin/system_plugin/CMakeLists.txt b/examples/plugin/system_plugin/CMakeLists.txt
@@ -7,9 +7,9 @@ project(SampleSystem)
 find_package(ignition-plugin1 REQUIRED COMPONENTS register)
 set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
 
-find_package(ignition-gazebo6 REQUIRED)
+find_package(ignition-gazebo7 REQUIRED)
 add_library(SampleSystem SHARED SampleSystem.cc SampleSystem2.cc)
 set_property(TARGET SampleSystem PROPERTY CXX_STANDARD 17)
 target_link_libraries(SampleSystem
  PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
- PRIVATE ignition-gazebo6::ignition-gazebo6)
+ PRIVATE ignition-gazebo7::ignition-gazebo7)
diff --git a/examples/standalone/custom_server/CMakeLists.txt b/examples/standalone/custom_server/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- find_package(ignition-gazebo6 REQUIRED)
- set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR})
+ find_package(ignition-gazebo7 REQUIRED)
+ set(IGN_GAZEBO_VER ${ignition-gazebo7_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
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(ignition-gazebo6 QUIET REQUIRED)
+find_package(ignition-gazebo7 QUIET REQUIRED)
 
 add_executable(each each.cc)
 target_link_libraries(each
- ignition-gazebo6::core)
+ ignition-gazebo7::core)
 
diff --git a/examples/standalone/external_ecm/CMakeLists.txt b/examples/standalone/external_ecm/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(ignition-gazebo6 REQUIRED)
+find_package(ignition-gazebo7 REQUIRED)
 
 add_executable(external_ecm external_ecm.cc)
 target_link_libraries(external_ecm
- ignition-gazebo6::core)
+ ignition-gazebo7::core)
diff --git a/examples/standalone/gtest_setup/CMakeLists.txt b/examples/standalone/gtest_setup/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.11.0 FATAL_ERROR)
 project(GTestSetup)
 
 # Find Gazebo
-set(IGN_GAZEBO_VER 6)
+set(IGN_GAZEBO_VER 7)
 find_package(ignition-gazebo${IGN_GAZEBO_VER} REQUIRED)
 
 # Fetch and configure GTest

diff --git a/examples/standalone/light_control/CMakeLists.txt b/examples/standalone/light_control/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
 set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
 
-find_package(ignition-gazebo6 REQUIRED)
-set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR})
+find_package(ignition-gazebo7 REQUIRED)
+set(IGN_GAZEBO_VER ${ignition-gazebo7_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
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
 set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
 
-find_package(ignition-gazebo6 REQUIRED)
-set(IGN_GAZEBO_VER ${ignition-gazebo6_VERSION_MAJOR})
+find_package(ignition-gazebo7 REQUIRED)
+set(IGN_GAZEBO_VER ${ignition-gazebo7_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
@@ -753,7 +753,7 @@ In the new code we explicitly reference each Ignition package that we use:
 # NEW
 find_package(sdformat12 REQUIRED)
 find_package(ignition-common4-all REQUIRED)
-find_package(ignition-gazebo6-all REQUIRED)
+find_package(ignition-gazebo7-all REQUIRED)
 find_package(ignition-math6-all REQUIRED)
 find_package(ignition-msgs8-all REQUIRED)
 find_package(ignition-physics5-all REQUIRED)

diff --git a/tutorials/rendering_plugins.md b/tutorials/rendering_plugins.md
@@ -8,7 +8,7 @@ This is not to be confused with integrating a new rendering engine. See
 for that.
 
 This tutorial will go over a couple of example plugins that are located at
-https://github.com/ignitionrobotics/ign-gazebo/tree/ign-gazebo6/examples/plugin/rendering_plugins.
+https://github.com/ignitionrobotics/ign-gazebo/tree/main/examples/plugin/rendering_plugins.
 
 ## Scenes
 
@@ -48,7 +48,7 @@ To interact with the client-side scene, you'll need to write an
 [ignition::gui::Plugin](https://ignitionrobotics.org/api/gui/4.1/classignition_1_1gui_1_1Plugin.html),
 or a more specialized `ignition::gazebo::GuiSystem`
 if you need to access entities and components.
-See the [GUI system plugin example](https://github.com/ignitionrobotics/ign-gazebo/tree/ign-gazebo6/examples/plugin/gui_system_plugin).
+See the [GUI system plugin example](https://github.com/ignitionrobotics/ign-gazebo/tree/main/examples/plugin/gui_system_plugin).
 
 ## Getting the scene
 
@@ -123,7 +123,7 @@ Here's how to do it:
 ## Running examples
 
 Follow the build instructions on the rendering plugins
-[README](https://github.com/ignitionrobotics/ign-gazebo/blob/ign-gazebo6/examples/plugin/rendering_plugins)
+[README](https://github.com/ignitionrobotics/ign-gazebo/blob/main/examples/plugin/rendering_plugins)
 and you'll generate both plugins:
 
 * `RenderingGuiPlugin`: GUI plugin that updates the GUI scene's ambient light with a random color at each click.

diff --git a/tutorials/test_fixture.md b/tutorials/test_fixture.md
@@ -10,7 +10,7 @@ using Continuous Integration (CI).
 Gazebo can be used for testing using any testing library. We provide
 an example of how to setup some test cases using
 [Google Test](https://github.com/google/googletest) in
-[ign-gazebo/examples/standalone/gtest_setup](https://github.com/ignitionrobotics/ign-gazebo/tree/ign-gazebo6/examples/standalone/gtest_setup).
+[ign-gazebo/examples/standalone/gtest_setup](https://github.com/ignitionrobotics/ign-gazebo/tree/main/examples/standalone/gtest_setup).
 
 The instructions on that example's `README` can be followed to compile and run
 those tests. Also be sure to go through the source code for comments with