diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b729a2ac..cfdb6a647 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,19 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) This project adheres to [Semantic Versioning](http://semver.org/). - ## [unreleased] - ### Added +### Changed + +### Fixed + + +## [1.7.0] - 2020-06-08 + +### Added + - Support for buffer types other that `std::string`. `pbf_writer` is now just a typedef for `basic_pbf_writer`. Other buffer types can be used with `basic_pbf_writer`. See `doc/advanced.md` for details. @@ -373,7 +381,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Make pbf reader and writer code endianess-aware. -[unreleased]: https://github.com/osmcode/libosmium/compare/v1.6.8...HEAD +[unreleased]: https://github.com/osmcode/libosmium/compare/v1.7.0...HEAD +[1.7.0]: https://github.com/osmcode/libosmium/compare/v1.6.8...v1.7.0 [1.6.8]: https://github.com/osmcode/libosmium/compare/v1.6.7...v1.6.8 [1.6.7]: https://github.com/osmcode/libosmium/compare/v1.6.6...v1.6.7 [1.6.6]: https://github.com/osmcode/libosmium/compare/v1.6.5...v1.6.6 diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c05295da..f9702d603 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ cmake_minimum_required(VERSION 2.8 FATAL_ERROR) project(protozero) set(PROTOZERO_VERSION_MAJOR 1) -set(PROTOZERO_VERSION_MINOR 6) -set(PROTOZERO_VERSION_PATCH 8) +set(PROTOZERO_VERSION_MINOR 7) +set(PROTOZERO_VERSION_PATCH 0) set(PROTOZERO_VERSION "${PROTOZERO_VERSION_MAJOR}.${PROTOZERO_VERSION_MINOR}.${PROTOZERO_VERSION_PATCH}") diff --git a/UPGRADING.md b/UPGRADING.md index 9a5db8ee9..bf9040809 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -13,6 +13,11 @@ macro `PROTOZERO_STRICT_API` in which case Protozero will compile without the code used for backwards compatibilty. You will then get compile errors for older API usages. +## Upgrading from *v1.6* to *v1.7* + +* The `pbf_writer` class is now a typedef for `basic_pbf_writer` + If you have forward declared it in your code, it might have to change. + ## Upgrading from *v1.5* to *v1.6.0* * The `data_view` class moved from `types.hpp` into its own header file diff --git a/include/protozero/version.hpp b/include/protozero/version.hpp index 5abfeb789..9a0e4cc9f 100644 --- a/include/protozero/version.hpp +++ b/include/protozero/version.hpp @@ -20,15 +20,15 @@ documentation. #define PROTOZERO_VERSION_MAJOR 1 /// The minor version number -#define PROTOZERO_VERSION_MINOR 6 +#define PROTOZERO_VERSION_MINOR 7 /// The patch number -#define PROTOZERO_VERSION_PATCH 8 +#define PROTOZERO_VERSION_PATCH 0 /// The complete version number #define PROTOZERO_VERSION_CODE (PROTOZERO_VERSION_MAJOR * 10000 + PROTOZERO_VERSION_MINOR * 100 + PROTOZERO_VERSION_PATCH) /// Version number as string -#define PROTOZERO_VERSION_STRING "1.6.8" +#define PROTOZERO_VERSION_STRING "1.7.0" #endif // PROTOZERO_VERSION_HPP