Bump version to 1.0.0-beta17

drogonframework · May 23, 2020 · 84e503a · 84e503a
1 parent d43c297
commit 84e503a
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(DROGON_MINOR_VERSION 0)
 set(DROGON_PATCH_VERSION 0)
 set(DROGON_VERSION
     ${DROGON_MAJOR_VERSION}.${DROGON_MINOR_VERSION}.${DROGON_PATCH_VERSION})
-set(DROGON_VERSION_STRING "${DROGON_VERSION}.beta16")
+set(DROGON_VERSION_STRING "${DROGON_VERSION}.beta17")
 
 # Offer the user the choice of overriding the installation directories
 set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries")

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.0.0-beta17] - 2020-05-22
+
+### API change list
+
+- Add methods to get DbClient connection status
+
+### Changed
+
+- Add causal profiling with coz
+
+- Add filters on static file locations
+
+- Pass data from view to its layout container
+
+- Add additional HttpStatusCodes and implement a custom error handler
+
+- Modify drogon_ctl to show more compilation information
+
+### Fixed
+
+- Fix a bug in drogon_ctl (when size of a line is larger than buffer size)
+
+- Fix a connection bug of mariadb clients
+
 ## [1.0.0-beta16] - 2020-04-27
 
 ### API change list
@@ -360,7 +384,9 @@ All notable changes to this project will be documented in this file.
 
 ## [1.0.0-beta1] - 2019-06-11
 
-[Unreleased]: https://github.com/an-tao/drogon/compare/v1.0.0-beta16...HEAD
+[Unreleased]: https://github.com/an-tao/drogon/compare/v1.0.0-beta17...HEAD
+
+[1.0.0-beta17]: https://github.com/an-tao/drogon/compare/v1.0.0-beta16...v1.0.0-beta17
 
 [1.0.0-beta16]: https://github.com/an-tao/drogon/compare/v1.0.0-beta15...v1.0.0-beta16
 

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:18.04
 RUN apt-get update -yqq \
     && apt-get install -yqq --no-install-recommends software-properties-common \
     sudo curl wget cmake pkg-config locales git gcc-8 g++-8 \
-    openssl libssl-dev libjsoncpp-dev uuid-dev zlib1g-dev \
+    openssl libssl-dev libjsoncpp-dev uuid-dev zlib1g-dev libc-ares-dev\
     postgresql-server-dev-all libmariadbclient-dev libsqlite3-dev \
     && rm -rf /var/lib/apt/lists/* \
     && locale-gen en_US.UTF-8

diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt
@@ -35,7 +35,7 @@ endforeach()
 add_executable(drogon_ctl ${ctl_sources} ${TEMPL_SRC})
 target_link_libraries(drogon_ctl PRIVATE ${PROJECT_NAME})
 target_include_directories(drogon_ctl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-add_dependencies(drogon_ctl trantor _drogon_ctl)
+add_dependencies(drogon_ctl _drogon_ctl)
 if(WIN32)
   target_link_libraries(drogon_ctl PRIVATE ws2_32 Rpcrt4)
 endif(WIN32)

diff --git a/lib/src/WebSocketConnectionImpl.cc b/lib/src/WebSocketConnectionImpl.cc
@@ -15,7 +15,6 @@
 #include "WebSocketConnectionImpl.h"
 #include "HttpAppFrameworkImpl.h"
 #include <thread>
-#include <trantor/net/inner/TcpConnectionImpl.h>
 
 using namespace drogon;
 WebSocketConnectionImpl::WebSocketConnectionImpl(

diff --git a/orm_lib/src/DbClientImpl.cc b/orm_lib/src/DbClientImpl.cc
@@ -39,7 +39,7 @@
 #endif
 #include <thread>
 #include <trantor/net/EventLoop.h>
-#include <trantor/net/inner/Channel.h>
+#include <trantor/net/Channel.h>
 #include <unordered_set>
 #include <vector>
 

diff --git a/orm_lib/src/DbClientLockFree.cc b/orm_lib/src/DbClientLockFree.cc
@@ -36,7 +36,7 @@
 #endif
 #include <thread>
 #include <trantor/net/EventLoop.h>
-#include <trantor/net/inner/Channel.h>
+#include <trantor/net/Channel.h>
 #include <unordered_set>
 #include <vector>
 

diff --git a/orm_lib/src/DbConnection.h b/orm_lib/src/DbConnection.h
@@ -18,7 +18,6 @@
 #include <drogon/orm/DbClient.h>
 #include <drogon/utils/string_view.h>
 #include <trantor/net/EventLoop.h>
-#include <trantor/net/inner/Channel.h>
 #include <trantor/utils/NonCopyable.h>
 #include <functional>
 #include <iostream>

diff --git a/orm_lib/src/mysql_impl/MysqlConnection.h b/orm_lib/src/mysql_impl/MysqlConnection.h
@@ -17,7 +17,7 @@
 #include "../DbConnection.h"
 #include <drogon/orm/DbClient.h>
 #include <trantor/net/EventLoop.h>
-#include <trantor/net/inner/Channel.h>
+#include <trantor/net/Channel.h>
 #include <trantor/utils/NonCopyable.h>
 #include <functional>
 #include <iostream>

diff --git a/orm_lib/src/postgresql_impl/PgConnection.h b/orm_lib/src/postgresql_impl/PgConnection.h
@@ -17,7 +17,7 @@
 #include "../DbConnection.h"
 #include <drogon/orm/DbClient.h>
 #include <trantor/net/EventLoop.h>
-#include <trantor/net/inner/Channel.h>
+#include <trantor/net/Channel.h>
 #include <trantor/utils/NonCopyable.h>
 #include <libpq-fe.h>
 #include <unordered_map>

diff --git a/trantor b/trantor
+3 −2		CMakeLists.txt
+25 −1		ChangeLog.md
+0 −0		trantor/net/Channel.cc
+0 −0		trantor/net/Channel.h
+3 −3		trantor/net/inner/AresResolver.cc
+2 −2		trantor/net/inner/AresResolver.h