Skip to content

Commit

Permalink
Merge pull request #129 from na4zagin3/bump-version
Browse files Browse the repository at this point in the history
Bump version to v0.0.2.5
  • Loading branch information
na4zagin3 authored Jul 11, 2020
2 parents f4c329f + 3eb5f2c commit ab097ac
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 14 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.08 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])
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion README-ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -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系列以前|
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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|
2 changes: 1 addition & 1 deletion bin/main.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 4 additions & 8 deletions satyrographos.opam
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "satyrographos"
version: "0.0.2.4"
version: "0.0.2.5"
maintainer: "SAKAMOTO Noriaki <[email protected]>"
authors: [
"SAKAMOTO Noriaki <[email protected]>"
Expand All @@ -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"
Expand All @@ -35,7 +31,7 @@ depends: [
"yojson"

# Janestreet Libs
"core" {< "v0.14"}
"core" {>= "v0.13" & < "v0.15"}
"ppx_jane"
"shexp"
]
Expand Down

0 comments on commit ab097ac

Please sign in to comment.