diff --git a/CMakeLists.txt b/CMakeLists.txt index eaaaec2fd54d1018081d0e54606dad67efbc8bb2..9e19afe0b6477fc200b4ef82181d278921ed03d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ set_package_properties(nlohmann_json PROPERTIES set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_STATIC_RUNTIME OFF) set(Boost_USE_MULTITHREADED ON) -find_package(Boost 1.66 +find_package(Boost 1.70 COMPONENTS atomic chrono date_time diff --git a/Dockerfile b/Dockerfile index ee3842047a6c053c953949dfde24be296eebefaa..1141e50d1af63baf75e7e08dd9bab8f8e67433f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,8 +52,8 @@ RUN \ cmake --build build --target install && \ # boost mkdir -p /build/boost && cd /build/boost && \ - curl -L https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.gz -o boost_1_68_0.tar.gz && \ - tar xfz boost_1_68_0.tar.gz && cd /build/boost/boost_1_68_0/ && \ + curl -L https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.gz -o boost_1_70_0.tar.gz && \ + tar xfz boost_1_70_0.tar.gz && cd /build/boost/boost_1_70_0/ && \ ./bootstrap.sh --with-libraries=random,thread,system,iostreams,atomic,chrono,date_time,regex && \ ./b2 -d0 cxxstd=14 variant=release link=static threading=multi --layout=system && \ ./b2 -d0 install && \ diff --git a/README.md b/README.md index 3a5a4b86339e88211cb91e7b3e1d942e8a3ad807..f2ca5129633ea471dc2f769d523f5e846ee128b4 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Client API library for the Matrix protocol, built on top of Boost.Asio. ### Dependencies -- Boost 1.66 (includes Boost.Beast) +- Boost 1.70 (includes Boost.Beast and makes the strand interface usable) - OpenSSL - C++ 14 compiler - CMake 3.1 or greater diff --git a/appveyor.yml b/appveyor.yml index 780d8d7727724eb96999851c490d4498d4285f45..bce5d3447615689ef0acf3973a3faabcd4be56e8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ --- -version: 0.2.0-{build} +version: 0.3.0-{build} configuration: Release image: Visual Studio 2017 @@ -30,6 +30,7 @@ install: openssl:%PLATFORM%-windows spdlog:%PLATFORM%-windows zlib:%PLATFORM%-windows + - vcpkg upgrade --no-dry-run build_script: - cmake --version diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 1644d66fd84f5be02a3c6a424c870a9c7e0ec34d..7d930075a014fd44da2501f2c0d86553d5a2ad9c 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -40,9 +40,9 @@ if(USE_BUNDLED_BOOST) endif() set(BOOST_URL - https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.bz2) + https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.bz2) set(BOOST_SHA256 - 8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406) + 430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778) set(GTEST_URL https://github.com/google/googletest/archive/release-1.8.0.tar.gz) set(GTEST_SHA1 e7e646a6204638fe8e87e165292b8dd9cd4c36ed)