From fc630b250bb981719c301319beea1b7e18b70e53 Mon Sep 17 00:00:00 2001 From: James Smith Date: Wed, 19 Jul 2023 18:55:05 +1000 Subject: [PATCH] update version --- cpp/bench/conanfile.py | 2 +- cpp/build-docs.sh | 2 +- cpp/build.sh | 2 +- cpp/docs/conanfile.py | 2 +- cpp/examples/conanfile.py | 2 +- cpp/mcap/conanfile.py | 2 +- cpp/mcap/include/mcap/types.hpp | 2 +- cpp/test/conanfile.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cpp/bench/conanfile.py b/cpp/bench/conanfile.py index 1b56252054..c99439fca5 100644 --- a/cpp/bench/conanfile.py +++ b/cpp/bench/conanfile.py @@ -4,7 +4,7 @@ class McapBenchmarksConan(ConanFile): settings = "os", "compiler", "build_type", "arch" generators = "cmake" - requires = "benchmark/1.7.0", "mcap/1.1.0" + requires = "benchmark/1.7.0", "mcap/1.2.0" def build(self): cmake = CMake(self) diff --git a/cpp/build-docs.sh b/cpp/build-docs.sh index 5150c6584d..73cc626aa7 100755 --- a/cpp/build-docs.sh +++ b/cpp/build-docs.sh @@ -4,7 +4,7 @@ set -e conan config init -conan editable add ./mcap mcap/1.1.0 +conan editable add ./mcap mcap/1.2.0 conan install docs --install-folder docs/build/Release \ -s compiler.cppstd=17 -s build_type=Release --build missing diff --git a/cpp/build.sh b/cpp/build.sh index b0c8c646f4..258fbac067 100755 --- a/cpp/build.sh +++ b/cpp/build.sh @@ -4,7 +4,7 @@ set -e conan config init -conan editable add ./mcap mcap/1.1.0 +conan editable add ./mcap mcap/1.2.0 conan install test --install-folder test/build/Debug \ -s compiler.cppstd=17 -s build_type=Debug --build missing diff --git a/cpp/docs/conanfile.py b/cpp/docs/conanfile.py index 744e9101c4..05d7650ae1 100644 --- a/cpp/docs/conanfile.py +++ b/cpp/docs/conanfile.py @@ -4,7 +4,7 @@ class McapDocsConan(ConanFile): settings = "os", "compiler", "build_type", "arch" generators = "cmake" - requires = "mcap/1.1.0" + requires = "mcap/1.2.0" def build(self): cmake = CMake(self) diff --git a/cpp/examples/conanfile.py b/cpp/examples/conanfile.py index 84936c89ac..250c2b26b9 100644 --- a/cpp/examples/conanfile.py +++ b/cpp/examples/conanfile.py @@ -5,7 +5,7 @@ class McapExamplesConan(ConanFile): settings = "os", "compiler", "build_type", "arch" generators = "cmake" requires = [ - "mcap/1.1.0", + "mcap/1.2.0", "protobuf/3.21.1", "nlohmann_json/3.10.5", "catch2/2.13.8", diff --git a/cpp/mcap/conanfile.py b/cpp/mcap/conanfile.py index ba3dc8e2e1..eee35a3876 100644 --- a/cpp/mcap/conanfile.py +++ b/cpp/mcap/conanfile.py @@ -3,7 +3,7 @@ class McapConan(ConanFile): name = "mcap" - version = "1.1.0" + version = "1.2.0" url = "https://github.com/foxglove/mcap" homepage = "https://github.com/foxglove/mcap" description = "A C++ implementation of the MCAP file format" diff --git a/cpp/mcap/include/mcap/types.hpp b/cpp/mcap/include/mcap/types.hpp index aa81eaa1c3..def8496adb 100644 --- a/cpp/mcap/include/mcap/types.hpp +++ b/cpp/mcap/include/mcap/types.hpp @@ -13,7 +13,7 @@ namespace mcap { -#define MCAP_LIBRARY_VERSION "1.1.0" +#define MCAP_LIBRARY_VERSION "1.2.0" using SchemaId = uint16_t; using ChannelId = uint16_t; diff --git a/cpp/test/conanfile.py b/cpp/test/conanfile.py index 3d2eefbf41..824bf9bbb4 100644 --- a/cpp/test/conanfile.py +++ b/cpp/test/conanfile.py @@ -4,7 +4,7 @@ class McapTestConan(ConanFile): settings = "os", "compiler", "build_type", "arch" generators = "cmake" - requires = "catch2/2.13.8", "mcap/1.1.0", "nlohmann_json/3.10.5" + requires = "catch2/2.13.8", "mcap/1.2.0", "nlohmann_json/3.10.5" def build(self): cmake = CMake(self)