Make sure merlin is only in ppx

reasonml · Sep 13, 2023 · 47663d0 · 47663d0
1 parent 1fe71b7
commit 47663d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/dune-project b/dune-project
@@ -41,10 +41,6 @@
   (reason
    (and (>= 3.6.0) (< 3.10.0)))
   (ocaml-lsp-server :with-test)
-  (merlin
-   (and
-    (= 4.10-414)
-    :with-test))
   (opam-check-npm-deps
    (and
     (= 1.0.0)
@@ -65,7 +61,10 @@
    (and (>= 3.6.0) (< 3.10.0)))
   (ppxlib
    (>= 0.28.0))
-  (merlin :with-test)
+  (merlin
+   (and
+    (= 4.10-414)
+    :with-test))
   (ocamlformat
    (and
     (= 0.24.0)

diff --git a/reason-react-ppx.opam b/reason-react-ppx.opam
@@ -18,7 +18,7 @@ depends: [
   "ocaml" {>= "4.13.0"}
   "reason" {>= "3.6.0" & < "3.10.0"}
   "ppxlib" {>= "0.28.0"}
-  "merlin" {with-test}
+  "merlin" {= "4.10-414" & with-test}
   "ocamlformat" {= "0.24.0" & with-dev-setup}
   "odoc" {with-doc}
 ]

diff --git a/reason-react.opam b/reason-react.opam
@@ -23,7 +23,6 @@ depends: [
   "reason-react-ppx" {= version}
   "reason" {>= "3.6.0" & < "3.10.0"}
   "ocaml-lsp-server" {with-test}
-  "merlin" {= "4.10-414" & with-test}
   "opam-check-npm-deps" {= "1.0.0" & with-dev-setup}
   "ocamlformat" {= "0.24.0" & with-dev-setup}
   "odoc" {with-doc}