From 7699353cdb256e22e890781deddde62e05d0f92f Mon Sep 17 00:00:00 2001
From: Mark Meredith <mark.meredith@netl.doe.gov>
Date: Tue, 20 Apr 2021 13:08:31 -0400
Subject: [PATCH] update versions

---
 Dockerfile   | 10 +++++-----
 conanfile.py |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 581ef9f..2515ce0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,16 +9,16 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get -qq update \
   && apt-get -qq -y install --no-install-recommends \
   build-essential=12.8ubuntu1.1 \
-  git=1:2.25.1-1ubuntu3 \
+  git=1:2.25.1-1ubuntu3.1 \
   ninja-build=1.10.0-1build1 \
   openscad=2019.05-3ubuntu5 \
   pkg-config=0.29.1-0ubuntu4 \
   python3-pip=20.0.2-5ubuntu1.1 \
   python3-venv=3.8.2-0ubuntu2 \
-  && apt-get clean && rm -rf /var/lib/apt/lists/*
+  && apt-get clean && rm -rf /var/lib/apt/lists/* \
 
-RUN pip3 install --no-cache-dir \
-    cmake==3.18.4.post1 \
-    conan==1.34.0
+  && pip3 install --no-cache-dir \
+  cmake==3.18.4.post1 \
+  conan==1.35.2
 
 CMD [ "/bin/bash" ]
diff --git a/conanfile.py b/conanfile.py
index 7d8b6de..e110b07 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -16,8 +16,8 @@ class CsgEbConan(ConanFile):
     options = {"shared": [True, False]}
     default_options = {"shared": False}
     generators = "pkg_config"
-    requires = ("catch2/2.13.4", "cgal/5.2", "taocpp-pegtl/3.1.0")
-    build_requires = ("meson/0.57.1",)
+    requires = ("catch2/2.13.6", "cgal/5.2.1", "taocpp-pegtl/3.2.0")
+    build_requires = ("meson/0.57.2",)
     exports_sources = "meson.build", "include/*", "src/*"
 
     def build(self):
-- 
GitLab