Skip to content

Commit 5d646b1

Browse files
committed
all: Bump inja, nlohmann_json, spdlog, fmt, gtest, cli11 versions
Additionally, remove Conan version ranges. These do not provide the expected value and just cause problems.
1 parent fe678bc commit 5d646b1

File tree

14 files changed

+29
-29
lines changed

14 files changed

+29
-29
lines changed

conanfile.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ def cloe_requires(dep):
6262
cloe_requires("cloe-engine")
6363

6464
# Overrides:
65-
self.requires("fmt/[~=8.1.1]", override=True)
66-
self.requires("inja/[~=3.3.0]", override=True)
67-
self.requires("nlohmann_json/[~=3.10.5]", override=True)
65+
self.requires("fmt/9.1.0", override=True)
66+
self.requires("inja/3.4.0", override=True)
67+
self.requires("nlohmann_json/3.11.2", override=True)
6868
self.requires("incbin/cci.20211107", override=True),
6969
self.requires(f"boost/{boost_version}", override=True)
7070

engine/conanfile.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ def set_version(self):
5151
def requirements(self):
5252
self.requires(f"cloe-runtime/{self.version}@cloe/develop")
5353
self.requires(f"cloe-models/{self.version}@cloe/develop")
54-
self.requires("cli11/[~=2.1.2]", private=True)
54+
self.requires("cli11/2.3.2", private=True)
5555
if self.options.server:
5656
self.requires(f"cloe-oak/{self.version}@cloe/develop", private=True)
5757
self.requires("boost/[>=1.65.1]")
58-
self.requires("fmt/[~=8.1.1]", override=True)
59-
self.requires("nlohmann_json/[~=3.10.5]", override=True)
58+
self.requires("fmt/9.1.0", override=True)
59+
self.requires("nlohmann_json/3.11.2", override=True)
6060

6161
def build_requirements(self):
62-
self.test_requires("gtest/[~1.10]")
62+
self.test_requires("gtest/1.13.0")
6363

6464
def layout(self):
6565
cmake.cmake_layout(self)

fable/conanfile.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ def set_version(self):
4545

4646
def requirements(self):
4747
self.requires("boost/[>=1.65.1]")
48-
self.requires("fmt/[>=6.2.0]")
49-
self.requires("nlohmann_json/[~=3.10.5]")
48+
self.requires("fmt/9.1.0")
49+
self.requires("nlohmann_json/3.11.2")
5050

5151
def build_requirements(self):
52-
self.test_requires("gtest/[~=1.10]")
52+
self.test_requires("gtest/1.13.0")
5353

5454
def layout(self):
5555
cmake.cmake_layout(self)

fable/examples/contacts/conanfile.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# can be built with Conan and CMake.
33

44
[requires]
5-
cli11/[~=2.1.2]
5+
cli11/2.3.2
66
fable/[>=0.20.0, include_prerelease=True]@cloe/develop
7-
fmt/[~=8.1.1]
7+
fmt/9.1.0
88

99
[generators]
1010
CMakeDeps

fable/examples/simple_config/conanfile.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# can be built with Conan and CMake.
33

44
[requires]
5-
cli11/[~=2.1.2]
5+
cli11/2.3.2
66
fable/[>=0.20.0, include_prerelease=True]@cloe/develop
77

88
[generators]

fable/test_v2_package/conanfile.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def requirements(self):
3434
self.requires(self.tested_reference_str)
3535
else:
3636
self.requires(f"fable/{self.version}@cloe/develop")
37-
self.requires("cli11/[~=2.1.2]")
38-
self.requires("fmt/[~=8.1.1]")
37+
self.requires("cli11/2.3.2")
38+
self.requires("fmt/9.1.0")
3939

4040
def generate(self):
4141
tc = cmake.CMakeToolchain(self)

models/conanfile.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ def set_version(self):
4343
def requirements(self):
4444
self.requires(f"cloe-runtime/{self.version}@cloe/develop")
4545
self.requires("boost/[>=1.65.1]")
46-
self.requires("eigen/[~=3.4.0]")
46+
self.requires("eigen/3.4.0")
4747

4848
def build_requirements(self):
49-
self.test_requires("gtest/[~1.10]")
49+
self.test_requires("gtest/1.13.0")
5050

5151
def layout(self):
5252
cmake.cmake_layout(self)

oak/conanfile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def requirements(self):
4545
self.requires("oatpp/1.3.0")
4646

4747
def build_requirements(self):
48-
self.test_requires("gtest/[~1.10]")
48+
self.test_requires("gtest/1.13.0")
4949

5050
def layout(self):
5151
cmake.cmake_layout(self)

optional/vtd/conanfile.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ def requirements(self):
5454
# Overrides, same as in the cloe conanfile.py:
5555
self.requires("protobuf/[>=3.9.1]", override=True)
5656
self.requires("zlib/1.2.12", override=True)
57-
self.requires("fmt/[~=8.1.1]", override=True)
58-
self.requires("inja/[~=3.3.0]", override=True)
59-
self.requires("nlohmann_json/[~=3.10.5]", override=True)
57+
self.requires("fmt/9.1.0", override=True)
58+
self.requires("inja/3.4.0", override=True)
59+
self.requires("nlohmann_json/3.11.2", override=True)
6060
self.requires("incbin/cci.20211107", override=True),
6161

6262
def build_requirements(self):
63-
self.test_requires("gtest/[~1.10]")
63+
self.test_requires("gtest/1.13.0")
6464

6565
def _compress_and_remove(self, dir):
6666
# reset() will remove the packages metadata

plugins/basic/conanfile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def requirements(self):
4343
self.requires(f"cloe-models/{self.version}@cloe/develop")
4444

4545
def build_requirements(self):
46-
self.test_requires("gtest/[~1.10]")
46+
self.test_requires("gtest/1.13.0")
4747

4848
def layout(self):
4949
cmake.cmake_layout(self)

plugins/gndtruth_extractor/conanfile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def requirements(self):
4242
self.requires(f"cloe-models/{self.version}@cloe/develop")
4343

4444
def build_requirements(self):
45-
self.test_requires("gtest/[~1.10]")
45+
self.test_requires("gtest/1.13.0")
4646

4747
def layout(self):
4848
cmake.cmake_layout(self)

plugins/minimator/conanfile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def requirements(self):
4242
self.requires(f"cloe-models/{self.version}@cloe/develop")
4343

4444
def build_requirements(self):
45-
self.test_requires("gtest/[~1.10]")
45+
self.test_requires("gtest/1.13.0")
4646

4747
def layout(self):
4848
cmake.cmake_layout(self)

plugins/noisy_sensor/conanfile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def requirements(self):
4242
self.requires(f"cloe-models/{self.version}@cloe/develop")
4343

4444
def build_requirements(self):
45-
self.test_requires("gtest/[~1.10]")
45+
self.test_requires("gtest/1.13.0")
4646

4747
def layout(self):
4848
cmake.cmake_layout(self)

runtime/conanfile.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ def set_version(self):
4545
def requirements(self):
4646
self.requires(f"fable/{self.version}@cloe/develop")
4747
self.requires("boost/[>=1.65.1]")
48-
self.requires("inja/[~=3.3.0]")
49-
self.requires("spdlog/[~=1.9.0]")
48+
self.requires("inja/3.4.0")
49+
self.requires("spdlog/1.11.0")
5050
self.requires("incbin/cci.20211107")
5151

5252
def build_requirements(self):
53-
self.test_requires("gtest/[~1.10]")
53+
self.test_requires("gtest/1.13.0")
5454

5555
def layout(self):
5656
cmake.cmake_layout(self)

0 commit comments

Comments
 (0)