diff options
| author | Leitwolf | 2026-10-31 19:31:00 +0300 |
|---|---|---|
| committer | GitHub | 2026-10-31 19:31:00 +0300 |
| commit | 9e1687de6064756f470889e43dd69dfbb2f4ae61 (patch) | |
| tree | b4fee4c8d4c8d960158d82f50180fbb761bb0967 /docs | |
| parent | 326ea0c0213aeecb6b984bba3dabb0ebad97679e (diff) | |
| parent | 5a8606bb62aadb927bef5283aef804b4476fc91e (diff) | |
| download | catch3-9e1687de6064756f470889e43dd69dfbb2f4ae61.tar.gz | |
Merge pull request #23 from Progmasoft/license/exception-2.0
Move to the Progmasoft Linking Exception, Version 2.0
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/contributing.md | 2 | ||||
| -rw-r--r-- | docs/release-notes.md | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/docs/contributing.md b/docs/contributing.md index 82e82675..ecccf68f 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -66,7 +66,7 @@ Code that includes its headers needs C++17 or later. `src/Progmasoft` holds what Progmasoft adds: the runner, the results model, property testing and snapshots. It is licensed `MPL-2.0 WITH -AdditionRef-Progmasoft-Exception-1.1`, follows the +AdditionRef-Progmasoft-Exception-2.0`, follows the [Progmasoft C++ Style](https://github.com/Progmasoft/progmasoft-cpp), is C++17, reports recoverable errors with `Expected` rather than exceptions, and is formatted with the `.clang-format` beside it. diff --git a/docs/release-notes.md b/docs/release-notes.md index b18ee5be..870541d4 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -14,6 +14,12 @@ based on Catch2 3.16.1; Catch2's own history is in ## 0.3.0 (unreleased) +### Language and license + +Catch3 is C++17, and its headers work in C++17 and later. Progmasoft-authored +files move to the Progmasoft Linking Exception, Version 2.0; Catch2-derived code +keeps the Boost Software License. + ### The Catch3 runner Catch3 keeps Catch2's API for writing tests and replaces its session, command |