Bump main to gz-msgs 12.0.0~pre1 (#468)

Signed-off-by: Carlos Agüero <[email protected]>
gazebosim · Oct 10, 2024 · af39e88 · af39e88
1 parent 53712ed
commit af39e88
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-msgs11 VERSION 11.0.0)
+project(gz-msgs12 VERSION 12.0.0)
 
 #============================================================================
 # Find gz-cmake
@@ -17,7 +17,7 @@ find_package(gz-cmake4 REQUIRED)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-gz_configure_project(VERSION_SUFFIX
+gz_configure_project(VERSION_SUFFIX pre1
  CONFIG_EXTRAS "gz-msgs-extras.cmake.in")
 
 #============================================================================

diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,7 @@
+## Gazebo Msgs 12.x
+
+### Gazebo Msgs 12.0.0 (20XX-XX-XX)
+
 ## Gazebo Msgs 11.x
 
 ### Gazebo Msgs 11.0.0 (2024-09-25)

diff --git a/core/src/MessageFactory.cc b/core/src/MessageFactory.cc
@@ -102,7 +102,7 @@ MessageFactory::MessagePtr MessageFactory::New(
  {
  std::cerr << "Message (" << kGzMsgsPrefix + type
  << ") was retrieved with non-fully qualified name. "
- << "This behavior is deprecated in msgs11" << std::endl;
+ << "This behavior is deprecated in msgs12" << std::endl;
  }
  }
  return ret;

diff --git a/examples/generating_custom_msgs/CMakeLists.txt b/examples/generating_custom_msgs/CMakeLists.txt
@@ -10,9 +10,9 @@ project(generating_custom_messages VERSION 1.0.0)
 #============================================================================
 find_package(gz-cmake4 REQUIRED)
 
-find_package(gz-msgs11 REQUIRED)
+find_package(gz-msgs12 REQUIRED)
 # Define a variable 'GZ_MSGS_VER' holding the version number
-set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})
+set(GZ_MSGS_VER ${gz-msgs12_VERSION_MAJOR})
 
 # Define a variable 'MSGS_PROTOS' listing the .proto files
 set(MSGS_PROTOS

diff --git a/examples/using_gz_msgs/CMakeLists.txt b/examples/using_gz_msgs/CMakeLists.txt
@@ -10,8 +10,8 @@ project(using_gz_msgs VERSION 1.0.0)
 #============================================================================
 find_package(gz-cmake4 REQUIRED)
 
-find_package(gz-msgs11 REQUIRED)
-set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})
+find_package(gz-msgs12 REQUIRED)
+set(GZ_MSGS_VER ${gz-msgs12_VERSION_MAJOR})
 
 add_executable(${PROJECT_NAME} main.cc)
 target_link_libraries(${PROJECT_NAME} PRIVATE gz-msgs${GZ_MSGS_VER})

diff --git a/examples/using_gz_msgs/README.md b/examples/using_gz_msgs/README.md
@@ -5,8 +5,8 @@ The example in this folder demonstrates how to use messages as part of your buil
 To use messages as part of your project, simply find the gz-msgs package
 
 ```
-find_package(gz-msgs11 REQUIRED)
-set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR}
+find_package(gz-msgs12 REQUIRED)
+set(GZ_MSGS_VER ${gz-msgs12_VERSION_MAJOR}
 ```
 
 And link the messages library to your library or executable

diff --git a/package.xml b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
- <name>gz-msgs11</name>
- <version>11.0.0</version>
+ <name>gz-msgs12</name>
+ <version>12.0.0</version>
  <description>Gazebo Messages: Protobuf messages and functions for robot applications</description>
  <maintainer email="[email protected]">Carlos Agüero</maintainer>
  <license>Apache License 2.0</license>

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Append `_configured` to the file name so it doesn't interfere with tests.
 # This happens because pytest will load the `gz.msgs` package from the build directory
 # (because there's an __init__.py file there) instead of being redirected to
-# `gz.msgs11` in the install directory, which is the intent of this `__init__.py` file.
+# `gz.msgs12` in the install directory, which is the intent of this `__init__.py` file.
 set(python_init_file ${PROJECT_BINARY_DIR}/python/gz/${GS_DESIGNATION}/__init__.py_configured)
 configure_file(${PROJECT_SOURCE_DIR}/python/src/__init__.py.in ${python_init_file})
 

diff --git a/python/test/basic_TEST.py b/python/test/basic_TEST.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from gz.msgs11.vector3d_pb2 import Vector3d
+from gz.msgs12.vector3d_pb2 import Vector3d
 
 import unittest
 

diff --git a/tutorials/cppgetstarted.md b/tutorials/cppgetstarted.md
@@ -63,7 +63,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-msgs-example)
 
 # Find the Gazebo msgs library
-find_package(gz-msgs11 QUIET REQUIRED)
+find_package(gz-msgs12 QUIET REQUIRED)
 
 add_executable(gz-msgs-example main.cc)
 target_link_libraries(gz-msgs-example ${GZ-MSGS_LIBRARIES})

diff --git a/tutorials/message_generation.md b/tutorials/message_generation.md
@@ -123,13 +123,13 @@ The code for this example can be found in the `gz-msgs` [repository](https://git
 
 
 The `cmake` functionality is exported from the `gz-msgs` library, via the `gz-cmake` [`extras` functionality](https://github.com/gazebosim/gz-cmake/pull/345).
-To make the functions available, simply `find_package(gz-msgs11)` in your `CMakeLists.txt`:
+To make the functions available, simply `find_package(gz-msgs12)` in your `CMakeLists.txt`:
 
 ```cmake
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(my_custom_package VERSION 0.0.1)
 find_package(gz-cmake4 REQUIRED)
-find_package(gz-msgs11 REQUIRED)
+find_package(gz-msgs12 REQUIRED)
 ```
 
 
@@ -215,16 +215,16 @@ gz_msgs_generate_messages(
  # List of proto files to process
  MSGS_PROTOS ${MSGS_PROTOS}
  # Depenency on gz-msgs
- DEPENDENCIES gz-msgs11::gz-msgs11
+ DEPENDENCIES gz-msgs12::gz-msgs12
 )
 ```
 
 In order to reduce the amount of edits needed upon a version change of `gz-msgs`, it is common to:
 
  - Define a variable `GZ_MSGS_VER`, holding the version number:
  ```cmake
- find_package(gz-msgs11 REQUIRED)
- set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})
+ find_package(gz-msgs12 REQUIRED)
+ set(GZ_MSGS_VER ${gz-msgs12_VERSION_MAJOR})
  ```
  - And change the dependency line in above code block to:
  ```cmake