Merge pull request ocaml#27095 from vouillon/js_of_ocaml-bounds

Update Js_of_ocaml upper bounds in preparation to release 6.0.0
hannesm · Dec 13, 2024 · 4a89d78 · 4a89d78
2 parents 359dee6 + 06b26b3
commit 4a89d78
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/packages/async_js/async_js.v0.15.1/opam b/packages/async_js/async_js.v0.15.1/opam
@@ -15,7 +15,7 @@ depends: [
   "async_rpc_kernel" {>= "v0.15" & < "v0.16"}
   "ppx_jane"         {>= "v0.15" & < "v0.16"}
   "dune"             {>= "2.0.0"}
-  "js_of_ocaml"      {>= "3.9.0"}
+  "js_of_ocaml"      {>= "3.9.0" & < "6.0.0"}
   "js_of_ocaml-ppx"  {>= "3.9.0"}
   "uri"              {>= "3.0.0"}
   "uri-sexp"         {>= "3.0.0"}

diff --git a/packages/async_js/async_js.v0.16.0/opam b/packages/async_js/async_js.v0.16.0/opam
@@ -15,7 +15,7 @@ depends: [
   "async_rpc_kernel" {>= "v0.16" & < "v0.17"}
   "ppx_jane"         {>= "v0.16" & < "v0.17"}
   "dune"             {>= "2.0.0"}
-  "js_of_ocaml"      {>= "5.1.1"}
+  "js_of_ocaml"      {>= "5.1.1" & < "6.0.0"}
   "js_of_ocaml-ppx"  {>= "5.1.1"}
   "uri"              {>= "3.0.0"}
   "uri-sexp"         {>= "3.0.0"}

diff --git a/packages/ezjs_extension/ezjs_extension.0.1/opam b/packages/ezjs_extension/ezjs_extension.0.1/opam
@@ -10,6 +10,7 @@ depends: [
   "dune" {>= "2.0"}
   "ezjs_min" {>= "0.2"}
 ]
+conflicts: ["js_of_ocaml" {>= "6.0.0"}]
 depopts: ["lwt"]
 build: [
   ["dune" "subst"] {dev}
@@ -32,4 +33,4 @@ url {
     "md5=0d1dc7175a620eb50c07f2bbe0531533"
     "sha512=5742b4e64398533c95291fe7c9b5ed3e264214dee7522fec1a0074766afd40e633aa1ceea16cbc6923ab80d737a15c13b50b96d4ddf8fad8ec74c30816877c9a"
   ]
-}
+}
diff --git a/packages/jsoo_storage/jsoo_storage.1.0.1/opam b/packages/jsoo_storage/jsoo_storage.1.0.1/opam
@@ -8,7 +8,7 @@ bug-reports: "https://github.com/xvw/jsoo_storage/issues"
 build: [["dune" "build" "-p" name "-j" jobs]]
 depends: [
   "ocaml" {>= "4.02.0"}
-  "js_of_ocaml" {>= "2.8.4"}
+  "js_of_ocaml" {>= "2.8.4" & < "6.0.0"}
   "js_of_ocaml-ppx"
   "lwt"
   "dune" {>= "1.11"}

diff --git a/packages/virtual_dom/virtual_dom.v0.15.1/opam b/packages/virtual_dom/virtual_dom.v0.15.1/opam
@@ -16,7 +16,7 @@ depends: [
   "ppx_jane"        {>= "v0.15" & < "v0.16"}
   "dune"            {>= "2.0.0"}
   "gen_js_api"      {>= "1.0.8"}
-  "js_of_ocaml"     {>= "3.9.0"}
+  "js_of_ocaml"     {>= "3.9.0" & < "6.0.0"}
   "js_of_ocaml-ppx" {>= "3.9.0"}
   "lambdasoup"      {>= "0.6.3"}
   "tyxml"           {>= "4.3.0"}

diff --git a/packages/virtual_dom/virtual_dom.v0.16.0/opam b/packages/virtual_dom/virtual_dom.v0.16.0/opam
@@ -20,7 +20,7 @@ depends: [
   "base64"              {>= "3.4.0"}
   "dune"                {>= "2.0.0"}
   "gen_js_api"          {>= "1.0.8"}
-  "js_of_ocaml"         {>= "5.1.1"}
+  "js_of_ocaml"         {>= "5.1.1" & < "6.0.0"}
   "js_of_ocaml-ppx"     {>= "5.1.1"}
   "lambdasoup"          {>= "0.6.3"}
   "tyxml"               {>= "4.3.0"}