(#3479) bump restinio/0.6.12 + upgrade deps

* bump restinio/0.6.12 + upgrade deps fmt/7.1.x does not work havent testing variant-lite/2.0.0 * testing upgrading deps (fails) based on Stiffstream/restinio#129 * bumping more deps + minify example to avoid compliation errors
conan-io · Nov 12, 2020 · 24e82af · 24e82af
1 parent c42dd03
commit 24e82af
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 19 deletions.
diff --git a/recipes/restinio/all/conandata.yml b/recipes/restinio/all/conandata.yml
@@ -14,3 +14,6 @@ sources:
   "0.6.11":
     url: https://github.com/Stiffstream/restinio/archive/v.0.6.11.tar.gz
     sha256: 66c25c19efd9dc9683d60f540e9ac09b66245c5afde096fc05ec69cbb502fc5d
+  "0.6.12":
+    url: https://github.com/Stiffstream/restinio/archive/v.0.6.12.tar.gz
+    sha256: 7176d608afb8e5cd29eec2216e747be262215f5b3ab3df2b3c86e691f1cec79e
diff --git a/recipes/restinio/all/conanfile.py b/recipes/restinio/all/conanfile.py
@@ -49,30 +49,33 @@ def configure(self):
 
     def requirements(self):
         self.requires("http_parser/2.9.4")
-        self.requires("fmt/7.0.3")
+        self.requires("fmt/7.1.2")
         self.requires("expected-lite/0.4.0")
         self.requires("optional-lite/3.2.0")
-        self.requires("string-view-lite/1.4.0")
+        self.requires("string-view-lite/1.6.0")
         self.requires("variant-lite/1.2.2")
 
         if self.options.asio == "standalone":
             if tools.Version(self.version) >= "0.6.9":
-                self.requires("asio/1.17.0")
+                self.requires("asio/1.18.0")
             else:
                 self.requires("asio/1.16.1")
         else:
-            self.requires("boost/1.73.0")
+            if tools.Version(self.version) >= "0.6.9":
+                self.requires("boost/1.74.0")
+            else:
+                self.requires("boost/1.73.0")
 
         if self.options.with_openssl:
-            self.requires("openssl/1.1.1g")
+            self.requires("openssl/1.1.1h")
 
         if self.options.with_zlib:
             self.requires("zlib/1.2.11")
 
         if self.options.with_pcre == 1:
-            self.requires("pcre/8.41")
+            self.requires("pcre/8.44")
         elif self.options.with_pcre == 2:
-            self.requires("pcre2/10.33")
+            self.requires("pcre2/10.35")
 
     def source(self):
         tools.get(**self.conan_data["sources"][self.version])

diff --git a/recipes/restinio/all/test_package/example.cpp b/recipes/restinio/all/test_package/example.cpp
@@ -3,12 +3,6 @@
 
 using namespace restinio;
 
-template<typename T>
-std::ostream & operator<<(std::ostream & to, const optional_t<T> & v) {
-    if(v) to << *v;
-    return to;
-}
-
 int main() {
     // Create express router for our service.
     auto router = std::make_unique<router::express_router_t<>>();
@@ -17,12 +11,7 @@ int main() {
             [](auto req, auto params) {
                 const auto qp = parse_query(req->header().query());
                 return req->create_response()
-                        .set_body(
-                                fmt::format("meter_id={} (year={}/mon={}/day={})",
-                                        cast_to<int>(params["meter_id"]),
-                                        opt_value<int>(qp, "year"),
-                                        opt_value<int>(qp, "mon"),
-                                        opt_value<int>(qp, "day")))
+                        .set_body(fmt::format("meter_id={}", cast_to<int>(params["meter_id"])))
                         .done();
             });
 

diff --git a/recipes/restinio/config.yml b/recipes/restinio/config.yml
@@ -9,3 +9,5 @@ versions:
     folder: all
   "0.6.11":
     folder: all
+  "0.6.12":
+    folder: all