From 9a94745ba9bd669fbe47da82ea642d1a59306e07 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 30 Jan 2025 14:10:45 +0000 Subject: [PATCH 1/5] Add support for lsp 1.22 --- dune-project | 12 ++++++------ linol-eio.opam | 4 ++-- linol-lwt.opam | 4 ++-- linol.opam | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dune-project b/dune-project index 6d71f642..86c44907 100644 --- a/dune-project +++ b/dune-project @@ -31,12 +31,12 @@ ("lsp" (and (>= "1.19") - (< "1.21"))) + (< "1.22"))) atomic ("jsonrpc" (and (>= "1.19") - (< "1.21"))) + (< "1.22"))) ("ocaml" (>= "4.14")) ("odoc" :with-doc))) @@ -57,11 +57,11 @@ ("lsp" (and (>= "1.19") - (< "1.21"))) + (< "1.22"))) ("jsonrpc" (and (>= "1.19") - (< "1.21"))) + (< "1.22"))) ("odoc" :with-doc))) (package @@ -82,9 +82,9 @@ ("lsp" (and (>= "1.19") - (< "1.21"))) + (< "1.22"))) ("jsonrpc" (and (>= "1.19") - (< "1.21"))) + (< "1.22"))) ("odoc" :with-doc))) diff --git a/linol-eio.opam b/linol-eio.opam index f61921b2..e2cd256b 100644 --- a/linol-eio.opam +++ b/linol-eio.opam @@ -14,8 +14,8 @@ depends: [ "base-unix" "eio" {>= "1.0" & < "2.0"} "eio_main" {with-test} - "lsp" {>= "1.19" & < "1.21"} - "jsonrpc" {>= "1.19" & < "1.21"} + "lsp" {>= "1.19" & < "1.22"} + "jsonrpc" {>= "1.19" & < "1.22"} "odoc" {with-doc} ] build: [ diff --git a/linol-lwt.opam b/linol-lwt.opam index 848230ea..60dbc2d6 100644 --- a/linol-lwt.opam +++ b/linol-lwt.opam @@ -13,8 +13,8 @@ depends: [ "linol" {= version} "base-unix" "lwt" {>= "5.1" & < "6.0"} - "lsp" {>= "1.19" & < "1.21"} - "jsonrpc" {>= "1.19" & < "1.21"} + "lsp" {>= "1.19" & < "1.22"} + "jsonrpc" {>= "1.19" & < "1.22"} "odoc" {with-doc} ] build: [ diff --git a/linol.opam b/linol.opam index 354f8d6c..a529203c 100644 --- a/linol.opam +++ b/linol.opam @@ -12,9 +12,9 @@ depends: [ "yojson" {>= "1.6"} "logs" "trace" {>= "0.4"} - "lsp" {>= "1.19" & < "1.21"} + "lsp" {>= "1.19" & < "1.22"} "atomic" - "jsonrpc" {>= "1.19" & < "1.21"} + "jsonrpc" {>= "1.19" & < "1.22"} "ocaml" {>= "4.14"} "odoc" {with-doc} ] From 87af2c521cae39a852c4d41b71b9d631bf1e8b96 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 30 Jan 2025 14:13:10 +0000 Subject: [PATCH 2/5] Update workflow --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index def9f758..6ee99513 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,6 +40,7 @@ jobs: lsp-version: - 1.19.0 - 1.20.1 + - 1.22.0 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@main From a45fa943fd14419d2f238dd0be69d20eb2f45a3f Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 30 Jan 2025 14:27:34 +0000 Subject: [PATCH 3/5] Fix constraints --- dune-project | 12 ++++++------ linol-eio.opam | 4 ++-- linol-lwt.opam | 4 ++-- linol.opam | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dune-project b/dune-project index 86c44907..3c8a04cc 100644 --- a/dune-project +++ b/dune-project @@ -31,12 +31,12 @@ ("lsp" (and (>= "1.19") - (< "1.22"))) + (<= "1.22"))) atomic ("jsonrpc" (and (>= "1.19") - (< "1.22"))) + (<= "1.22"))) ("ocaml" (>= "4.14")) ("odoc" :with-doc))) @@ -57,11 +57,11 @@ ("lsp" (and (>= "1.19") - (< "1.22"))) + (<= "1.22"))) ("jsonrpc" (and (>= "1.19") - (< "1.22"))) + (<= "1.22"))) ("odoc" :with-doc))) (package @@ -82,9 +82,9 @@ ("lsp" (and (>= "1.19") - (< "1.22"))) + (<= "1.22"))) ("jsonrpc" (and (>= "1.19") - (< "1.22"))) + (<= "1.22"))) ("odoc" :with-doc))) diff --git a/linol-eio.opam b/linol-eio.opam index e2cd256b..9b380ad3 100644 --- a/linol-eio.opam +++ b/linol-eio.opam @@ -14,8 +14,8 @@ depends: [ "base-unix" "eio" {>= "1.0" & < "2.0"} "eio_main" {with-test} - "lsp" {>= "1.19" & < "1.22"} - "jsonrpc" {>= "1.19" & < "1.22"} + "lsp" {>= "1.19" & <= "1.22"} + "jsonrpc" {>= "1.19" & <= "1.22"} "odoc" {with-doc} ] build: [ diff --git a/linol-lwt.opam b/linol-lwt.opam index 60dbc2d6..0f0faef3 100644 --- a/linol-lwt.opam +++ b/linol-lwt.opam @@ -13,8 +13,8 @@ depends: [ "linol" {= version} "base-unix" "lwt" {>= "5.1" & < "6.0"} - "lsp" {>= "1.19" & < "1.22"} - "jsonrpc" {>= "1.19" & < "1.22"} + "lsp" {>= "1.19" & <= "1.22"} + "jsonrpc" {>= "1.19" & <= "1.22"} "odoc" {with-doc} ] build: [ diff --git a/linol.opam b/linol.opam index a529203c..1c1af6db 100644 --- a/linol.opam +++ b/linol.opam @@ -12,9 +12,9 @@ depends: [ "yojson" {>= "1.6"} "logs" "trace" {>= "0.4"} - "lsp" {>= "1.19" & < "1.22"} + "lsp" {>= "1.19" & <= "1.22"} "atomic" - "jsonrpc" {>= "1.19" & < "1.22"} + "jsonrpc" {>= "1.19" & <= "1.22"} "ocaml" {>= "4.14"} "odoc" {with-doc} ] From 1ed72b1788ddf9192eaa03f09cddd74968ef0710 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 30 Jan 2025 14:29:49 +0000 Subject: [PATCH 4/5] Better constraints --- dune-project | 12 ++++++------ linol-eio.opam | 4 ++-- linol-lwt.opam | 4 ++-- linol.opam | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dune-project b/dune-project index 3c8a04cc..c20ae7f1 100644 --- a/dune-project +++ b/dune-project @@ -31,12 +31,12 @@ ("lsp" (and (>= "1.19") - (<= "1.22"))) + (< "1.23"))) atomic ("jsonrpc" (and (>= "1.19") - (<= "1.22"))) + (< "1.23"))) ("ocaml" (>= "4.14")) ("odoc" :with-doc))) @@ -57,11 +57,11 @@ ("lsp" (and (>= "1.19") - (<= "1.22"))) + (< "1.23"))) ("jsonrpc" (and (>= "1.19") - (<= "1.22"))) + (< "1.23"))) ("odoc" :with-doc))) (package @@ -82,9 +82,9 @@ ("lsp" (and (>= "1.19") - (<= "1.22"))) + (< "1.23"))) ("jsonrpc" (and (>= "1.19") - (<= "1.22"))) + (< "1.23"))) ("odoc" :with-doc))) diff --git a/linol-eio.opam b/linol-eio.opam index 9b380ad3..0b9f10e6 100644 --- a/linol-eio.opam +++ b/linol-eio.opam @@ -14,8 +14,8 @@ depends: [ "base-unix" "eio" {>= "1.0" & < "2.0"} "eio_main" {with-test} - "lsp" {>= "1.19" & <= "1.22"} - "jsonrpc" {>= "1.19" & <= "1.22"} + "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 0f0faef3..dea3ef32 100644 --- a/linol-lwt.opam +++ b/linol-lwt.opam @@ -13,8 +13,8 @@ depends: [ "linol" {= version} "base-unix" "lwt" {>= "5.1" & < "6.0"} - "lsp" {>= "1.19" & <= "1.22"} - "jsonrpc" {>= "1.19" & <= "1.22"} + "lsp" {>= "1.19" & < "1.23"} + "jsonrpc" {>= "1.19" & < "1.23"} "odoc" {with-doc} ] build: [ diff --git a/linol.opam b/linol.opam index 1c1af6db..6e5964ee 100644 --- a/linol.opam +++ b/linol.opam @@ -12,9 +12,9 @@ depends: [ "yojson" {>= "1.6"} "logs" "trace" {>= "0.4"} - "lsp" {>= "1.19" & <= "1.22"} + "lsp" {>= "1.19" & < "1.23"} "atomic" - "jsonrpc" {>= "1.19" & <= "1.22"} + "jsonrpc" {>= "1.19" & < "1.23"} "ocaml" {>= "4.14"} "odoc" {with-doc} ] From 7e64e3c84584682ce4e14e8ec504a31384bca427 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 30 Jan 2025 15:30:43 +0000 Subject: [PATCH 5/5] Trigger CI