Bumps in ionic : ci_matching_branch/bump_ionic_gz-transport14 (#456)

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
gazebosim · Oct 17, 2023 · 94d6ca7 · 94d6ca7
1 parent 4ea9725
commit 94d6ca7
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 29 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -1,8 +1,8 @@
-libgz-cmake3-dev
-libgz-math7-dev
-libgz-msgs10-dev
+libgz-cmake4-dev
+libgz-math8-dev
+libgz-msgs11-dev
 libgz-tools2-dev
-libgz-utils2-cli-dev
+libgz-utils3-cli-dev
 libprotobuf-dev
 libprotoc-dev
 libsqlite3-dev
@@ -14,5 +14,5 @@ python3-distutils
 python3-psutil
 python3-pybind11
 python3-pytest
-python3-gz-msgs10
+python3-gz-msgs11
 uuid-dev
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,8 +9,8 @@ project(gz-transport14 VERSION 14.0.0)
 # Find gz-cmake
 #============================================================================
 # If you get an error at this line, you need to install gz-cmake
-find_package(gz-cmake3 REQUIRED)
-set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR})
+find_package(gz-cmake4 REQUIRED)
+set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR})
 
 #============================================================================
 # Configure the project
@@ -96,13 +96,13 @@ endif()
 
 #--------------------------------------
 # Find gz-utils
-gz_find_package(gz-utils2 REQUIRED COMPONENTS cli)
-set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
+gz_find_package(gz-utils3 REQUIRED COMPONENTS cli)
+set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-msgs
-gz_find_package(gz-msgs10 REQUIRED)
-set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR})
+gz_find_package(gz-msgs11 REQUIRED)
+set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ifaddrs

diff --git a/docker/gz-transport/Dockerfile b/docker/gz-transport/Dockerfile
@@ -65,10 +65,10 @@ RUN sudo /bin/sh -c 'echo "deb [trusted=yes] http://packages.osrfoundation.org/g
  && sudo /bin/sh -c 'wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -' \
  && sudo apt-get update \
  && sudo apt-get install -y \
-    libgz-cmake3-dev \
-    libgz-math7-dev \
-    libgz-msgs10-dev \
-    libgz-utils2-cli-dev \
+    libgz-cmake4-dev \
+    libgz-math8-dev \
+    libgz-msgs11-dev \
+    libgz-utils3-cli-dev \
  && sudo apt-get clean
 
 # Gazebo transport

diff --git a/python/examples/data_race_with_mutex.py b/python/examples/data_race_with_mutex.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-from gz.msgs10.vector3d_pb2 import Vector3d
+from gz.msgs11.vector3d_pb2 import Vector3d
 from gz.transport14 import Node
 
 from threading import Lock

diff --git a/python/examples/data_race_without_mutex.py b/python/examples/data_race_without_mutex.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-from gz.msgs10.vector3d_pb2 import Vector3d
+from gz.msgs11.vector3d_pb2 import Vector3d
 from gz.transport14 import Node
 
 import time

diff --git a/python/examples/publisher.py b/python/examples/publisher.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 #
 
-from gz.msgs10.stringmsg_pb2 import StringMsg
-from gz.msgs10.vector3d_pb2 import Vector3d
+from gz.msgs11.stringmsg_pb2 import StringMsg
+from gz.msgs11.vector3d_pb2 import Vector3d
 from gz.transport14 import AdvertiseMessageOptions
 from gz.transport14 import Node
 

diff --git a/python/examples/requester.py b/python/examples/requester.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-from gz.msgs10.stringmsg_pb2 import StringMsg
+from gz.msgs11.stringmsg_pb2 import StringMsg
 from gz.transport14 import Node
 
 def main():

diff --git a/python/examples/subscriber.py b/python/examples/subscriber.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 #
 
-from gz.msgs10.stringmsg_pb2 import StringMsg
-from gz.msgs10.vector3d_pb2 import Vector3d
+from gz.msgs11.stringmsg_pb2 import StringMsg
+from gz.msgs11.vector3d_pb2 import Vector3d
 from gz.transport14 import SubscribeOptions
 from gz.transport14 import Node
 

diff --git a/python/src/__init__.py b/python/src/__init__.py
@@ -22,7 +22,7 @@
 # The "ProtoMsg" TypeVar represents an actual msg of a protobuf type.
 # On the other hand, the "ProtoMsgType" TypeVar represents the protobuf type.
 # For example, let's take the following code:
-#   from gz.msgs10.stringmsg_pb2 import StringMsg
+#   from gz.msgs11.stringmsg_pb2 import StringMsg
 #   proto_msg = StringMsg()
 # The variable `proto_msg` would be the expected input for a "ProtoMsg"
 # type argument and `StringMsg` would be the expected input for a

diff --git a/python/test/options_TEST.py b/python/test/options_TEST.py
@@ -1,4 +1,4 @@
-from gz.msgs10.stringmsg_pb2 import StringMsg
+from gz.msgs11.stringmsg_pb2 import StringMsg
 from gz.transport14 import Node, AdvertiseMessageOptions, SubscribeOptions, NodeOptions
 
 import unittest

diff --git a/python/test/pubSub_TEST.py b/python/test/pubSub_TEST.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 #
 
-from gz.msgs10.stringmsg_pb2 import StringMsg
-from gz.msgs10.vector3d_pb2 import Vector3d
+from gz.msgs11.stringmsg_pb2 import StringMsg
+from gz.msgs11.vector3d_pb2 import Vector3d
 from gz.transport14 import Node, AdvertiseMessageOptions, SubscribeOptions, TopicStatistics
 
 from threading import Lock

diff --git a/python/test/requester_TEST.py b/python/test/requester_TEST.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 #
 
-from gz.msgs10.int32_pb2 import Int32
-from gz.msgs10.stringmsg_pb2 import StringMsg
+from gz.msgs11.int32_pb2 import Int32
+from gz.msgs11.stringmsg_pb2 import StringMsg
 from gz.transport14 import Node
 
 import os

diff --git a/tutorials/02_installation.md b/tutorials/02_installation.md
@@ -94,7 +94,7 @@ sudo apt-get remove libgz-transport.*-dev
 
 Install prerequisites. A clean Ubuntu system will need:
 ```
-sudo apt-get install git cmake pkg-config python ruby-ronn libprotoc-dev libprotobuf-dev protobuf-compiler uuid-dev libzmq3-dev libgz-msgs10-dev libgz-utils2-cli-dev
+sudo apt-get install git cmake pkg-config python ruby-ronn libprotoc-dev libprotobuf-dev protobuf-compiler uuid-dev libzmq3-dev libgz-msgs11-dev libgz-utils3-cli-dev
 ```
 
 Clone the repository