Merge 5426f21 into 2b3879f

gazebosim · Apr 13, 2021 · 422ad5b · 422ad5b
2 parents 2b3879f + 5426f21
commit 422ad5b
Show file tree

Hide file tree

Showing 14 changed files with 70 additions and 70 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -3,22 +3,22 @@ libfreeimage-dev
 libglew-dev
 libignition-cmake2-dev
 libignition-common4-dev
-libignition-gui5-dev
-libignition-fuel-tools6-dev
+libignition-gui6-dev
+libignition-fuel-tools7-dev
 libignition-math6-eigen3-dev
-libignition-msgs7-dev
-libignition-physics4-dev
+libignition-msgs8-dev
+libignition-physics5-dev
 libignition-plugin-dev
-libignition-rendering5-dev
-libignition-sensors5-dev
+libignition-rendering6-dev
+libignition-sensors6-dev
 libignition-tools-dev
-libignition-transport10-dev
+libignition-transport11-dev
 libignition-utils1-cli-dev
 libogre-1.9-dev
 libogre-2.1-dev
 libprotobuf-dev
 libprotoc-dev
-libsdformat11-dev
+libsdformat12-dev
 libtinyxml2-dev
 libxi-dev
 libxmu-dev

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,8 +38,8 @@ endif()
 # Search for project-specific dependencies
 #============================================================================
 
