diff --git a/.VERSION b/.VERSION index a2f28f43b..6d2890793 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -8.4.0 +8.5.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 14255156a..f21b947cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [Change Log](#change-log) - [Unreleased](#unreleased) + - [8.5.0 (2024-05-25)](#850-2024-05-25) - [8.4.0 (2024-03-06)](#840-2024-03-06) - [8.3.0 (2022-05-07)](#830-2022-05-07) - [8.2.5 (2021-08-17)](#825-2021-08-17) @@ -46,7 +47,25 @@ ### [Unreleased](https://github.com/jacobwilliams/json-fortran/tree/HEAD) -[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.4.0...HEAD) +[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.5.0...HEAD) + +### [8.5.0](https://github.com/jacobwilliams/json-fortran/tree/8.5.0) (2024-05-25) + +[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.4.0...8.5.0) +or [Download v8.5.0](https://github.com/jacobwilliams/json-fortran/releases/tag/8.5.0) + +**Enhancements:** + +- Various CMake updates: + - Only installing if json-fortran is the top level project. Added a library alias so that json fortran can be included with `find_package`, `fetch_content`, and `add_subdirectory` easily. [#526](https://github.com/jacobwilliams/json-fortran/issues/526) [#527](https://github.com/jacobwilliams/json-fortran/pull/527) , [#528](https://github.com/jacobwilliams/json-fortran/pull/528), [#529](https://github.com/jacobwilliams/json-fortran/pull/529) [#556](https://github.com/jacobwilliams/json-fortran/pull/556) ([K20shores](https://github.com/K20shores)) + - Fixed compilation with Ninja and Intel OneAPI ifx compiler, and added some CMake options [#557](https://github.com/jacobwilliams/json-fortran/pull/557) ([lmdiazangulo](https://github.com/lmdiazangulo)) + - Note that the CMake minimum version is now `3.18`. +- Added a new unit test. [#546](https://github.com/jacobwilliams/json-fortran/issues/546) [#547](https://github.com/jacobwilliams/json-fortran/pull/547) ([jacobwilliams](https://github.com/jacobwilliams)) +- Various CI and Readme updates. + +**Bug Fixes:** + +- Fixed a bug when IEEE floating-point rounding mode was set to `IEEE_DOWN`. [#545](https://github.com/jacobwilliams/json-fortran/pull/545) ([amanotk](https://github.com/amanotk)) ### [8.4.0](https://github.com/jacobwilliams/json-fortran/tree/8.4.0) (2024-03-06) diff --git a/CMakeLists.txt b/CMakeLists.txt index c94daba50..816d71164 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ include ( "cmake/checkOutOfSource.cmake" ) #--------------------- project ( jsonfortran - VERSION 8.4.0 + VERSION 8.5.0 LANGUAGES Fortran ) diff --git a/README.md b/README.md index bb002e152..cf2da9b78 100644 --- a/README.md +++ b/README.md @@ -138,11 +138,11 @@ if you have a second copy of the JSON-Fortran project tree, and want to build th linking against those compiled/installed by the first copy: ```CMake -cmake_minimum_required ( VERSION 2.8.8 FATAL_ERROR ) +cmake_minimum_required ( VERSION 3.18 FATAL_ERROR ) enable_language ( Fortran ) project ( jf_test NONE ) -find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 8.4.0 REQUIRED ) +find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 8.5.0 REQUIRED ) file ( GLOB JF_TEST_SRCS "src/tests/jf_test_*.F90" ) foreach ( UNIT_TEST ${JF_TEST_SRCS} ) diff --git a/pages/development-resources/release-checklist.md b/pages/development-resources/release-checklist.md index 0678a3019..7d4eaa677 100644 --- a/pages/development-resources/release-checklist.md +++ b/pages/development-resources/release-checklist.md @@ -53,7 +53,7 @@ remain accurate. 1. Update the version string in remaining files requiring manual edits: 1. Edit the product version in CMake 1. Run cmake to generate the `.VERSION` file (or manually update this file if not running CMake) - 1. Edit the CMake example on line 141 of `README.md` + 1. Edit the CMake example on line 145 of `README.md` 1. Edit the `json_fortran_version` string in `json_module.F90` 1. Add these files to the git index: `git add .VERSION README.md ./src/json_module.F90` 1. Commit the changes to the master branch: `git commit` diff --git a/pages/releases/index.md b/pages/releases/index.md index 1d3295058..2c9433a4c 100644 --- a/pages/releases/index.md +++ b/pages/releases/index.md @@ -25,6 +25,9 @@ documentation from the documentation for official releases other than using the browser's back button. Feel free to bookmark this page, or the [main project page](|url|/index.html) for convenient navigation. +* [8.5.0](https://jacobwilliams.github.io/json-fortran/prev/8.5.0/index.html) + ([FORD](https://github.com/Fortran-FOSS-Programmers/ford) generated documentation) + - [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/8.5.0) * [8.4.0](https://jacobwilliams.github.io/json-fortran/prev/8.4.0/index.html) ([FORD](https://github.com/Fortran-FOSS-Programmers/ford) generated documentation) - [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/8.4.0) diff --git a/src/json_module.F90 b/src/json_module.F90 index 9135ffef2..7c1c12ac5 100644 --- a/src/json_module.F90 +++ b/src/json_module.F90 @@ -73,7 +73,7 @@ module json_module implicit none - character(kind=json_CK,len=*),parameter,private :: version = '8.4.0' + character(kind=json_CK,len=*),parameter,private :: version = '8.5.0' !! JSON-Fortran version. !! !!@note This string should match the one in the `.VERSION` file (which is used