Updates to CI, package and CMake files to prepare for release

.github/workflows/ci.yaml

@@ -31,7 +31,7 @@ jobs:
     name: ${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: cache target_ws
         uses: pat-s/[email protected]
         with:

.github/workflows/format.yaml

@@ -15,9 +15,9 @@ jobs:
     name: Format
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
-        python-version: '3.10'
-    - uses: pre-commit/[email protected].0
+        python-version: '3.8'
+    - uses: pre-commit/[email protected].1
       id: precommit

.github/workflows/prerelease.yaml

@@ -19,6 +19,6 @@ jobs:
     name: rolling
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: industrial_ci
         uses: ros-industrial/industrial_ci@master

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.5.0
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -13,13 +13,13 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.2
+    rev: v2.2.6
     hooks:
       - id: codespell
         args: ['--write-changes', '--ignore-words=.codespell_words']
 
   - repo: https://github.com/cheshirekow/cmake-format-precommit
-    rev: v0.6.10
+    rev: v0.6.13
     hooks:
     - id: cmake-format
     - id: cmake-lint

marine_acoustic_msgs/CMakeLists.txt

@@ -1,25 +1,38 @@
 cmake_minimum_required(VERSION 3.5)
+
 project(marine_acoustic_msgs)
 
+# Default to C++17
+if(NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  add_compile_options(-Wall -Wextra -Wpedantic)
+endif()
+
 find_package(ament_cmake REQUIRED)
+find_package(geometry_msgs REQUIRED)
 find_package(rosidl_default_generators REQUIRED)
 find_package(std_msgs REQUIRED)
-find_package(geometry_msgs REQUIRED)
-
-set(MSG_FILES)
-
-file(
-  GLOB rosMsgFiles
-  RELATIVE "${${PROJECT_NAME}_SOURCE_DIR}"
-  "${${PROJECT_NAME}_SOURCE_DIR}/msg/*.msg")
 
-foreach(rosMsg ${rosMsgFiles})
-  message(STATUS "Processing message file: ${rosMsg}")
-  set(MSG_FILES ${MSG_FILES} ${rosMsg})
-endforeach(rosMsg)
+# cmake-format: off
+set(MSG_FILES
+  "msg/DetectionFlag.msg"
+  "msg/Dvl.msg"
+  "msg/PingInfo.msg"
+  "msg/ProjectedSonarImage.msg"
+  "msg/RawSonarImage.msg"
+  "msg/SonarDetections.msg"
+  "msg/SonarImageData.msg"
+  "msg/SonarRanges.msg"
+)
 
-rosidl_generate_interfaces(${PROJECT_NAME} ${MSG_FILES} DEPENDENCIES std_msgs
-                           geometry_msgs)
+rosidl_generate_interfaces(${PROJECT_NAME}
+  ${MSG_FILES}
+  DEPENDENCIES geometry_msgs std_msgs
+)
+# cmake-format: on
 
 ament_export_dependencies(rosidl_default_runtime)
 

marine_acoustic_msgs/package.xml

@@ -7,6 +7,7 @@
   </description>
 
   <maintainer email="[email protected]">Laura Lindzey</maintainer>
+  <maintainer email="[email protected]">Roland Arsenault</maintainer>
 
   <license>BSD-3-Clause</license>
 
@@ -19,16 +20,12 @@
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
-  <build_depend>std_msgs</build_depend>
-  <build_depend>geometry_msgs</build_depend>
-
-  <build_export_depend>std_msgs</build_export_depend>
+  <depend>std_msgs</depend>
+  <depend>geometry_msgs</depend>
 
   <exec_depend>rosidl_default_runtime</exec_depend>
-  <member_of_group>rosidl_interface_packages</member_of_group>
 
-  <exec_depend>std_msgs</exec_depend>
-  <exec_depend>geometry_msgs</exec_depend>
+  <member_of_group>rosidl_interface_packages</member_of_group>
 
   <export>
     <build_type>ament_cmake</build_type>

marine_sensor_msgs/CMakeLists.txt

@@ -1,26 +1,34 @@
 cmake_minimum_required(VERSION 3.5)
+
 project(marine_sensor_msgs)
 
+# Default to C++17
+if(NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+endif()
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  add_compile_options(-Wall -Wextra -Wpedantic)
+endif()
+
 find_package(ament_cmake REQUIRED)
-find_package(rosidl_default_generators REQUIRED)
 find_package(builtin_interfaces REQUIRED)
-find_package(std_msgs REQUIRED)
 find_package(geometry_msgs REQUIRED)
+find_package(rosidl_default_generators REQUIRED)
+find_package(std_msgs REQUIRED)
 
-set(MSG_FILES)
-
-file(
-  GLOB rosMsgFiles
-  RELATIVE "${${PROJECT_NAME}_SOURCE_DIR}"
-  "${${PROJECT_NAME}_SOURCE_DIR}/msg/*.msg")
-
-foreach(rosMsg ${rosMsgFiles})
-  message(STATUS "Processing message file: ${rosMsg}")
-  set(MSG_FILES ${MSG_FILES} ${rosMsg})
-endforeach(rosMsg)
+# cmake-format: off
+set(MSG_FILES
+  "msg/RadarEcho.msg"
+  "msg/RadarSector.msg"
+  "msg/TurbidityNTU.msg"
+)
 
-rosidl_generate_interfaces(${PROJECT_NAME} ${MSG_FILES} DEPENDENCIES
-                           builtin_interfaces std_msgs geometry_msgs)
+rosidl_generate_interfaces(${PROJECT_NAME}
+  ${MSG_FILES}
+  DEPENDENCIES builtin_interfaces geometry_msgs std_msgs
+)
+# cmake-format: on
 
 ament_export_dependencies(rosidl_default_runtime)
 

marine_sensor_msgs/package.xml

@@ -7,27 +7,24 @@
   </description>
 
   <maintainer email="[email protected]">Laura Lindzey</maintainer>
+  <maintainer email="[email protected]">Roland Arsenault</maintainer>
 
   <license>BSD-3-Clause</license>
 
   <author email="[email protected]">Aaron Marburg</author>
   <author email="[email protected]">Laura Lindzey</author>
+  <author email="[email protected]">Roland Arsenault</author>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
-  <build_depend>builtin_interfaces</build_depend>
-  <build_depend>std_msgs</build_depend>
-  <build_depend>geometry_msgs</build_depend>
-
-  <build_export_depend>std_msgs</build_export_depend>
+  <depend>builtin_interfaces</depend>
+  <depend>std_msgs</depend>
+  <depend>geometry_msgs</depend>
 
   <exec_depend>rosidl_default_runtime</exec_depend>
-  <member_of_group>rosidl_interface_packages</member_of_group>
 
-  <exec_depend>builtin_interfaces</exec_depend>
-  <exec_depend>std_msgs</exec_depend>
-  <exec_depend>geometry_msgs</exec_depend>
+  <member_of_group>rosidl_interface_packages</member_of_group>
 
   <export>
     <build_type>ament_cmake</build_type>