From a7e8e6ec378a5496c6b913ec7304dc223aa182f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= Date: Fri, 17 May 2024 19:58:37 +0200 Subject: [PATCH] Prepare release 5.0 --- CHANGES.md | 5 +++-- dot-merlin-reader.opam | 2 +- merlin.opam | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index be404b747..4feafd16c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,6 @@ -merlin NEXT_VERSION -================== +merlin 5.0 +========== +Fri May 17 19:59:42 CET 2024 + merlin binary - Support for OCaml 5.2 (#1757) diff --git a/dot-merlin-reader.opam b/dot-merlin-reader.opam index 67bfc002e..0867c078a 100644 --- a/dot-merlin-reader.opam +++ b/dot-merlin-reader.opam @@ -13,7 +13,7 @@ build: [ depends: [ "ocaml" {>= "5.2" } "dune" {>= "2.9.0"} - "merlin-lib" {>= "4.9"} + "merlin-lib" {>= "5.0"} "ocamlfind" {>= "1.6.0"} ] description: diff --git a/merlin.opam b/merlin.opam index f118ce4ef..ea6974250 100644 --- a/merlin.opam +++ b/merlin.opam @@ -14,7 +14,7 @@ depends: [ "ocaml" {>= "5.2" & < "5.3"} "dune" {>= "2.9.0"} "merlin-lib" {= version} - "dot-merlin-reader" {>= "4.9"} + "dot-merlin-reader" {>= "5.0"} "yojson" {>= "2.0.0"} "conf-jq" {with-test} "ppxlib" {with-test}