Prepare release 1.23.1 (#1558)

* Add changelog entry for #1534

* Prepare changelog for 1.23.0

* Update Merlin dep

Author: voodoos

CHANGES.md

@@ -1,9 +1,10 @@
-# unreleased
+# 1.23.1
 
 ## Fixes
 
 - Fix hover on method calls not showing the type. (#1553, fixes #1552)
 - Fix error on opening `.mll` files (#1557)
+- Ensure compatibility with both yojson 2.0 and 3.0. (#1534)
 
 # 1.23.0
 
@@ -21,7 +22,6 @@
 - Fix `inlay-hint` for function parameters (#1515)
 - More precise diagnostics in the event of a failed identifier search (`Definition_query`) (#1518)
 - Remove `ocamlformat` application after `destruct` (that remove some useful parenthesis) (#1519)
-- Make compatible with Yojson 3.x by removing `Tuple` and `Variant` (#1534)
 
 # 1.22.0
 

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.5) (< 6.0)))
+  (merlin-lib (and (>= 5.5) (< 5.7)))
   (ppx_yojson_conv :with-dev-setup)))
 
 (package

ocaml-lsp-server.opam

@@ -45,7 +45,7 @@ depends: [
   "csexp" {>= "1.5"}
   "ocamlformat-rpc-lib" {>= "0.21.0"}
   "odoc" {with-doc}
-  "merlin-lib" {>= "5.5" & < "6.0"}
+  "merlin-lib" {>= "5.5" & < "5.7"}
   "ppx_yojson_conv" {with-dev-setup}
 ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"