From 02387fd227d9b7307ec417138b6c6af5b9d156f0 Mon Sep 17 00:00:00 2001 From: Bart Date: Thu, 6 Feb 2025 13:11:49 -0800 Subject: [PATCH] Updates Conan dependencies (#5256) This PR updates several Conan dependencies: * boost * date * libarchive * libmysqlclient * libpq * lz4 * onetbb * openssl * sqlite3 * zlib * zstd --- conanfile.py | 14 +++++++------- external/rocksdb/conanfile.py | 6 +++--- external/soci/conanfile.py | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/conanfile.py b/conanfile.py index 14fc49a1946..d4513068fb5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -24,14 +24,14 @@ class Xrpl(ConanFile): } requires = [ - 'date/3.0.1', + 'date/3.0.3', 'grpc/1.50.1', - 'libarchive/3.6.2', + 'libarchive/3.7.6', 'nudb/2.0.8', - 'openssl/1.1.1u', + 'openssl/1.1.1v', 'soci/4.0.3', 'xxhash/0.8.2', - 'zlib/1.2.13', + 'zlib/1.3.1', ] tool_requires = [ @@ -99,10 +99,10 @@ def configure(self): self.options['boost'].visibility = 'global' def requirements(self): - self.requires('boost/1.82.0', force=True) - self.requires('lz4/1.9.3', force=True) + self.requires('boost/1.83.0', force=True) + self.requires('lz4/1.10.0', force=True) self.requires('protobuf/3.21.9', force=True) - self.requires('sqlite3/3.42.0', force=True) + self.requires('sqlite3/3.47.0', force=True) if self.options.jemalloc: self.requires('jemalloc/5.3.0') if self.options.rocksdb: diff --git a/external/rocksdb/conanfile.py b/external/rocksdb/conanfile.py index 09425b9f863..1c7853d8140 100644 --- a/external/rocksdb/conanfile.py +++ b/external/rocksdb/conanfile.py @@ -89,13 +89,13 @@ def requirements(self): if self.options.with_snappy: self.requires("snappy/1.1.10") if self.options.with_lz4: - self.requires("lz4/1.9.4") + self.requires("lz4/1.10.0") if self.options.with_zlib: self.requires("zlib/[>=1.2.11 <2]") if self.options.with_zstd: - self.requires("zstd/1.5.5") + self.requires("zstd/1.5.6") if self.options.get_safe("with_tbb"): - self.requires("onetbb/2021.10.0") + self.requires("onetbb/2021.12.0") if self.options.with_jemalloc: self.requires("jemalloc/5.3.0") diff --git a/external/soci/conanfile.py b/external/soci/conanfile.py index 67c572d5ad8..7e611493d70 100644 --- a/external/soci/conanfile.py +++ b/external/soci/conanfile.py @@ -62,15 +62,15 @@ def configure(self): def requirements(self): if self.options.with_sqlite3: - self.requires("sqlite3/3.41.1") + self.requires("sqlite3/3.47.0") if self.options.with_odbc and self.settings.os != "Windows": self.requires("odbc/2.3.11") if self.options.with_mysql: - self.requires("libmysqlclient/8.0.31") + self.requires("libmysqlclient/8.1.0") if self.options.with_postgresql: - self.requires("libpq/14.7") + self.requires("libpq/15.5") if self.options.with_boost: - self.requires("boost/1.81.0") + self.requires("boost/1.83.0") @property def _minimum_compilers_version(self):