diff --git a/README.md b/README.md index 58b0d554..7257f032 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ [![Github Releases](https://img.shields.io/github/release/philsquared/catch.svg)](https://github.com/philsquared/catch/releases) [![Build Status](https://travis-ci.org/philsquared/Catch.svg?branch=master)](https://travis-ci.org/philsquared/Catch) [![Build status](https://ci.appveyor.com/api/projects/status/hrtk60hv6tw6fght/branch/master?svg=true)](https://ci.appveyor.com/project/philsquared/catch/branch/master) -[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/q3wLegtaHunTHSls) +[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/jG7wnHX9VAcxpSHy) -The latest, single header, version can be downloaded directly using this link +The latest, single header, version can be downloaded directly using this link ## What's the Catch? diff --git a/conanfile.py b/conanfile.py index b501ca9f..d5072afc 100644 --- a/conanfile.py +++ b/conanfile.py @@ -4,7 +4,7 @@ from conans import ConanFile class CatchConan(ConanFile): name = "Catch" - version = "1.12.1" + version = "1.12.2" description = "A modern, C++-native, header-only, framework for unit-tests, TDD and BDD" author = "philsquared" generators = "cmake" diff --git a/docs/release-notes.md b/docs/release-notes.md index f3c185ea..62779e1e 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,3 +1,7 @@ +# 1.12.2 +### Fixes +* Fixed missing include + # 1.12.1 ### Fixes diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 0cd0bed8..34fc757c 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -38,7 +38,7 @@ namespace Catch { } inline Version libraryVersion() { - static Version version( 1, 12, 1, "", 0 ); + static Version version( 1, 12, 2, "", 0 ); return version; } diff --git a/single_include/catch.hpp b/single_include/catch.hpp index f619f237..fdb046fe 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * Catch v1.12.1 - * Generated: 2018-03-02 21:17:41.036711 + * Catch v1.12.2 + * Generated: 2018-05-14 15:10:01.112442 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -6599,6 +6599,7 @@ namespace Catch { #endif // not Windows +#include #include #include @@ -8466,7 +8467,7 @@ namespace Catch { } inline Version libraryVersion() { - static Version version( 1, 12, 1, "", 0 ); + static Version version( 1, 12, 2, "", 0 ); return version; } @@ -9171,6 +9172,8 @@ std::string toString( std::nullptr_t ) { // #included from: catch_result_builder.hpp #define TWOBLUECUBES_CATCH_RESULT_BUILDER_HPP_INCLUDED +#include + namespace Catch { ResultBuilder::ResultBuilder( char const* macroName, @@ -10664,6 +10667,7 @@ namespace Catch { // #included from: ../reporters/catch_reporter_console.hpp #define TWOBLUECUBES_CATCH_REPORTER_CONSOLE_HPP_INCLUDED +#include #include #include diff --git a/test_package/conanfile.py b/test_package/conanfile.py index 3835c926..f1b8cf83 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -10,7 +10,7 @@ class CatchConanTest(ConanFile): settings = "os", "compiler", "arch", "build_type" username = getenv("CONAN_USERNAME", "philsquared") channel = getenv("CONAN_CHANNEL", "testing") - requires = "Catch/1.12.1@%s/%s" % (username, channel) + requires = "Catch/1.12.2@%s/%s" % (username, channel) def build(self): cmake = CMake(self)