From 09d9ccce046fc130fbd43fdf88ee7e37bf3077f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sacha-=C3=89lie=20Ayoun?= <sachaayoun@gmail.com>
Date: Thu, 3 Apr 2025 16:09:24 +0100
Subject: [PATCH] test because opammmm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sacha-Élie Ayoun <sachaayoun@gmail.com>
---
 dune-project              | 4 +++-
 linol-eio.opam            | 4 ++--
 linol.opam                | 4 ++--
 src/dune                  | 4 ++--
 src/eio/dune              | 4 ++--
 src/linol-lsp/dune        | 4 ----
 src/linol-lsp/import.ml   | 3 ---
 src/linol-lsp/jsonrpc0.ml | 1 -
 src/linol-lsp/lsp0.ml     | 1 -
 src/linol.ml              | 1 +
 src/linol_lsp.ml          | 2 ++
 src/lwt/dune              | 4 ++--
 vendor/ocaml-lsp          | 2 +-
 13 files changed, 17 insertions(+), 21 deletions(-)
 delete mode 100644 src/linol-lsp/dune
 delete mode 100644 src/linol-lsp/import.ml
 delete mode 100644 src/linol-lsp/jsonrpc0.ml
 delete mode 100644 src/linol-lsp/lsp0.ml
 create mode 100644 src/linol_lsp.ml

diff --git a/dune-project b/dune-project
index 813936c6..82e6e252 100644
--- a/dune-project
+++ b/dune-project
@@ -1,4 +1,6 @@
-(lang dune 2.0)
+(lang dune 3.0)
+
+(using cinaps 1.0)
 
 ;(implicit_transitive_deps false)
 
diff --git a/linol-eio.opam b/linol-eio.opam
index 22898f62..81c5f9c7 100644
--- a/linol-eio.opam
+++ b/linol-eio.opam
@@ -8,7 +8,7 @@ license: "MIT"
 homepage: "https://github.com/c-cube/linol"
 bug-reports: "https://github.com/c-cube/linol/issues"
 depends: [
-  "dune" {>= "2.0"}
+  "dune" {>= "3.0"}
   "yojson" {>= "1.6"}
   "linol" {= version}
   "base-unix"
@@ -17,7 +17,7 @@ depends: [
   "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   [
     "dune"
     "build"
diff --git a/linol.opam b/linol.opam
index 5579adc1..29e8142d 100644
--- a/linol.opam
+++ b/linol.opam
@@ -8,7 +8,7 @@ license: "MIT"
 homepage: "https://github.com/c-cube/linol"
 bug-reports: "https://github.com/c-cube/linol/issues"
 depends: [
-  "dune" {>= "2.0"}
+  "dune" {>= "3.0"}
   "yojson" {>= "1.6"}
   "logs"
   "trace" {>= "0.4"}
@@ -18,7 +18,7 @@ depends: [
   "ppx_yojson_conv_lib" {>= "v0.14"}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   [
     "dune"
     "build"
diff --git a/src/dune b/src/dune
index b888bf16..8e81d40c 100644
--- a/src/dune
+++ b/src/dune
@@ -2,5 +2,5 @@
  (name linol)
  (public_name linol)
  (private_modules log)
- (flags :standard -warn-error -a+8 -open Linol_lsp.Import)
- (libraries yojson linol_lsp logs threads trace.core))
+ (flags :standard -warn-error -a+8)
+ (libraries yojson logs threads trace.core lsp jsonrpc))
diff --git a/src/eio/dune b/src/eio/dune
index 8b872012..0552d80f 100644
--- a/src/eio/dune
+++ b/src/eio/dune
@@ -1,5 +1,5 @@
 (library
  (name linol_eio)
  (public_name linol-eio)
- (libraries eio eio.unix linol linol.lsp)
- (flags :standard -warn-error -a -open Linol_lsp.Import))
+ (libraries eio eio.unix linol.lso linol.jsonrpc)
+ (flags :standard -warn-error -a))
diff --git a/src/linol-lsp/dune b/src/linol-lsp/dune
deleted file mode 100644
index ac1782d6..00000000
--- a/src/linol-lsp/dune
+++ /dev/null
@@ -1,4 +0,0 @@
-(library
- (name linol_lsp)
- (public_name linol.lsp)
- (libraries lsp jsonrpc))
diff --git a/src/linol-lsp/import.ml b/src/linol-lsp/import.ml
deleted file mode 100644
index f39d45c7..00000000
--- a/src/linol-lsp/import.ml
+++ /dev/null
@@ -1,3 +0,0 @@
-module Lsp = Lsp0
-
-module Jsonrpc = Jsonrpc0
\ No newline at end of file
diff --git a/src/linol-lsp/jsonrpc0.ml b/src/linol-lsp/jsonrpc0.ml
deleted file mode 100644
index 011837a4..00000000
--- a/src/linol-lsp/jsonrpc0.ml
+++ /dev/null
@@ -1 +0,0 @@
-include Jsonrpc
\ No newline at end of file
diff --git a/src/linol-lsp/lsp0.ml b/src/linol-lsp/lsp0.ml
deleted file mode 100644
index 8ef3e58e..00000000
--- a/src/linol-lsp/lsp0.ml
+++ /dev/null
@@ -1 +0,0 @@
-include Lsp
\ No newline at end of file
diff --git a/src/linol.ml b/src/linol.ml
index 334942e2..7b454b72 100644
--- a/src/linol.ml
+++ b/src/linol.ml
@@ -3,6 +3,7 @@
     Abstraction over The "Lsp" library, to make it easier to develop
     LSP servers in OCaml (but not necessarily {b for} OCaml). *)
 
+    
 module type IO = Sigs.IO
 
 module Jsonrpc2 = Jsonrpc2
diff --git a/src/linol_lsp.ml b/src/linol_lsp.ml
new file mode 100644
index 00000000..68ffa06e
--- /dev/null
+++ b/src/linol_lsp.ml
@@ -0,0 +1,2 @@
+module Lsp0 = Lsp
+module Jsonrpc0 = Jsonrpc
\ No newline at end of file
diff --git a/src/lwt/dune b/src/lwt/dune
index 39cc60f2..f9f58db1 100644
--- a/src/lwt/dune
+++ b/src/lwt/dune
@@ -1,5 +1,5 @@
 (library
  (name linol_lwt)
  (public_name linol-lwt)
- (libraries yojson lwt lwt.unix linol linol.lsp)
- (flags :standard -warn-error -a -open Linol_lsp.Import))
+ (libraries yojson lwt lwt.unix linol linol.lsp linol.jsonrpc)
+ (flags :standard -warn-error -a))
diff --git a/vendor/ocaml-lsp b/vendor/ocaml-lsp
index aae69863..c9b55bcb 160000
--- a/vendor/ocaml-lsp
+++ b/vendor/ocaml-lsp
@@ -1 +1 @@
-Subproject commit aae6986391a8519de3da6a7a341f2bd3376e0d2f
+Subproject commit c9b55bcbb5471c6f1954bd82a8597b489e28cad7