From ca4546f1b54f43ec826f9c2d03ecbb98b31c8515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sacha-=C3=89lie=20Ayoun?= <sachaayoun@gmail.com>
Date: Thu, 3 Apr 2025 14:27:34 +0100
Subject: [PATCH] lmao that was it?
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sacha-Élie Ayoun <sachaayoun@gmail.com>
---
 .gitmodules      |  3 +++
 dune             |  1 +
 dune-project     | 31 ++++++-------------------------
 linol-eio.opam   |  2 --
 linol-lwt.opam   |  2 --
 linol.opam       |  4 ++--
 vendor/ocaml-lsp |  1 +
 7 files changed, 13 insertions(+), 31 deletions(-)
 create mode 100644 .gitmodules
 create mode 100644 dune
 create mode 160000 vendor/ocaml-lsp

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..d7cd049e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vendor/ocaml-lsp"]
+	path = vendor/ocaml-lsp
+	url = https://github.com/ocaml/ocaml-lsp.git
diff --git a/dune b/dune
new file mode 100644
index 00000000..94865487
--- /dev/null
+++ b/dune
@@ -0,0 +1 @@
+(vendored_dirs vendor)
diff --git a/dune-project b/dune-project
index b987704a..813936c6 100644
--- a/dune-project
+++ b/dune-project
@@ -28,17 +28,14 @@
   "logs"
   ("trace"
    (>= "0.4"))
-  ("lsp"
-   (and
-    (>= "1.19")
-    (< "1.23")))
-  ("jsonrpc"
-   (and
-    (>= "1.19")
-    (< "1.23")))
   ("ocaml"
    (>= "4.14"))
-  ("odoc" :with-doc)))
+  ("odoc" :with-doc)
+  ; The following dependencies are needed for lsp, which we vendor
+  (uutf
+   (>= 1.0.2))
+  (ppx_yojson_conv_lib
+   (>= "v0.14"))))
 
 (package
  (name linol-lwt)
@@ -53,14 +50,6 @@
    (and
     (>= "5.1")
     (< "6.0")))
-  ("lsp"
-   (and
-    (>= "1.19")
-    (< "1.23")))
-  ("jsonrpc"
-   (and
-    (>= "1.19")
-    (< "1.23")))
   ("odoc" :with-doc)))
 
 (package
@@ -78,12 +67,4 @@
     (>= "1.0")
     (< "2.0")))
   (eio_main :with-test)
-  ("lsp"
-   (and
-    (>= "1.19")
-    (< "1.23")))
-  ("jsonrpc"
-   (and
-    (>= "1.19")
-    (< "1.23")))
   ("odoc" :with-doc)))
diff --git a/linol-eio.opam b/linol-eio.opam
index 0b9f10e6..22898f62 100644
--- a/linol-eio.opam
+++ b/linol-eio.opam
@@ -14,8 +14,6 @@ depends: [
   "base-unix"
   "eio" {>= "1.0" & < "2.0"}
   "eio_main" {with-test}
-  "lsp" {>= "1.19" & < "1.23"}
-  "jsonrpc" {>= "1.19" & < "1.23"}
   "odoc" {with-doc}
 ]
 build: [
diff --git a/linol-lwt.opam b/linol-lwt.opam
index dea3ef32..cf2cceab 100644
--- a/linol-lwt.opam
+++ b/linol-lwt.opam
@@ -13,8 +13,6 @@ depends: [
   "linol" {= version}
   "base-unix"
   "lwt" {>= "5.1" & < "6.0"}
-  "lsp" {>= "1.19" & < "1.23"}
-  "jsonrpc" {>= "1.19" & < "1.23"}
   "odoc" {with-doc}
 ]
 build: [
diff --git a/linol.opam b/linol.opam
index 3b624558..5579adc1 100644
--- a/linol.opam
+++ b/linol.opam
@@ -12,10 +12,10 @@ depends: [
   "yojson" {>= "1.6"}
   "logs"
   "trace" {>= "0.4"}
-  "lsp" {>= "1.19" & < "1.23"}
-  "jsonrpc" {>= "1.19" & < "1.23"}
   "ocaml" {>= "4.14"}
   "odoc" {with-doc}
+  "uutf" {>= "1.0.2"}
+  "ppx_yojson_conv_lib" {>= "v0.14"}
 ]
 build: [
   ["dune" "subst"] {pinned}
diff --git a/vendor/ocaml-lsp b/vendor/ocaml-lsp
new file mode 160000
index 00000000..aae69863
--- /dev/null
+++ b/vendor/ocaml-lsp
@@ -0,0 +1 @@
+Subproject commit aae6986391a8519de3da6a7a341f2bd3376e0d2f