-ign_find_package(sdformat11 REQUIRED)
-set(SDF_VER ${sdformat11_VERSION_MAJOR})
+ign_find_package(sdformat12 REQUIRED)
+set(SDF_VER ${sdformat12_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-plugin
@@ -48,13 +48,13 @@ set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-transport
-ign_find_package(ignition-transport10 REQUIRED COMPONENTS log)
-set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
+ign_find_package(ignition-transport11 REQUIRED COMPONENTS log)
+set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-msgs
-ign_find_package(ignition-msgs7 REQUIRED)
-set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
+ign_find_package(ignition-msgs8 REQUIRED)
+set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-common
@@ -70,13 +70,13 @@ set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-fuel_tools
-ign_find_package(ignition-fuel_tools6 REQUIRED)
-set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools6_VERSION_MAJOR})
+ign_find_package(ignition-fuel_tools7 REQUIRED)
+set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools7_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-gui
-ign_find_package(ignition-gui5 REQUIRED)
-set(IGN_GUI_VER ${ignition-gui5_VERSION_MAJOR})
+ign_find_package(ignition-gui6 REQUIRED)
+set(IGN_GUI_VER ${ignition-gui6_VERSION_MAJOR})
 ign_find_package (Qt5
   COMPONENTS
     Core
@@ -87,17 +87,17 @@ ign_find_package (Qt5
 
 #--------------------------------------
 # Find ignition-physics
-ign_find_package(ignition-physics4
+ign_find_package(ignition-physics5
   COMPONENTS
     mesh
     sdf
   REQUIRED
 )
-set(IGN_PHYSICS_VER ${ignition-physics4_VERSION_MAJOR})
+set(IGN_PHYSICS_VER ${ignition-physics5_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-sensors
-ign_find_package(ignition-sensors5 REQUIRED
+ign_find_package(ignition-sensors6 REQUIRED
   COMPONENTS
     rendering
     air_pressure
@@ -110,12 +110,12 @@ ign_find_package(ignition-sensors5 REQUIRED
     depth_camera
     thermal_camera
 )
-set(IGN_SENSORS_VER ${ignition-sensors5_VERSION_MAJOR})
+set(IGN_SENSORS_VER ${ignition-sensors6_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-rendering
-ign_find_package(ignition-rendering5 REQUIRED)
-set(IGN_RENDERING_VER ${ignition-rendering5_VERSION_MAJOR})
+ign_find_package(ignition-rendering6 REQUIRED)
+set(IGN_RENDERING_VER ${ignition-rendering6_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-math
@@ -143,7 +143,7 @@ ign_find_package(IgnProtobuf
                  REQUIRED
                  COMPONENTS all
                  PRETTY Protobuf)
-set(Protobuf_IMPORT_DIRS ${ignition-msgs7_INCLUDE_DIRS})
+set(Protobuf_IMPORT_DIRS ${ignition-msgs8_INCLUDE_DIRS})
 
 # Plugin install dirs
 set(IGNITION_GAZEBO_PLUGIN_INSTALL_DIR

diff --git a/README.md b/README.md
@@ -236,7 +236,7 @@ line is using symbolic links to each library's YAML file.
 mkdir ~/.ignition/tools/configs -p
 cd ~/.ignition/tools/configs/
 ln -s /usr/local/share/ignition/fuel6.yaml .
-ln -s /usr/local/share/ignition/transport10.yaml .
+ln -s /usr/local/share/ignition/transport11.yaml .
 ln -s /usr/local/share/ignition/transportlog10.yaml .
 ...
 export IGN_CONFIG_PATH=$HOME/.ignition/tools/configs

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
@@ -26,7 +26,7 @@ pipelines:
               libignition-transport8-dev
               libsdformat9-dev
               libignition-fuel-tools4-dev
-              libignition-physics4-dev
+              libignition-physics5-dev
           #    libignition-common4-dev
           #    libignition-gui3-dev
           #    libignition-sensors3-dev
@@ -78,7 +78,7 @@ pipelines:
                 libignition-tools-dev
             # libignition-fuel-tools4-dev
             # libignition-physics2-dev
-            # libsdformat11-dev
+            # libsdformat12-dev
             # libignition-gui3-dev
             # libignition-msgs5-dev
             # libignition-rendering3-dev

diff --git a/docker/Dockerfile.nightly b/docker/Dockerfile.nightly
@@ -13,17 +13,17 @@ RUN apt-get update \
  && apt-get install -y \
     libignition-cmake2-dev \
     libignition-common4-dev \
-    libignition-fuel-tools6-dev \
+    libignition-fuel-tools7-dev \
     libignition-math6-eigen3-dev \
     libignition-plugin-dev \
-    libignition-physics4-dev \
-    libignition-rendering5-dev \
+    libignition-physics5-dev \
+    libignition-rendering6-dev \
     libignition-tools-dev \
-    libignition-transport10-dev \
-    libignition-gui5-dev \
-    libignition-msgs7-dev \
-    libignition-sensors5-dev \
-    libsdformat11-dev
+    libignition-transport11-dev \
+    libignition-gui6-dev \
+    libignition-msgs8-dev \
+    libignition-sensors6-dev \
+    libsdformat12-dev
 
 COPY . ign-gazebo
 RUN cd ign-gazebo \

diff --git 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(ignition-rendering5 REQUIRED)
+find_package(ignition-rendering6 REQUIRED)
 
 # GUI plugin
 set(GUI_PLUGIN RenderingGuiPlugin)
 
 set(CMAKE_AUTOMOC ON)
 
-find_package(ignition-gui5 REQUIRED)
+find_package(ignition-gui6 REQUIRED)
 
 QT5_ADD_RESOURCES(resources_RCC ${GUI_PLUGIN}.qrc)
 
@@ -24,8 +24,8 @@ add_library(${GUI_PLUGIN} SHARED
 )
 target_link_libraries(${GUI_PLUGIN}
   PRIVATE
-    ignition-gui5::ignition-gui5
-    ignition-rendering5::ignition-rendering5
+    ignition-gui6::ignition-gui6
+    ignition-rendering6::ignition-rendering6
 )
 
 # Server plugin
@@ -40,5 +40,5 @@ target_link_libraries(${SERVER_PLUGIN}
   PRIVATE
     ignition-plugin1::ignition-plugin1
     ignition-gazebo6::ignition-gazebo6
-    ignition-rendering5::ignition-rendering5
+    ignition-rendering6::ignition-rendering6
 )
diff --git a/examples/standalone/entity_creation/CMakeLists.txt b/examples/standalone/entity_creation/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
-set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
+find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
+set(IGN_TRANSPORT_VER ${ignition-transport11_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
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
-set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
+find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
+set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
 
-find_package(sdformat11 REQUIRED)
-set(SDF_VER ${sdformat11_VERSION_MAJOR})
+find_package(sdformat12 REQUIRED)
+set(SDF_VER ${sdformat12_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
@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 # joystick currently works only on linux
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
-  set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
+  find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
+  set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
 
-  find_package(sdformat11 REQUIRED)
-  set(SDF_VER ${sdformat11_VERSION_MAJOR})
+  find_package(sdformat12 REQUIRED)
+  set(SDF_VER ${sdformat12_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
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
-  set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
+  find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
+  set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
 
-  find_package(sdformat11 REQUIRED)
-  set(SDF_VER ${sdformat11_VERSION_MAJOR})
+  find_package(sdformat12 REQUIRED)
+  set(SDF_VER ${sdformat12_VERSION_MAJOR})
 
-  find_package(ignition-msgs7 REQUIRED)
-  set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
+  find_package(ignition-msgs8 REQUIRED)
+  set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})
 
   find_package(ignition-common4 REQUIRED)
   set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})

diff --git a/examples/standalone/light_control/CMakeLists.txt b/examples/standalone/light_control/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
-set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
+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})

diff --git a/examples/standalone/marker/CMakeLists.txt b/examples/standalone/marker/CMakeLists.txt
@@ -1,14 +1,14 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
-  set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
+  find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
+  set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
 
   find_package(ignition-common4 REQUIRED)
   set(IGN_COMMON_VER ${ignition-common4_VERSION_MAJOR})
 
-  find_package(ignition-msgs7 REQUIRED)
-  set(IGN_MSGS_VER ${ignition-msgs7_VERSION_MAJOR})
+  find_package(ignition-msgs8 REQUIRED)
+  set(IGN_MSGS_VER ${ignition-msgs8_VERSION_MAJOR})
 
   add_executable(marker marker.cc)
   target_link_libraries(marker

diff --git a/examples/standalone/scene_requester/CMakeLists.txt b/examples/standalone/scene_requester/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
-find_package(ignition-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
-set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
+find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
+set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
 
 add_executable(scene_requester scene_requester.cc)
 target_link_libraries(scene_requester

diff --git a/tutorials/migrating_ardupilot_plugin.md b/tutorials/migrating_ardupilot_plugin.md
@@ -751,14 +751,14 @@ In the new code we explicitly reference each Ignition package that we use:
 
 ```
 # NEW
-find_package(sdformat11 REQUIRED)
+find_package(sdformat12 REQUIRED)
 find_package(ignition-common4-all REQUIRED)
 find_package(ignition-gazebo6-all REQUIRED)
 find_package(ignition-math6-all REQUIRED)
-find_package(ignition-msgs7-all REQUIRED)
-find_package(ignition-physics4-all REQUIRED)
-find_package(ignition-sensors5-all REQUIRED)
-find_package(ignition-transport10-all REQUIRED)
+find_package(ignition-msgs8-all REQUIRED)
+find_package(ignition-physics5-all REQUIRED)
+find_package(ignition-sensors6-all REQUIRED)
+find_package(ignition-transport11-all REQUIRED)
 ```
 
 In the old code we need only refer to the build configuration retrieved from the Gazebo package: