Skip to content

Commit

Permalink
all: Bump inja, nlohmann_json, spdlog, fmt, gtest, cli11 versions
Browse files Browse the repository at this point in the history
Additionally, remove Conan version ranges. These do not provide
the expected value and just cause problems.
  • Loading branch information
cassava committed Apr 19, 2023
1 parent fe678bc commit 5d646b1
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 29 deletions.
6 changes: 3 additions & 3 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ def cloe_requires(dep):
cloe_requires("cloe-engine")

# Overrides:
self.requires("fmt/[~=8.1.1]", override=True)
self.requires("inja/[~=3.3.0]", override=True)
self.requires("nlohmann_json/[~=3.10.5]", override=True)
self.requires("fmt/9.1.0", override=True)
self.requires("inja/3.4.0", override=True)
self.requires("nlohmann_json/3.11.2", override=True)
self.requires("incbin/cci.20211107", override=True),
self.requires(f"boost/{boost_version}", override=True)

Expand Down
8 changes: 4 additions & 4 deletions engine/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ def set_version(self):
def requirements(self):
self.requires(f"cloe-runtime/{self.version}@cloe/develop")
self.requires(f"cloe-models/{self.version}@cloe/develop")
self.requires("cli11/[~=2.1.2]", private=True)
self.requires("cli11/2.3.2", private=True)
if self.options.server:
self.requires(f"cloe-oak/{self.version}@cloe/develop", private=True)
self.requires("boost/[>=1.65.1]")
self.requires("fmt/[~=8.1.1]", override=True)
self.requires("nlohmann_json/[~=3.10.5]", override=True)
self.requires("fmt/9.1.0", override=True)
self.requires("nlohmann_json/3.11.2", override=True)

def build_requirements(self):
self.test_requires("gtest/[~1.10]")
self.test_requires("gtest/1.13.0")

def layout(self):
cmake.cmake_layout(self)
Expand Down
6 changes: 3 additions & 3 deletions fable/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ def set_version(self):

def requirements(self):
self.requires("boost/[>=1.65.1]")
self.requires("fmt/[>=6.2.0]")
self.requires("nlohmann_json/[~=3.10.5]")
self.requires("fmt/9.1.0")
self.requires("nlohmann_json/3.11.2")

def build_requirements(self):
self.test_requires("gtest/[~=1.10]")
self.test_requires("gtest/1.13.0")

def layout(self):
cmake.cmake_layout(self)
Expand Down
4 changes: 2 additions & 2 deletions fable/examples/contacts/conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# can be built with Conan and CMake.

[requires]
cli11/[~=2.1.2]
cli11/2.3.2
fable/[>=0.20.0, include_prerelease=True]@cloe/develop
fmt/[~=8.1.1]
fmt/9.1.0

[generators]
CMakeDeps
Expand Down
2 changes: 1 addition & 1 deletion fable/examples/simple_config/conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# can be built with Conan and CMake.

[requires]
cli11/[~=2.1.2]
cli11/2.3.2
fable/[>=0.20.0, include_prerelease=True]@cloe/develop

[generators]
Expand Down
4 changes: 2 additions & 2 deletions fable/test_v2_package/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ def requirements(self):
self.requires(self.tested_reference_str)
else:
self.requires(f"fable/{self.version}@cloe/develop")
self.requires("cli11/[~=2.1.2]")
self.requires("fmt/[~=8.1.1]")
self.requires("cli11/2.3.2")
self.requires("fmt/9.1.0")

def generate(self):
tc = cmake.CMakeToolchain(self)
Expand Down
4 changes: 2 additions & 2 deletions models/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ def set_version(self):
def requirements(self):
self.requires(f"cloe-runtime/{self.version}@cloe/develop")
self.requires("boost/[>=1.65.1]")
self.requires("eigen/[~=3.4.0]")
self.requires("eigen/3.4.0")

def build_requirements(self):
self.test_requires("gtest/[~1.10]")
self.test_requires("gtest/1.13.0")

def layout(self):
cmake.cmake_layout(self)
Expand Down
2 changes: 1 addition & 1 deletion oak/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def requirements(self):
self.requires("oatpp/1.3.0")

def build_requirements(self):
self.test_requires("gtest/[~1.10]")
self.test_requires("gtest/1.13.0")

def layout(self):
cmake.cmake_layout(self)
Expand Down
8 changes: 4 additions & 4 deletions optional/vtd/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ def requirements(self):
# Overrides, same as in the cloe conanfile.py:
self.requires("protobuf/[>=3.9.1]", override=True)
self.requires("zlib/1.2.12", override=True)
self.requires("fmt/[~=8.1.1]", override=True)
self.requires("inja/[~=3.3.0]", override=True)
self.requires("nlohmann_json/[~=3.10.5]", override=True)
self.requires("fmt/9.1.0", override=True)
self.requires("inja/3.4.0", override=True)
self.requires("nlohmann_json/3.11.2", override=True)
self.requires("incbin/cci.20211107", override=True),

def build_requirements(self):
self.test_requires("gtest/[~1.10]")
self.test_requires("gtest/1.13.0")

def _compress_and_remove(self, dir):
# reset() will remove the packages metadata
Expand Down
2 changes: 1 addition & 1 deletion plugins/basic/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def requirements(self):
self.requires(f"cloe-models/{self.version}@cloe/develop")

def build_requirements(self):
self.test_requires("gtest/[~1.10]")
self.test_requires("gtest/1.13.0")

def layout(self):
cmake.cmake_layout(self)
Expand Down
2 changes: 1 addition & 1 deletion plugins/gndtruth_extractor/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def requirements(self):
self.requires(f"cloe-models/{self.version}@cloe/develop")

def build_requirements(self):
self.test_requires("gtest/[~1.10]")
self.test_requires("gtest/1.13.0")

def layout(self):
cmake.cmake_layout(self)
Expand Down
2 changes: 1 addition & 1 deletion plugins/minimator/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def requirements(self):
self.requires(f"cloe-models/{self.version}@cloe/develop")

def build_requirements(self):
self.test_requires("gtest/[~1.10]")
self.test_requires("gtest/1.13.0")

def layout(self):
cmake.cmake_layout(self)
Expand Down
2 changes: 1 addition & 1 deletion plugins/noisy_sensor/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def requirements(self):
self.requires(f"cloe-models/{self.version}@cloe/develop")

def build_requirements(self):
self.test_requires("gtest/[~1.10]")
self.test_requires("gtest/1.13.0")

def layout(self):
cmake.cmake_layout(self)
Expand Down
6 changes: 3 additions & 3 deletions runtime/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ def set_version(self):
def requirements(self):
self.requires(f"fable/{self.version}@cloe/develop")
self.requires("boost/[>=1.65.1]")
self.requires("inja/[~=3.3.0]")
self.requires("spdlog/[~=1.9.0]")
self.requires("inja/3.4.0")
self.requires("spdlog/1.11.0")
self.requires("incbin/cci.20211107")

def build_requirements(self):
self.test_requires("gtest/[~1.10]")
self.test_requires("gtest/1.13.0")

def layout(self):
cmake.cmake_layout(self)
Expand Down

0 comments on commit 5d646b1

Please sign in to comment.