From 4b48e45ff9927159b3c60ff88322b1e7f0c59d80 Mon Sep 17 00:00:00 2001
From: Ulugbek Abdullaev <ulugbekna@gmail.com>
Date: Sat, 7 Jan 2023 01:41:41 +0500
Subject: [PATCH] feature: add support for OCaml 5

---
 .github/workflows/build-and-test.yml          | 2 +-
 Makefile                                      | 2 +-
 dune-project                                  | 2 +-
 ocaml-lsp-server.opam                         | 2 +-
 ocaml-lsp-server/vendor/merlin                | 2 +-
 submodules/lev/.github/workflows/workflow.yml | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 977a32baa..d04d5447e 100644
--- 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
index 6a29a7d00..f48e90639 100644
--- 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
index 8420d9c41..4c36f7dab 100644
--- 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
index 8ef8542f2..cbca704d0 100644
--- 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
index ee0c8188b..8069a2c5b 160000
--- a/ocaml-lsp-server/vendor/merlin
+++ b/ocaml-lsp-server/vendor/merlin
@@ -1 +1 @@
-Subproject commit ee0c8188bd4cbb8e538c38bffbe55c276f5d90d0
+Subproject commit 8069a2c5b91c7bbe3828da7ad026a61efe08a19c
diff --git a/submodules/lev/.github/workflows/workflow.yml b/submodules/lev/.github/workflows/workflow.yml
index c56b6fac9..df0caf7e4 100644
--- 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 }}