Skip to content

Commit

Permalink
Merge pull request #305 from hannesm/no-stdcompat-require-4.13
Browse files Browse the repository at this point in the history
Remove stdcompat dependency (fixes #304), require OCaml 4.13
  • Loading branch information
samoht authored Jul 23, 2023
2 parents 545ab35 + 9025b81 commit fa16caa
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 13 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions omd.opam
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/dune
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(library
(name omd)
(public_name omd)
(libraries uutf uucp uunf stdcompat))
(libraries uutf uucp uunf))

(rule
(with-stdout-to
Expand Down
1 change: 0 additions & 1 deletion src/parser.ml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
open Ast.Impl
open Stdcompat

type 'attr link_def =
{ label : string
Expand Down
2 changes: 0 additions & 2 deletions src/strSlice.ml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
open Stdcompat

type t =
{ base : string
; off : int
Expand Down
1 change: 0 additions & 1 deletion src/toc.ml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
open Ast.Util
open Stdcompat

let rec remove_links inline =
match inline with
Expand Down

0 comments on commit fa16caa

Please sign in to comment.