Merge pull request #1844 from voodoos/4171-501

Prepare release 4.17.1-501
ocaml · Sep 27, 2024 · 650a786 · 650a786
2 parents 754b0ec + e25d09a
commit 650a786
Show file tree

Hide file tree

Showing 7 changed files with 580 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,6 @@
-merlin 4.17
-===========
-Thu Sep 26 18:48:42 CEST 2024
+merlin 4.17.1
+=============
+Fri Sep 27 12:02:42 CEST 2024
 
   + merlin binary
     - A new `WRAPPING_PREFIX` configuration directive that can be used to tell Merlin

diff --git a/dot-merlin-reader.opam b/dot-merlin-reader.opam
@@ -11,9 +11,9 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "ocaml" {>= "5.1" & < "5.2" }
+  "ocaml" {>= "4.14"}
   "dune" {>= "2.9.0"}
-  "merlin-lib" {>= "4.9"}
+  "merlin-lib" {>= "4.17"}
   "ocamlfind" {>= "1.6.0"}
 ]
 description:

diff --git a/merlin.opam b/merlin.opam
@@ -14,7 +14,7 @@ depends: [
   "ocaml" {>= "5.1" & < "5.2"}
   "dune" {>= "2.9.0"}
   "merlin-lib" {= version}
-  "dot-merlin-reader" {>= "4.9"}
+  "dot-merlin-reader" {>= "4.17"}
   "yojson" {>= "2.0.0"}
   "conf-jq" {with-test}
   "ppxlib" {with-test}

diff --git a/src/sherlodoc/.ocamlformat-ignore b/src/sherlodoc/.ocamlformat-ignore
@@ -0,0 +1,2 @@
+type_parser.ml
+type_parser.mli
diff --git a/src/sherlodoc/dune b/src/sherlodoc/dune
@@ -4,6 +4,8 @@
 
 (menhir
  (modules type_parser)
- (flags --explain))
+ (enabled_if (<> %{profile} "release"))
+ (mode promote)
+ (flags :standard --explain))
 
 (ocamllex type_lexer)