From 88c4412e0b6711270a8cf4bfb9d1739a32abed6d Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Fri, 24 Mar 2023 11:30:24 +0100 Subject: [PATCH 1/3] Remove stdcompat dependency (fixes #304), require OCaml 4.13 --- dune-project | 3 +-- omd.opam | 3 +-- src/dune | 2 +- src/parser.ml | 1 - src/strSlice.ml | 2 -- src/toc.ml | 1 - 6 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dune-project b/dune-project index e4dec6f1..b038bbed 100644 --- a/dune-project +++ b/dune-project @@ -25,8 +25,7 @@ extension mechanism, and some other features. Note that the opam package installs both the OMD library and the command line tool `omd`.") (tags (org:ocamllabs org:mirage)) (depends - (ocaml (>= 4.08)) - stdcompat + (ocaml (>= 4.13)) uutf uucp uunf diff --git a/omd.opam b/omd.opam index b6dd14a7..f8d94e7a 100644 --- a/omd.opam +++ b/omd.opam @@ -22,8 +22,7 @@ homepage: "https://github.com/ocaml/omd" bug-reports: "https://github.com/ocaml/omd/issues" depends: [ "dune" {>= "2.7"} - "ocaml" {>= "4.08"} - "stdcompat" + "ocaml" {>= "4.13"} "uutf" "uucp" "uunf" diff --git a/src/dune b/src/dune index 47c78257..45ccf646 100644 --- a/src/dune +++ b/src/dune @@ -1,7 +1,7 @@ (library (name omd) (public_name omd) - (libraries uutf uucp uunf stdcompat)) + (libraries uutf uucp uunf)) (rule (with-stdout-to diff --git a/src/parser.ml b/src/parser.ml index 5fbf669a..0723c7a7 100644 --- a/src/parser.ml +++ b/src/parser.ml @@ -1,5 +1,4 @@ open Ast.Impl -open Stdcompat type 'attr link_def = { label : string diff --git a/src/strSlice.ml b/src/strSlice.ml index 01a9e79a..2a21682a 100644 --- a/src/strSlice.ml +++ b/src/strSlice.ml @@ -1,5 +1,3 @@ -open Stdcompat - type t = { base : string ; off : int diff --git a/src/toc.ml b/src/toc.ml index f9627623..3aac8446 100644 --- a/src/toc.ml +++ b/src/toc.ml @@ -1,5 +1,4 @@ open Ast.Util -open Stdcompat let rec remove_links inline = match inline with From 9bf2c620649da624c8a5ef7a7c06ae8a80246e01 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Fri, 24 Mar 2023 12:13:29 +0100 Subject: [PATCH 2/3] CI: use 4.13 and 4.14 --- .github/workflows/workflow.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index aea69c5a..27024504 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -17,9 +17,7 @@ jobs: - windows-latest ocaml-compiler: # Decision on version matrix informed by https://discuss.ocaml.org/t/which-ocaml-compiler-versions-should-we-run-against-in-ci/7933/2 - # But has gradually inched up due to signs of bitrot on earlier versions - # such as https://github.com/thierry-martinez/stdcompat/issues/26 - - 4.08.0 + - 4.13.x - 4.14.x include: - ocaml-compiler: 5.0.x From 9025b8180445ce792e9bcb5119cac391f830579d Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Fri, 24 Mar 2023 12:15:20 +0100 Subject: [PATCH 3/3] README: update minimum OCaml version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8c7c2a28..b46435ed 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ $ make test Dependencies ------------ -The minimum version of OCaml required is 4.08. +The minimum version of OCaml required is 4.13. Dependencies are tracked in the [dune-project](./dune-project) and can be installed by running: