diff --git a/bin/setup.ps1 b/bin/setup.ps1 index b34ea337..5230ca46 100644 --- a/bin/setup.ps1 +++ b/bin/setup.ps1 @@ -45,7 +45,7 @@ Push-Location viam-cpp-sdk # NOTE: If you change this version, also change it in the `conanfile.py` requirements # and in dockerfile -git checkout releases/v0.20.1 +git checkout releases/v0.38.1 # Build the C++ SDK repo. # diff --git a/bin/setup.sh b/bin/setup.sh index 6457a1ae..04f1bb37 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -55,7 +55,7 @@ fi # NOTE: If you change this version, also change it in the `conanfile.py` requirements # and in the Dockerfile -git checkout releases/v0.20.1 +git checkout releases/v0.38.1 # Build the C++ SDK repo # diff --git a/conanfile.py b/conanfile.py index df16d499..bbd3f1ad 100644 --- a/conanfile.py +++ b/conanfile.py @@ -28,7 +28,7 @@ def set_version(self): def requirements(self): # NOTE: If you update the `viam-cpp-sdk` dependency here, it # should also be updated in `bin/setup.{sh,ps1}`, and in the Dockerfile. - self.requires("viam-cpp-sdk/0.20.1") + self.requires("viam-cpp-sdk/0.38.1") self.requires("openssl/[>=3 <4]") self.requires("libcurl/8.9.1") self.requires("libzip/1.11.1") diff --git a/etc/Dockerfile.ubuntu.jammy b/etc/Dockerfile.ubuntu.jammy index 3684281f..5843dff5 100644 --- a/etc/Dockerfile.ubuntu.jammy +++ b/etc/Dockerfile.ubuntu.jammy @@ -50,7 +50,7 @@ RUN conan profile detect # NOTE: If you update the `viam-cpp-sdk` dependency here, it # should also be updated in `bin/setup.{sh,ps1}`, and in the conanfile.py. RUN git clone https://github.com/viamrobotics/viam-cpp-sdk.git \ - --branch releases/v0.19.0 --depth=1 && \ + --branch releases/v0.38.1 --depth=1 && \ cd viam-cpp-sdk && \ conan create . \ --build=missing \ diff --git a/tests/go.mod b/tests/go.mod index 8241753f..2da18c7f 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -4,8 +4,8 @@ go 1.25.9 require ( go.viam.com/rdk v1.0.0 - go.viam.com/test v1.2.4 - go.viam.com/utils v0.6.6 + go.viam.com/test v1.2.5 + go.viam.com/utils v0.8.0 ) require ( diff --git a/tests/go.sum b/tests/go.sum index 4abdf94d..12a6c211 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -922,10 +922,10 @@ go.viam.com/api v0.1.566 h1:o5nWDj6at04Y8nHGC7mZQDA6NIuGdPpwqhNLY+LQtfs= go.viam.com/api v0.1.566/go.mod h1:nVe4WXrtc8aupJ8OWXSYx6KhCiOkr3VCbkwxD4D41xQ= go.viam.com/rdk v1.0.0 h1:i7nTVaccN7N045xwNyYm3vBspuY+NzwT4PX9vLw7GxU= go.viam.com/rdk v1.0.0/go.mod h1:1dl6guxr5j+Th2CsQNcIF5uNgVaFuIiKHZm1Cu5G7Bo= -go.viam.com/test v1.2.4 h1:JYgZhsuGAQ8sL9jWkziAXN9VJJiKbjoi9BsO33TW3ug= -go.viam.com/test v1.2.4/go.mod h1:zI2xzosHdqXAJ/kFqcN+OIF78kQuTV2nIhGZ8EzvaJI= -go.viam.com/utils v0.6.6 h1:1R+SpKz1McCAIC0JshgkfHy+uDu4okNmDq/AYl9m8iE= -go.viam.com/utils v0.6.6/go.mod h1:sAqzMj1M4weq/0HIqdfzrjCZ6zIzDhUemH8Tml1Hyag= +go.viam.com/test v1.2.5 h1:k2bdMTlINKOmwp6BbZTCEu4X0VDsx7h0ePQObvFBI8A= +go.viam.com/test v1.2.5/go.mod h1:t7S4N0LRX8DukUWldF68zunZ6fPLuZMEFPjvDWi/WV0= +go.viam.com/utils v0.8.0 h1:urXO5RoVahTLnsa4DaH46bF+5Ec9D47vfwEbilZ+/gI= +go.viam.com/utils v0.8.0/go.mod h1:sAqzMj1M4weq/0HIqdfzrjCZ6zIzDhUemH8Tml1Hyag= go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 h1:WJhcL4p+YeDxmZWg141nRm7XC8IDmhz7lk5GpadO1Sg= go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= goji.io v2.0.2+incompatible h1:uIssv/elbKRLznFUy3Xj4+2Mz/qKhek/9aZQDUMae7c=