feature: add support for OCaml 5

ocaml · Jan 18, 2023 · 4b48e45 · 4b48e45
1 parent 7e91492
commit 4b48e45
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -19,7 +19,7 @@ jobs:
           - ubuntu-latest
           - windows-latest
         ocaml-compiler:
-          - 4.14.x
+          - 5.0.x
 
     runs-on: ${{ matrix.os }}
 

diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ install-test-deps:
 
 .PHONY: dev
 dev: ## Setup a development environment
-	opam switch create --no-install . ocaml-base-compiler.4.14.0
+	opam switch create --no-install . ocaml-base-compiler.5.0.0
 	opam install -y dune-release merlin ocamlformat utop ocaml-lsp-server
 	opam install --locked --deps-only --with-doc -y .
 	$(MAKE) install-test-deps

diff --git a/dune-project b/dune-project
@@ -66,7 +66,7 @@ possible and does not make any assumptions about IO.
   (csexp (>= 1.5))
   (ocamlformat-rpc-lib (>= 0.21.0))
   (odoc :with-doc)
-  (ocaml (and (>= 4.14) (< 4.15)))))
+  (ocaml (and (>= 5.0) (< 5.1)))))
 
 (package
  (name jsonrpc)

diff --git a/ocaml-lsp-server.opam b/ocaml-lsp-server.opam
@@ -42,7 +42,7 @@ depends: [
   "csexp" {>= "1.5"}
   "ocamlformat-rpc-lib" {>= "0.21.0"}
   "odoc" {with-doc}
-  "ocaml" {>= "4.14" & < "4.15"}
+  "ocaml" {>= "5.0" & < "5.1"}
 ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [

diff --git a/ocaml-lsp-server/vendor/merlin b/ocaml-lsp-server/vendor/merlin
diff --git a/submodules/lev/.github/workflows/workflow.yml b/submodules/lev/.github/workflows/workflow.yml
@@ -15,7 +15,7 @@ jobs:
           - ubuntu-latest
           - windows-latest
         ocaml-compiler:
-          - 4.14.x
+          - 5.0.x
 
     runs-on: ${{ matrix.os }}