Skip to content

Commit

Permalink
⬆️ Upgrade to libhal/4.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kammce committed May 13, 2024
1 parent da4c84a commit f9cad54
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ def add_demo_requirements(conan_file: ConanFile, is_platform: bool = False):
platform = str(conan_file.options.platform)
if platform.startswith("lpc40"):
conan_file.output.warning("Using lpc40 platform library!!")
conan_file.requires("libhal-lpc40/[^3.0.4]")
conan_file.requires("libhal-lpc40/[^4.0.0]")

elif platform.startswith("stm32f1"):
conan_file.output.warning("Using stm32f1 platform library!!")
conan_file.requires("libhal-stm32f1/[^3.0.0]")
conan_file.requires("libhal-stm32f1/[^4.0.0]")

conan_file.requires("libhal-util/[^4.0.0]")
conan_file.requires("libhal-util/[^5.0.0]")


class demo:
Expand All @@ -47,7 +47,7 @@ def layout(self):

def build_requirements(self):
self.tool_requires("cmake/3.27.1")
self.tool_requires("libhal-cmake-util/[^4.0.3]")
self.tool_requires("libhal-cmake-util/[^4.1.2]")

def generate(self):
virt = VirtualBuildEnv(self)
Expand All @@ -67,8 +67,8 @@ def build(self):
def add_library_requirements(conan_file: ConanFile,
override_libhal_version: str | None = None,
override_libhal_util_version: str | None = None):
libhal_version = "3.1.0"
libhal_util_version = "4.0.1"
libhal_version = "4.0.0"
libhal_util_version = "5.0.0"
if override_libhal_version:
libhal_version = override_libhal_version

Expand Down Expand Up @@ -114,8 +114,8 @@ def generate(self):

def build_requirements(self):
self.tool_requires("cmake/3.27.1")
self.tool_requires("libhal-cmake-util/[^4.0.3]")
self.test_requires("libhal-mock/[^3.0.0]")
self.tool_requires("libhal-cmake-util/[^4.1.2]")
self.test_requires("libhal-mock/[^4.0.0]")
self.test_requires("boost-ext-ut/1.1.9")

def requirements(self):
Expand Down Expand Up @@ -176,5 +176,5 @@ def test(self):

class libhal_bootstrap(ConanFile):
name = "libhal-bootstrap"
version = "1.0.3"
version = "2.0.0"
package_type = "python-require"

0 comments on commit f9cad54

Please sign in to comment.