From c4c1edede12de774c8e60c309ae987e3b2de00fa Mon Sep 17 00:00:00 2001
From: Pedro Castro <aspeddro@gmail.com>
Date: Sat, 30 May 2026 15:17:40 -0300
Subject: [PATCH 1/2] Update lsp and yojson dependencies

Relax LSP-related dependencies to allow 1.23.0+ and update yojson pins
to 3.0.0 across dune-project and opam package files.

Also trims trailing whitespace in the CI workflow.
---
 analysis.opam |  4 ++--
 dune-project  | 12 ++++++------
 rescript.opam |  4 ++--
 tools.opam    |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/analysis.opam b/analysis.opam
index 209189df6e..db0433c0aa 100644
--- a/analysis.opam
+++ b/analysis.opam
@@ -11,8 +11,8 @@ depends: [
   "ocaml" {>= "5.0.0"}
   "cppo" {= "1.8.0"}
   "odoc" {with-doc}
-  "lsp" {= "1.22.0"}
-  "yojson" {= "2.2.2"}
+  "lsp" {>= "1.23.0"}
+  "yojson" {= "3.0.0"}
 ]
 build: [
   ["dune" "subst"] {dev}
diff --git a/dune-project b/dune-project
index 7ea218fc1b..6647a3496f 100644
--- a/dune-project
+++ b/dune-project
@@ -28,12 +28,12 @@
   (ocamlformat
    (and :with-test (= 0.27.0)))
   (yojson
-   (and :with-test (= 2.2.2)))
+   (and :with-test (= 3.0.0)))
   (ounit2
    (and :with-test (= 2.2.7)))
   (odoc :with-doc)
   (ocaml-lsp-server
-   (and :with-dev-setup (= 1.22.0)))
+   (and :with-dev-setup (>= 1.23.0)))
   (bisect_ppx
    (and :with-dev-setup (>= 2.8.0)))
   (js_of_ocaml
@@ -44,7 +44,7 @@
   (wasm_of_ocaml-compiler
    (and
     (<> :os "win32")
-    :with-test
+    :with-test`
     (= 6.0.1)))))
 
 (package
@@ -57,9 +57,9 @@
    (= 1.8.0))
   (odoc :with-doc)
   (lsp
-   (= 1.22.0))
+   (>= 1.23.0))
   (yojson
-    (= 2.2.2))))
+    (= 3.0.0))))
 
 (package
  (name tools)
@@ -73,5 +73,5 @@
    (= 1.8.0))
   analysis
   (yojson
-    (= 2.2.2))
+    (= 3.0.0))
   (odoc :with-doc)))
diff --git a/rescript.opam b/rescript.opam
index 4f2a69ced7..61b36bafb8 100644
--- a/rescript.opam
+++ b/rescript.opam
@@ -12,10 +12,10 @@ depends: [
   "cppo" {= "1.8.0"}
   "flow_parser" {= "0.267.0"}
   "ocamlformat" {with-test & = "0.27.0"}
-  "yojson" {with-test & = "2.2.2"}
+  "yojson" {with-test & = "3.0.0"}
   "ounit2" {with-test & = "2.2.7"}
   "odoc" {with-doc}
-  "ocaml-lsp-server" {with-dev-setup & = "1.22.0"}
+  "ocaml-lsp-server" {with-dev-setup & >= "1.23.0"}
   "bisect_ppx" {with-dev-setup & >= "2.8.0"}
   "js_of_ocaml" {os != "win32" & with-test & = "6.0.1"}
   "wasm_of_ocaml-compiler" {os != "win32" & with-test & = "6.0.1"}
diff --git a/tools.opam b/tools.opam
index e70c57f28f..202ba62686 100644
--- a/tools.opam
+++ b/tools.opam
@@ -12,7 +12,7 @@ depends: [
   "cmarkit" {>= "0.3.0"}
   "cppo" {= "1.8.0"}
   "analysis"
-  "yojson" {= "2.2.2"}
+  "yojson" {= "3.0.0"}
   "odoc" {with-doc}
 ]
 build: [

From 89ba0b34255e5d7d5afee6890988277f7eb66d06 Mon Sep 17 00:00:00 2001
From: Pedro Castro <aspeddro@gmail.com>
Date: Sat, 30 May 2026 15:22:04 -0300
Subject: [PATCH 2/2] Update dune-project

---
 dune-project | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dune-project b/dune-project
index 6647a3496f..112c97df1b 100644
--- a/dune-project
+++ b/dune-project
@@ -44,7 +44,7 @@
   (wasm_of_ocaml-compiler
    (and
     (<> :os "win32")
-    :with-test`
+    :with-test
     (= 6.0.1)))))
 
 (package