Prepare release 1.23.0 (#1539)

voodoos · web-flow · commit 4483b5b9cb3c · 2025-06-24T16:01:53.000+02:00
* Prepare for release 1.23.0

* Bump minimal merlin-lib  version
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,4 @@
-# unreleased
+# 1.23.0
 
 ## Features
 
diff --git a/dune-project b/dune-project
@@ -70,7 +70,7 @@ possible and does not make any assumptions about IO.
   (csexp (>= 1.5))
   (ocamlformat-rpc-lib (>= 0.21.0))
   (odoc :with-doc)
-  (merlin-lib (and (>= 5.4) (< 6.0)))
+  (merlin-lib (and (>= 5.5) (< 6.0)))
   (ppx_yojson_conv :with-dev-setup)))
 
 (package
diff --git a/ocaml-lsp-server.opam b/ocaml-lsp-server.opam
@@ -45,7 +45,7 @@ depends: [
   "csexp" {>= "1.5"}
   "ocamlformat-rpc-lib" {>= "0.21.0"}
   "odoc" {with-doc}
-  "merlin-lib" {>= "5.4" & < "6.0"}
+  "merlin-lib" {>= "5.5" & < "6.0"}
   "ppx_yojson_conv" {with-dev-setup}
 ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ depends: [`
`45`	`45`	`"csexp" {>= "1.5"}`
`46`	`46`	`"ocamlformat-rpc-lib" {>= "0.21.0"}`
`47`	`47`	`"odoc" {with-doc}`
`48`		`- "merlin-lib" {>= "5.4" & < "6.0"}`
	`48`	`+ "merlin-lib" {>= "5.5" & < "6.0"}`
`49`	`49`	`"ppx_yojson_conv" {with-dev-setup}`
`50`	`50`	`]`
`51`	`51`	`dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"`