Skip to content

Commit f4d16cb

Browse files
committed
Prepare 8.5.0
1 parent 8a11710 commit f4d16cb

File tree

7 files changed

+29
-7
lines changed

7 files changed

+29
-7
lines changed

.VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.4.0
1+
8.5.0

CHANGELOG.md

+20-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
- [Change Log](#change-log)
66
- [Unreleased](#unreleased)
7+
- [8.5.0 (2024-05-25)](#850-2024-05-25)
78
- [8.4.0 (2024-03-06)](#840-2024-03-06)
89
- [8.3.0 (2022-05-07)](#830-2022-05-07)
910
- [8.2.5 (2021-08-17)](#825-2021-08-17)
@@ -46,7 +47,25 @@
4647

4748
### [Unreleased](https://github.com/jacobwilliams/json-fortran/tree/HEAD)
4849

49-
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.4.0...HEAD)
50+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.5.0...HEAD)
51+
52+
### [8.5.0](https://github.com/jacobwilliams/json-fortran/tree/8.5.0) (2024-05-25)
53+
54+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.4.0...8.5.0)
55+
or [Download v8.5.0](https://github.com/jacobwilliams/json-fortran/releases/tag/8.5.0)
56+
57+
**Enhancements:**
58+
59+
- Various CMake updates:
60+
- 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))
61+
- 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))
62+
- Note that the CMake minimum version is now `3.18`.
63+
- 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))
64+
- Various CI and Readme updates.
65+
66+
**Bug Fixes:**
67+
68+
- 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))
5069

5170
### [8.4.0](https://github.com/jacobwilliams/json-fortran/tree/8.4.0) (2024-03-06)
5271

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ include ( "cmake/checkOutOfSource.cmake" )
4040
#---------------------
4141
project (
4242
jsonfortran
43-
VERSION 8.4.0
43+
VERSION 8.5.0
4444
LANGUAGES Fortran
4545
)
4646

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@ if you have a second copy of the JSON-Fortran project tree, and want to build th
138138
linking against those compiled/installed by the first copy:
139139

140140
```CMake
141-
cmake_minimum_required ( VERSION 2.8.8 FATAL_ERROR )
141+
cmake_minimum_required ( VERSION 3.18 FATAL_ERROR )
142142
enable_language ( Fortran )
143143
project ( jf_test NONE )
144144
145-
find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 8.4.0 REQUIRED )
145+
find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 8.5.0 REQUIRED )
146146
147147
file ( GLOB JF_TEST_SRCS "src/tests/jf_test_*.F90" )
148148
foreach ( UNIT_TEST ${JF_TEST_SRCS} )

pages/development-resources/release-checklist.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ remain accurate.
5353
1. Update the version string in remaining files requiring manual edits:
5454
1. Edit the product version in CMake
5555
1. Run cmake to generate the `.VERSION` file (or manually update this file if not running CMake)
56-
1. Edit the CMake example on line 141 of `README.md`
56+
1. Edit the CMake example on line 145 of `README.md`
5757
1. Edit the `json_fortran_version` string in `json_module.F90`
5858
1. Add these files to the git index: `git add .VERSION README.md ./src/json_module.F90`
5959
1. Commit the changes to the master branch: `git commit`

pages/releases/index.md

+3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ documentation from the documentation for official releases other than
2525
using the browser's back button. Feel free to bookmark this page, or
2626
the [main project page](|url|/index.html) for convenient navigation.
2727

28+
* [8.5.0](https://jacobwilliams.github.io/json-fortran/prev/8.5.0/index.html)
29+
([FORD](https://github.com/Fortran-FOSS-Programmers/ford) generated documentation)
30+
- [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/8.5.0)
2831
* [8.4.0](https://jacobwilliams.github.io/json-fortran/prev/8.4.0/index.html)
2932
([FORD](https://github.com/Fortran-FOSS-Programmers/ford) generated documentation)
3033
- [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/8.4.0)

src/json_module.F90

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ module json_module
7373

7474
implicit none
7575

76-
character(kind=json_CK,len=*),parameter,private :: version = '8.4.0'
76+
character(kind=json_CK,len=*),parameter,private :: version = '8.5.0'
7777
!! JSON-Fortran version.
7878
!!
7979
!!@note This string should match the one in the `.VERSION` file (which is used

0 commit comments

Comments
 (0)