From d62b76cce0642652b8420a528fdc2ab1775c282f Mon Sep 17 00:00:00 2001 From: na4zagin3 Date: Sat, 11 Jul 2020 20:25:00 +0900 Subject: [PATCH 1/3] Add Changelog v0.0.2.5 --- CHANGELOG.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index faf960a..10a7b1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ and this project adheres to [Haskell PVP](https://pvp.haskell.org/). ## [Unreleased] +## [v0.0.2.5] - 2020-07-11 +### Changed +- Now `satyrographos opam uninstall` does nothing. ([#128]) + +### Removed +- Drop support of OCaml 4.09 and older, and SATySFi 0.0.4 and older. + ## [v0.0.2.4] - 2020-03-22 ### Added - Add autogen package `satyrographos/experimental/fonts` (`%fonts`) as an experimental feature. ([#122], [#125]) @@ -141,8 +148,10 @@ and this project adheres to [Haskell PVP](https://pvp.haskell.org/). [#121]: https://github.com/na4zagin3/satyrographos/pull/121 [#122]: https://github.com/na4zagin3/satyrographos/pull/122 [#125]: https://github.com/na4zagin3/satyrographos/pull/125 +[#128]: https://github.com/na4zagin3/satyrographos/pull/128 -[Unreleased]: https://github.com/na4zagin3/satyrographos/compare/v0.0.2.4...HEAD +[Unreleased]: https://github.com/na4zagin3/satyrographos/compare/v0.0.2.5...HEAD +[v0.0.2.5]: https://github.com/na4zagin3/satyrographos/compare/v0.0.2.4...v0.0.2.5 [v0.0.2.4]: https://github.com/na4zagin3/satyrographos/compare/v0.0.2.3...v0.0.2.4 [v0.0.2.3]: https://github.com/na4zagin3/satyrographos/compare/v0.0.2.2...v0.0.2.3 [v0.0.2.2]: https://github.com/na4zagin3/satyrographos/compare/v0.0.2.1...v0.0.2.2 From a81d430c253d43e121db09f589928d3905994a77 Mon Sep 17 00:00:00 2001 From: na4zagin3 Date: Sat, 11 Jul 2020 20:25:50 +0900 Subject: [PATCH 2/3] Update README --- CHANGELOG.md | 2 +- README-ja.md | 3 ++- README.md | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10a7b1d..7ad686a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ and this project adheres to [Haskell PVP](https://pvp.haskell.org/). - Now `satyrographos opam uninstall` does nothing. ([#128]) ### Removed -- Drop support of OCaml 4.09 and older, and SATySFi 0.0.4 and older. +- Drop support of OCaml 4.08 and older, and SATySFi 0.0.4 and older. ## [v0.0.2.4] - 2020-03-22 ### Added diff --git a/README-ja.md b/README-ja.md index 574650c..320536d 100644 --- a/README-ja.md +++ b/README-ja.md @@ -343,5 +343,6 @@ Satyristes ファイルはS式の列で記述されます。以下の宣言を |Satyrographos|SATySFi| |-------|-------------| -|v0.0.2系列|v0.0.4系列以前（但し、ライブラリドキュメント作成にはsatysfi.0.0.3+dev2019.02.27以後を要す）| +|v0.0.2.5以降|v0.0.5系列| +|v0.0.2.1からv0.0.2.4まで|v0.0.4系列以前（但し、ライブラリドキュメント作成にはsatysfi.0.0.3+dev2019.02.27以後を要す）| |v0.0.1系列|v0.0.3系列以前| diff --git a/README.md b/README.md index 128bfc8..3783794 100644 --- a/README.md +++ b/README.md @@ -368,5 +368,6 @@ Satyristes file is a sequence of S-Expressions. A Satyristes can contain the fol |Satyrographos|SATySFi| |-------|-------------| -|v0.0.2 series|v0.0.4 series and older (Library build requires satysfi.0.0.3+dev2019.02.27 or newer)| +|v0.0.2.5 to latest|v0.0.5 series| +|v0.0.2.1 to v0.0.2.4|v0.0.4 series and older (Library build requires satysfi.0.0.3+dev2019.02.27 or newer)| |v0.0.1 series|v0.0.3 series and older| From 3eb5f2c20dc4dde2848d6bbfed10477f70238aa0 Mon Sep 17 00:00:00 2001 From: na4zagin3 Date: Sat, 11 Jul 2020 20:28:57 +0900 Subject: [PATCH 3/3] Bump version to v0.0.2.5 --- .travis.yml | 3 +-- bin/main.ml | 2 +- satyrographos.opam | 12 ++++-------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96bd59c..4714525 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,7 @@ sudo: required install: test -e .travis.opam.sh || wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh script: bash -ex .travis-opam.sh env: - - OCAML_VERSION=4.06 - - OCAML_VERSION=4.07 - OCAML_VERSION=4.09 + - OCAML_VERSION=4.10 os: - linux diff --git a/bin/main.ml b/bin/main.ml index 7862dc5..255abc9 100644 --- a/bin/main.ml +++ b/bin/main.ml @@ -13,4 +13,4 @@ let total_command = ] let () = - Command.run ~version:"0.0.2.4" total_command + Command.run ~version:"0.0.2.5" total_command diff --git a/satyrographos.opam b/satyrographos.opam index 5d8cb7b..b8c32b9 100644 --- a/satyrographos.opam +++ b/satyrographos.opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "satyrographos" -version: "0.0.2.4" +version: "0.0.2.5" maintainer: "SAKAMOTO Noriaki " authors: [ "SAKAMOTO Noriaki " @@ -18,12 +18,8 @@ run-test: [ ] depends: [ - "ocaml" {>= "4.06.0"} - ( - "dune" {>= "1.11"} & "ocaml" {>= "4.07.0"} - | (* ppx_inline_test v0.11 requires dune 1 *) - "dune" {>= "1.11" & < "2" } & "ocaml" {< "4.07.0"} - ) + "ocaml" {>= "4.09.0"} + "dune" {>= "2"} "fileutils" "json-derivers" "ppx_deriving" @@ -35,7 +31,7 @@ depends: [ "yojson" # Janestreet Libs - "core" {< "v0.14"} + "core" {>= "v0.13" & < "v0.15"} "ppx_jane" "shexp" ]