diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) -define(_CLIENT_VERSION_MINOR, 17) -define(_CLIENT_VERSION_REVISION, 3) +define(_CLIENT_VERSION_MINOR, 18) +define(_CLIENT_VERSION_REVISION, 0) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2018) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-abc-0.17-linux" +name: "bitcoin-abc-0.18-linux" enable_cache: true suites: - "xenial" diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-abc-0.17-osx" +name: "bitcoin-abc-0.18-osx" enable_cache: true suites: - "xenial" diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -1,5 +1,5 @@ --- -name: "bitcoin-abc-0.17-win" +name: "bitcoin-abc-0.18-win" enable_cache: true suites: - "xenial" diff --git a/doc/Doxyfile b/doc/Doxyfile --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.17.3 +PROJECT_NUMBER = 0.18.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/doc/release-notes.md b/doc/release-notes.md --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -1,6 +1,6 @@ -Bitcoin ABC version 0.17.3 is now available from: +Bitcoin ABC version 0.18.0 is now available from: - + This release includes the following features and fixes: - Remove the bip9params configuration. diff --git a/src/clientversion.h b/src/clientversion.h --- a/src/clientversion.h +++ b/src/clientversion.h @@ -1,4 +1,5 @@ // Copyright (c) 2009-2016 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -16,8 +17,8 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo //! requires it #define CLIENT_VERSION_MAJOR 0 -#define CLIENT_VERSION_MINOR 17 -#define CLIENT_VERSION_REVISION 3 +#define CLIENT_VERSION_MINOR 18 +#define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_BUILD 0 //! Set to true for release, false for prerelease or test build diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt --- a/src/config/CMakeLists.txt +++ b/src/config/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2017 The Bitcoin developers +# Copyright (c) 2017-2018 The Bitcoin developers # This generates config.h which provides numerous defines # about the state of the plateform we are building on. @@ -11,14 +11,14 @@ # Version set(CLIENT_VERSION_MAJOR 0) -set(CLIENT_VERSION_MINOR 17) -set(CLIENT_VERSION_REVISION 3) +set(CLIENT_VERSION_MINOR 18) +set(CLIENT_VERSION_REVISION 0) set(CLIENT_VERSION_BUILD 0) option(CLIENT_VERSION_IS_RELEASE "Build a release version" OFF) # Copyright -set(COPYRIGHT_YEAR 2017) +set(COPYRIGHT_YEAR 2018) set(COPYRIGHT_HOLDERS "The %s developers") set(COPYRIGHT_HOLDERS_SUBSTITUTION Bitcoin) string(REPLACE "%s" ${COPYRIGHT_HOLDERS_SUBSTITUTION} COPYRIGHT_HOLDERS_FINAL ${COPYRIGHT_HOLDERS}) diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp --- a/src/test/net_tests.cpp +++ b/src/test/net_tests.cpp @@ -1,4 +1,5 @@ // Copyright (c) 2012-2016 The Bitcoin Core developers +// Copyright (c) 2017-2018 The Bitcoin developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "addrman.h" @@ -195,7 +196,7 @@ BOOST_CHECK_EQUAL(userAgent(config).size(), MAX_SUBVERSION_LENGTH); BOOST_CHECK_EQUAL(userAgent(config), - "/Bitcoin ABC:0.17.3(EB8.0; very very very very very " + "/Bitcoin ABC:0.18.0(EB8.0; very very very very very " "very very very very very very very very very very very " "very very very very very very very very very very very " "very very very very very very very very very very very "