From c37a1b2298376f7c49a5e4ab9a7d4f21935eb840 Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 11 Dec 2024 17:29:29 +0000 Subject: [PATCH] Advertise compatibility with OCaml 5.3 --- .github/workflows/test.yml | 1 + dune-project | 28 ++++++++++++++-------------- yocaml.opam | 4 ++-- yocaml_cmarkit.opam | 2 +- yocaml_eio.opam | 4 ++-- yocaml_git.opam | 2 +- yocaml_jingoo.opam | 2 +- yocaml_mustache.opam | 2 +- yocaml_omd.opam | 2 +- yocaml_otoml.opam | 2 +- yocaml_runtime.opam | 2 +- yocaml_syndication.opam | 2 +- yocaml_unix.opam | 2 +- yocaml_yaml.opam | 2 +- 14 files changed, 29 insertions(+), 28 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a79a9e9..1a9838c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,6 +13,7 @@ jobs: ocaml-compiler: - 5.1.x - 5.2.x + - 5.3.0~beta2 runs-on: ${{ matrix.os }} diff --git a/dune-project b/dune-project index 6682a1b..e6f6ab9 100644 --- a/dune-project +++ b/dune-project @@ -16,7 +16,7 @@ (synopsis "Core engine of the YOCaml Static Site Generator") (description "YOCaml is a build system dedicated to generate static document") (depends - (ocaml (and (>= 5.1.1) (< 5.3))) + (ocaml (>= 5.1.1)) (odoc :with-doc) (sherlodoc :with-doc) (fmt :with-test) @@ -24,7 +24,7 @@ (qcheck :with-test) (qcheck-alcotest :with-test) ppx_expect - (mdx (and :with-test (= 2.4.1))) + (mdx (and :with-test (= 2.5.0))) (ocamlformat :with-dev-setup) (ocp-indent :with-dev-setup) (merlin :with-dev-setup) @@ -36,7 +36,7 @@ (depends (ocaml (>= 5.1.1)) ppx_expect - (mdx (and :with-test (= 2.4.1))) + (mdx (and :with-test (= 2.5.0))) (yocaml (= :version)) (cohttp (>= 5.3.11)) (magic-mime (>= 1.3.1)) @@ -50,12 +50,12 @@ (depends (ocaml (>= 5.1.1)) ppx_expect - (mdx (and :with-test (= 2.4.1))) + (mdx (and :with-test (= 2.5.0))) (yocaml (= :version)) (yocaml_runtime (= :version)) (eio (= 1.1)) (eio_main (= 1.1)) - (cohttp-eio (= 6.0.0~beta2)))) + (cohttp-eio (>= 6.0.0~beta2)))) (package (name yocaml_unix) @@ -63,7 +63,7 @@ (depends (ocaml (>= 5.1.1)) ppx_expect - (mdx (and :with-test (= 2.4.1))) + (mdx (and :with-test (= 2.5.0))) (httpcats (>= 0.0.1)) (yocaml (= :version)) (yocaml_runtime (= :version)))) @@ -74,7 +74,7 @@ (depends (ocaml (>= 5.1.1)) ppx_expect - (mdx (and :with-test (= 2.4.1))) + (mdx (and :with-test (= 2.5.0))) (yocaml (= :version)) (yaml (>= 3.2.0)))) @@ -84,7 +84,7 @@ (depends (ocaml (>= 5.1.1)) ppx_expect - (mdx (and :with-test (= 2.4.1))) + (mdx (and :with-test (= 2.5.0))) (yocaml (= :version)) (otoml (>= 1.0.5)))) @@ -95,7 +95,7 @@ (depends (ocaml (>= 5.1.1)) ppx_expect - (mdx (and :with-test (= 2.4.1))) + (mdx (and :with-test (= 2.5.0))) (yocaml (= :version)) (omd (>= 2.0.0~alpha4)))) @@ -105,7 +105,7 @@ (depends (ocaml (>= 5.1.1)) ppx_expect - (mdx (and :with-test (= 2.4.1))) + (mdx (and :with-test (= 2.5.0))) (yocaml (= :version)) cmarkit)) @@ -115,7 +115,7 @@ (depends (ocaml (>= 5.1.1)) ppx_expect - (mdx (and :with-test (= 2.4.1))) + (mdx (and :with-test (= 2.5.0))) (yocaml (= :version)) (jingoo (>= 1.5.0)))) @@ -125,7 +125,7 @@ (depends (ocaml (>= 5.1.1)) ppx_expect - (mdx (and :with-test (= 2.4.1))) + (mdx (and :with-test (= 2.5.0))) (yocaml (= :version)) (mustache (= 3.3.0)))) @@ -140,7 +140,7 @@ (qcheck :with-test) (qcheck-alcotest :with-test) ppx_expect - (mdx (and :with-test (= 2.4.1))))) + (mdx (and :with-test (= 2.5.0))))) (package (name yocaml_git) @@ -148,7 +148,7 @@ (depends (ocaml (>= 5.1.1)) ppx_expect - (mdx (and :with-test (= 2.4.1))) + (mdx (and :with-test (= 2.5.0))) (lwt (>= 5.7.0)) (mimic (>= 0.0.9)) (cstruct (>= 6.2.0)) diff --git a/yocaml.opam b/yocaml.opam index ef67971..37db8b4 100644 --- a/yocaml.opam +++ b/yocaml.opam @@ -10,7 +10,7 @@ homepage: "https://github.com/xhtmlboi/yocaml" bug-reports: "https://github.com/xhtmlboi/yocaml/issues" depends: [ "dune" {>= "3.14"} - "ocaml" {>= "5.1.1" & < "5.3"} + "ocaml" {>= "5.1.1"} "odoc" {with-doc} "sherlodoc" {with-doc} "fmt" {with-test} @@ -18,7 +18,7 @@ depends: [ "qcheck" {with-test} "qcheck-alcotest" {with-test} "ppx_expect" - "mdx" {with-test & = "2.4.1"} + "mdx" {with-test & = "2.5.0"} "ocamlformat" {with-dev-setup} "ocp-indent" {with-dev-setup} "merlin" {with-dev-setup} diff --git a/yocaml_cmarkit.opam b/yocaml_cmarkit.opam index 28d6c33..b959ba6 100644 --- a/yocaml_cmarkit.opam +++ b/yocaml_cmarkit.opam @@ -12,7 +12,7 @@ depends: [ "dune" {>= "3.14"} "ocaml" {>= "5.1.1"} "ppx_expect" - "mdx" {with-test & = "2.4.1"} + "mdx" {with-test & = "2.5.0"} "yocaml" {= version} "cmarkit" "odoc" {with-doc} diff --git a/yocaml_eio.opam b/yocaml_eio.opam index 52feba8..dfb046a 100644 --- a/yocaml_eio.opam +++ b/yocaml_eio.opam @@ -11,12 +11,12 @@ depends: [ "dune" {>= "3.14"} "ocaml" {>= "5.1.1"} "ppx_expect" - "mdx" {with-test & = "2.4.1"} + "mdx" {with-test & = "2.5.0"} "yocaml" {= version} "yocaml_runtime" {= version} "eio" {= "1.1"} "eio_main" {= "1.1"} - "cohttp-eio" {= "6.0.0~beta2"} + "cohttp-eio" {>= "6.0.0~beta2"} "odoc" {with-doc} ] build: [ diff --git a/yocaml_git.opam b/yocaml_git.opam index b35e338..46c7d73 100644 --- a/yocaml_git.opam +++ b/yocaml_git.opam @@ -12,7 +12,7 @@ depends: [ "dune" {>= "3.14"} "ocaml" {>= "5.1.1"} "ppx_expect" - "mdx" {with-test & = "2.4.1"} + "mdx" {with-test & = "2.5.0"} "lwt" {>= "5.7.0"} "mimic" {>= "0.0.9"} "cstruct" {>= "6.2.0"} diff --git a/yocaml_jingoo.opam b/yocaml_jingoo.opam index c95acb3..705a544 100644 --- a/yocaml_jingoo.opam +++ b/yocaml_jingoo.opam @@ -11,7 +11,7 @@ depends: [ "dune" {>= "3.14"} "ocaml" {>= "5.1.1"} "ppx_expect" - "mdx" {with-test & = "2.4.1"} + "mdx" {with-test & = "2.5.0"} "yocaml" {= version} "jingoo" {>= "1.5.0"} "odoc" {with-doc} diff --git a/yocaml_mustache.opam b/yocaml_mustache.opam index 597e9a6..f7f7dfc 100644 --- a/yocaml_mustache.opam +++ b/yocaml_mustache.opam @@ -11,7 +11,7 @@ depends: [ "dune" {>= "3.14"} "ocaml" {>= "5.1.1"} "ppx_expect" - "mdx" {with-test & = "2.4.1"} + "mdx" {with-test & = "2.5.0"} "yocaml" {= version} "mustache" {= "3.3.0"} "odoc" {with-doc} diff --git a/yocaml_omd.opam b/yocaml_omd.opam index a6fce7c..3969b7f 100644 --- a/yocaml_omd.opam +++ b/yocaml_omd.opam @@ -12,7 +12,7 @@ depends: [ "dune" {>= "3.14"} "ocaml" {>= "5.1.1"} "ppx_expect" - "mdx" {with-test & = "2.4.1"} + "mdx" {with-test & = "2.5.0"} "yocaml" {= version} "omd" {>= "2.0.0~alpha4"} "odoc" {with-doc} diff --git a/yocaml_otoml.opam b/yocaml_otoml.opam index 7017dd5..bf52f0d 100644 --- a/yocaml_otoml.opam +++ b/yocaml_otoml.opam @@ -11,7 +11,7 @@ depends: [ "dune" {>= "3.14"} "ocaml" {>= "5.1.1"} "ppx_expect" - "mdx" {with-test & = "2.4.1"} + "mdx" {with-test & = "2.5.0"} "yocaml" {= version} "otoml" {>= "1.0.5"} "odoc" {with-doc} diff --git a/yocaml_runtime.opam b/yocaml_runtime.opam index 244ae5f..18d30e1 100644 --- a/yocaml_runtime.opam +++ b/yocaml_runtime.opam @@ -11,7 +11,7 @@ depends: [ "dune" {>= "3.14"} "ocaml" {>= "5.1.1"} "ppx_expect" - "mdx" {with-test & = "2.4.1"} + "mdx" {with-test & = "2.5.0"} "yocaml" {= version} "cohttp" {>= "5.3.11"} "magic-mime" {>= "1.3.1"} diff --git a/yocaml_syndication.opam b/yocaml_syndication.opam index f0218a2..daf7de4 100644 --- a/yocaml_syndication.opam +++ b/yocaml_syndication.opam @@ -16,7 +16,7 @@ depends: [ "qcheck" {with-test} "qcheck-alcotest" {with-test} "ppx_expect" - "mdx" {with-test & = "2.4.1"} + "mdx" {with-test & = "2.5.0"} "odoc" {with-doc} ] build: [ diff --git a/yocaml_unix.opam b/yocaml_unix.opam index dfa4f1a..b9799e0 100644 --- a/yocaml_unix.opam +++ b/yocaml_unix.opam @@ -11,7 +11,7 @@ depends: [ "dune" {>= "3.14"} "ocaml" {>= "5.1.1"} "ppx_expect" - "mdx" {with-test & = "2.4.1"} + "mdx" {with-test & = "2.5.0"} "httpcats" {>= "0.0.1"} "yocaml" {= version} "yocaml_runtime" {= version} diff --git a/yocaml_yaml.opam b/yocaml_yaml.opam index 1f1bc3c..16661b8 100644 --- a/yocaml_yaml.opam +++ b/yocaml_yaml.opam @@ -11,7 +11,7 @@ depends: [ "dune" {>= "3.14"} "ocaml" {>= "5.1.1"} "ppx_expect" - "mdx" {with-test & = "2.4.1"} + "mdx" {with-test & = "2.5.0"} "yocaml" {= version} "yaml" {>= "3.2.0"} "odoc" {with-doc}