Skip to content

Commit

Permalink
Merge pull request #54 from tatchi/ppxlib
Browse files Browse the repository at this point in the history
Ppxlib
  • Loading branch information
ejgallego authored Jan 10, 2022
2 parents ec5a838 + 5767bb3 commit 8f1892b
Show file tree
Hide file tree
Showing 6 changed files with 202 additions and 188 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
# - macos-latest
# - windows-latest
ocaml-compiler:
- 4.04.2
- 4.05.0
- 4.06.0
- 4.06.1
Expand Down
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
unreleased
-----
* drop support for OCaml `4.04.2`. Minimal supported version is now `4.05.0` #54 (tatchi)

* migrate to ppxlib #54 (tatchi)

* bump minimum dune version to 1.11 #56 (tatchi)

* update CI to test OCaml 4.12.0, no changes required
Expand Down
7 changes: 3 additions & 4 deletions ppx_import.opam
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ dev-repo: "git+https://github.com/ocaml-ppx/ppx_import.git"
tags: [ "syntax" ]

depends: [
"ocaml" { >= "4.04.2" }
"dune" { >= "1.11.0" }
"ppx_tools_versioned" { >= "5.4.0" }
"ocaml-migrate-parsetree" { >= "1.7.0" }
"ocaml" { >= "4.05.0" }
"dune" { >= "1.2.0" }
"ppxlib" { >= "0.24.0" }
"ounit" { with-test }
"ppx_deriving" { with-test & >= "4.2.1" }
"ppx_sexp_conv" { with-test & >= "v0.13.0" }
Expand Down
4 changes: 2 additions & 2 deletions src/dune
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
(public_name ppx_import)
(kind ppx_rewriter)
(preprocess
(pps ppx_tools_versioned.metaquot_411))
(libraries ppx_tools_versioned ocaml-migrate-parsetree))
(pps ppxlib.metaquot))
(libraries ppxlib))

(rule
(deps
Expand Down
Loading

0 comments on commit 8f1892b

Please sign in to comment.