Prepare for release 4.6-414 (#1498)

ocaml · Jun 30, 2022 · be753d9 · be753d9
2 parents 2e00671 + 05cfe60
commit be753d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,11 +1,13 @@
-unreleased
+merlin 4.6
 ==========
+Thu Jun 30 14:51:42 CEST 2022
 
   + merlin binary
     - make most library public and split merlin in two packages: the
       `merlin-lib` package that exposes merlin's internals and the `merlin`
       package with the frontend. (#1448, #1455, #1457, #1497, @rgrinberg,
       @tmattio, @kit-ty-kate)
+    - Type printing: use best_module_path for paths from Mty_alias (#1470)
     - Attempt at finding the 'real' capitalization of files on windows (#1462 by
       @mlasson)
     - Use newer `Seq`-based API of Yojson 2.0, avoiding the need for the
@@ -14,6 +16,8 @@ unreleased
     - Fix type deduplication in `type-enclosing` results (#1483, fixes #1477)
     - Only weakly reduce the shapes to speed up the new Merlin locate
       implementation. (#1488)
+    - Ignore unknown configuration tags from dune configuration provider but not
+      from dot-merlin-reader (#1486)
     - typing recovery: recover at the granularity of `core_type` (#1484)
   + editor modes
     - add method imenu items for emacs (#1481, @mndrix)

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" {>= "4.08" }
+  "ocaml" {>= "4.08" & < "5.0.0"}
   "dune" {>= "2.9.0"}
-  "merlin-lib" {= version}
+  "merlin-lib" {>= "4.6"}
   "ocamlfind" {>= "1.6.0"}
 ]
 description:

diff --git a/merlin.opam b/merlin.opam
@@ -14,11 +14,12 @@ depends: [
   "ocaml" {>= "4.14" & < "4.15"}
   "dune" {>= "2.9.0"}
   "merlin-lib" {= version}
-  "dot-merlin-reader" {= version}
+  "dot-merlin-reader" {>= "4.6"}
   "yojson" {>= "2.0.0"}
   "conf-jq" {with-test}
 ]
 conflicts: [
+  "seq" {!= "base"}
   "base-effects"
 ]
 synopsis: