Merge branch 'master' into fix-python-warnings

Author: dgburr

.clang-format

@@ -93,7 +93,9 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 RawStringFormats: 
-  - Delimiter:       pb
+  - Language: Cpp
+    Delimiters:
+      - pb
     Language:        TextProto
     BasedOnStyle:    google
 ReflowComments:  true

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [v6.3.1](https://github.com/swift-nav/libsbp/tree/v6.3.1)
+
+[Full Changelog](https://github.com/swift-nav/libsbp/compare/v6.3.0...v6.3.1)
+
+**Merged pull requests:**
+
+- Update to kaitaistruct 0.11 [\#1518](https://github.com/swift-nav/libsbp/pull/1518) ([dgburr](https://github.com/dgburr))
+- Fix dependabot SONAR\_TOKEN [\#1517](https://github.com/swift-nav/libsbp/pull/1517) ([sbmueller](https://github.com/sbmueller))
+- Update rules\_swiftnav [\#1516](https://github.com/swift-nav/libsbp/pull/1516) ([martin4861](https://github.com/martin4861))
+- Update to Bazel 8 [\#1515](https://github.com/swift-nav/libsbp/pull/1515) ([martin4861](https://github.com/martin4861))
+- Auto submodule update: cmake - Fix compiler errors from check third-party dependency on Windows \(\#188\) [\#1514](https://github.com/swift-nav/libsbp/pull/1514) ([swiftnav-svc-jenkins](https://github.com/swiftnav-svc-jenkins))
+- Update check [\#1513](https://github.com/swift-nav/libsbp/pull/1513) ([martin4861](https://github.com/martin4861))
+- Update to C++17 \[\#1512](https://github.com/swift-nav/libsbp/pull/1512) ([sbmueller](https://github.com/sbmueller))
+- Update rules\_foreign\_cc [\#1511](https://github.com/swift-nav/libsbp/pull/1511) ([martin4861](https://github.com/martin4861))
+- Auto submodule update: cmake - Default C++/C version for all swift targets \(\#187\) [\#1510](https://github.com/swift-nav/libsbp/pull/1510) ([swiftnav-svc-jenkins](https://github.com/swiftnav-svc-jenkins))
+- Apply new cargo fmt rules & remove deprecated actions [\#1509](https://github.com/swift-nav/libsbp/pull/1509) ([pcrumley](https://github.com/pcrumley))
+- rust: add Frome\<Frame\> impls for Bytes/BytesMut [\#1508](https://github.com/swift-nav/libsbp/pull/1508) ([notoriaga](https://github.com/notoriaga))
+- Add clone to sbp frame in rust [\#1507](https://github.com/swift-nav/libsbp/pull/1507) ([tzilist](https://github.com/tzilist))
+- update rust deps [\#1505](https://github.com/swift-nav/libsbp/pull/1505) ([tzilist](https://github.com/tzilist))
+
 ## [v6.3.0](https://github.com/swift-nav/libsbp/tree/v6.3.0)
 
 [Full Changelog](https://github.com/swift-nav/libsbp/compare/v6.2.2...v6.3.0)

Dockerfile

@@ -11,7 +11,7 @@
 # This describes an image that should be able to generate libsbp bindings.
 # See the README.md for instructions on how to use it.
 
-ARG UBUNTU_RELEASE=focal
+ARG UBUNTU_RELEASE=jammy
 
 FROM ubuntu:${UBUNTU_RELEASE}
 
@@ -23,8 +23,8 @@ ARG DEBIAN_FRONTEND=noninteractive
 ENV NODE_VERSION=v22.13.1
 ENV JAVA_VERSION=11.0.11.hs-adpt
 ENV GRADLE_VERSION=7.1.1
-ENV CC=gcc-7
-ENV CXX=g++-7
+ENV CC=gcc-10
+ENV CXX=g++-10
 
 ENV RUSTUP_HOME=/rust
 ENV CARGO_HOME=/cargo
@@ -77,15 +77,15 @@ RUN \
       doxygen \
       graphviz \
       imagemagick \
-      enchant \
-      clang-format-6.0 \
+      enchant-2 \
+      clang-format-11 \
       python3 python3-dev python3-distutils \
       python3.9 python3.9-dev python3.9-distutils \
       python3.10 python3.10-dev python3.10-distutils \
       python3.11 python3.11-dev python3.11-distutils \
       dpkg-dev \
-      cmake-data=3.16.3-1ubuntu1.20.04.1 \
-      cmake=3.16.3-1ubuntu1.20.04.1 \
+      cmake=3.22.1-1ubuntu1 \
+      cmake-data=3.22.1-1ubuntu1 \
       libjson-perl \
       libdigest-crc-perl \
   && curl -sSL https://get.haskellstack.org/ | sh \
@@ -131,9 +131,9 @@ RUN \
 # install perl runtime for kaitai struct
 RUN \
      cd /tmp \
-  && curl -LO https://github.com/kaitai-io/kaitai_struct_perl_runtime/archive/refs/tags/0.10.zip \
-  && unzip 0.10.zip \
-  && cd kaitai_struct_perl_runtime-0.10 \
+  && curl -LO https://github.com/kaitai-io/kaitai_struct_perl_runtime/archive/refs/tags/0.11.zip \
+  && unzip 0.11.zip \
+  && cd kaitai_struct_perl_runtime-0.11 \
   && perl Makefile.PL \
   && make install \
   && rm -rf /tmp/*

Makefile

@@ -109,7 +109,7 @@ else
 endif
 
 verify-prereq-c: verify-prereq-generator
-	@command -v clang-format-6.0 1>/dev/null 2>/dev/null || { echo >&2 -e "I require \`clang-format-6.0\` but it's not installed. Aborting.\n\nHave you installed clang-format-6.0? See the C readme at \`c/README.md\` for setup instructions.\n"; exit 1; }
+	@command -v clang-format-11 1>/dev/null 2>/dev/null || { echo >&2 -e "I require \`clang-format-11\` but it's not installed. Aborting.\n\nHave you installed clang-format-11? See the C readme at \`c/README.md\` for setup instructions.\n"; exit 1; }
 	@command -v checkmk      1>/dev/null 2>/dev/null || { echo >&2 -e "I require \`checkmk\` but it's not installed. Aborting.\n\nHave you installed checkmk? See the C readme at \`c/README.md\` for setup instructions.\n"; exit 1; }
 	@command -v cmake        1>/dev/null 2>/dev/null || { echo >&2 -e "I require \`cmake\` but it's not installed. Aborting.\n\nHave you installed cmake? See the C readme at \`c/README.md\` for setup instructions.\n"; exit 1; }
 	@command -v pkg-config   1>/dev/null 2>/dev/null || { echo >&2 -e "I require \`pkg-config\` but it's not installed. Aborting.\n\nHave you installed pkg-config? See the C readme at \`c/README.md\` for setup instructions.\n"; exit 1; }

c/README.md

@@ -8,18 +8,17 @@ with no dependencies other than the standard C libraries.
 
 ## Installation
 
-On Debian-based systems (including Ubuntu 12.10 or later) you can get
+On Debian-based systems (including Ubuntu 22.04 or later) you can get
 dependencies with:
 
 ```shell
-sudo apt-get install build-essential pkg-config cmake doxygen check clang-format-6.0
+sudo apt-get install build-essential pkg-config cmake doxygen check clang-format-11
 ```
 
 On Mac:
 
 ```shell
-brew tap swift-nav/swift-devs
-brew install check cmake pkg-config doxygen clang-tools-6.0
+brew install check cmake pkg-config doxygen clang-format@11
 ```
 
 On other systems, you can obtain CMake from your operating system
@@ -57,6 +56,6 @@ https://github.com/swift-nav/sbp_tutorial.
 
 ## LICENSE
 
-Copyright © 2015-2021 Swift Navigation
+Copyright © 2015-2025 Swift Navigation
 
 Distributed under MIT.

c/include/libsbp/version.h

@@ -25,10 +25,10 @@
 /** Protocol minor version. */
 #define SBP_MINOR_VERSION 3
 /** Protocol patch version. */
-#define SBP_PATCH_VERSION 0
+#define SBP_PATCH_VERSION 1
 
 /** Full SBP version string. */
-#define SBP_VERSION "6.3.1-alpha"
+#define SBP_VERSION "6.3.2-alpha"
 
 /** Is this a staging branch? */
 #define SBP_STAGING 0

c/scripts/clang-format.sh

@@ -3,13 +3,9 @@
 set -e -x
 # This only reformats the generated headers and tests
 # as it is introduced as part of fixing the docs,
-# and clang-format-6 would otherwise cause regressions
+# and clang-format-11 would otherwise cause regressions
 # in the Google style of hand-written code.
 GENERATED_HEADERS=$(grep -rl --include="*.h" "Automatically generated" include/libsbp/* src/)
 GENERATED_C_SOURCES=$(grep -rl --include="*.c" "Automatically generated" src/)
-CLANG_FORMAT=clang-format-6.0
+CLANG_FORMAT=clang-format-11
 $CLANG_FORMAT -i $GENERATED_HEADERS $GENERATED_C_SOURCES test/*.c test/*.h test/auto* test/cpp/auto*
-
-# clang-format-6 adds whitespace to blank lines inside comments
-sed -i.bak 's/^  *$//' $GENERATED_HEADERS
-rm ${GENERATED_HEADERS//.h/.h.bak}

docs/sbp.pdf

@@ -18,7 +18,7 @@ categories = ["parsing"]
 keywords = ["encoding", "parsing"]
 
 [dependencies.sbp]
-path = "../sbp" # TODO: replace with published `sbp` crate version
+path = "../sbp"                        # TODO: replace with published `sbp` crate version
 features = ["json", "float_roundtrip"]
 
 [dependencies]
@@ -44,9 +44,6 @@ predicates-core = "=1.0.3"
 serde_json = "1.0.82"
 assert-json-diff = "2.0"
 
-[profile.release]
-lto = true
-codegen-units = 1
 
 [lib]
 name = "converters"

generator/sbpg/targets/resources/rust/sbp2json_cargo.toml

@@ -13,7 +13,7 @@ authors = ["Swift Navigation <[email protected]>"]
 repository = "https://github.com/swift-nav/libsbp"
 license = "MIT"
 categories = ["parsing"]
-edition = "2018"
+edition = "2024"
 keywords = ["encoding", "parsing"]
 readme = "../../README.md"
 
@@ -29,37 +29,37 @@ link = ["slotmap"]
 path = "src/lib.rs"
 
 [dependencies]
-bytes = "1"
+bytes = "1.10.1"
 crc16 = "0.4"
-log = "0.4"
+log = "0.4.28"
 
 [dependencies.swiftnav]
 version = "0.10"
 optional = true
 
 [dependencies.slotmap]
-version = "1"
+version = "1.0.7"
 optional = true
 
 [dependencies.serde]
-version = "1"
+version = "1.0.228"
 features = ["derive"]
 optional = true
 
 [dependencies.serde_json]
-version = "1"
+version = "1.0.145"
 optional = true
 
 [dependencies.serde-big-array]
-version = "0.4"
+version = "0.5.1"
 optional = true
 
 [dependencies.base64]
-version = "0.13"
+version = "0.22.1"
 optional = true
 
 [dependencies.futures]
-version = "0.3"
+version = "0.3.31"
 optional = true
 
 [dependencies.dencode]