Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump restinio/0.6.12 + upgrade deps #3479

Merged
merged 3 commits into from
Nov 12, 2020
Merged

bump restinio/0.6.12 + upgrade deps #3479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7fc083
bump restinio/0.6.12 + upgrade deps
prince-chrismc Nov 10, 2020
a264256
testing upgrading deps (fails)
prince-chrismc Nov 11, 2020
3ed8a19
bumping more deps + minify example to avoid compliation errors
prince-chrismc Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions recipes/restinio/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
17 changes: 10 additions & 7 deletions recipes/restinio/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
13 changes: 1 addition & 12 deletions recipes/restinio/all/test_package/example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<>>();
Expand All @@ -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();
});

Expand Down
2 changes: 2 additions & 0 deletions recipes/restinio/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ versions:
folder: all
"0.6.11":
folder: all
"0.6.12":
folder: all