Merge pull request #824 from ocsigen/dune-3.18

Bump dune from 3.6 to 3.18

Author: vouillon

dune-project

@@ -1,11 +1,13 @@
-(lang dune 3.6)
+(lang dune 3.18)
 
 (name eliom)
 (version 11.1.1)
 (maintainers [email protected])
 (authors [email protected])
 (license "LGPL-2.1-only WITH OCaml-LGPL-linking-exception")
 
+(generate_opam_files true)
+
 (package
  (name eliom)
  (synopsis "Advanced client/server Web and mobile framework")
@@ -20,26 +22,24 @@ The client-side code is compiled to JS using Ocsigen Js_of_ocaml or to Wasm usin
  (homepage https://ocsigen.org/eliom/)
  (source (github ocsigen/eliom))
  (depends
-  (ocaml (>= 4.12.0))
+  (ocaml (and (>= 4.12) (< 5.3)))
   ocamlfind
   ppx_deriving
-  (ppxlib (>= 0.15.0))
-  (js_of_ocaml-compiler (and (>= 5.5.0) (< 6.0.0)))
-  (js_of_ocaml (>= 5.5.0))
-  (js_of_ocaml-lwt (>= 5.5.0))
+  (ppxlib (>= 0.15))
+  (js_of_ocaml-compiler (and (>= 5.5) (< 6.0)))
+  (js_of_ocaml (>= 5.5))
+  (js_of_ocaml-lwt (>= 5.5))
   (js_of_ocaml-ocamlbuild :build)
-  (js_of_ocaml-ppx (>= 5.5.0))
-  (js_of_ocaml-ppx_deriving_json (>= 5.5.0))
-  (js_of_ocaml-tyxml (>= 5.5.0))
+  (js_of_ocaml-ppx (>= 5.5))
+  (js_of_ocaml-ppx_deriving_json (>= 5.5))
+  (js_of_ocaml-tyxml (>= 5.5))
   lwt_log
-  (tyxml (and (>= 4.6.0) (< 4.7.0)))
-  (ocsigenserver (and (>= 6.0.0) (< 7.0.0)))
+  (tyxml (and (>= 4.6) (< 4.7)))
+  (ocsigenserver (and (>= 6.0) (< 7.0)))
   lwt_log
   (ipaddr (>= 2.1))
   (reactiveData (>= 0.2.1))
   base-bytes
   (ocsipersist (and (>= 2.0) (< 3.0)))
   ppx_optcomp
   (xml-light (>= "2.5"))))
-
-(generate_opam_files)

eliom.opam

@@ -18,20 +18,20 @@ homepage: "https://ocsigen.org/eliom/"
 bug-reports: "https://github.com/ocsigen/eliom/issues"
 depends: [
   "dune" {>= "3.6"}
-  "ocaml" {>= "4.12.0"}
+  "ocaml" {>= "4.12" & < "5.3"}
   "ocamlfind"
   "ppx_deriving"
-  "ppxlib" {>= "0.15.0"}
-  "js_of_ocaml-compiler" {>= "5.5.0" & < "6.0.0"}
-  "js_of_ocaml" {>= "5.5.0"}
-  "js_of_ocaml-lwt" {>= "5.5.0"}
+  "ppxlib" {>= "0.15"}
+  "js_of_ocaml-compiler" {>= "5.5" & < "6.0"}
+  "js_of_ocaml" {>= "5.5"}
+  "js_of_ocaml-lwt" {>= "5.5"}
   "js_of_ocaml-ocamlbuild" {build}
-  "js_of_ocaml-ppx" {>= "5.5.0"}
-  "js_of_ocaml-ppx_deriving_json" {>= "5.5.0"}
-  "js_of_ocaml-tyxml" {>= "5.5.0"}
+  "js_of_ocaml-ppx" {>= "5.5"}
+  "js_of_ocaml-ppx_deriving_json" {>= "5.5"}
+  "js_of_ocaml-tyxml" {>= "5.5"}
   "lwt_log"
-  "tyxml" {>= "4.6.0" & < "4.7.0"}
-  "ocsigenserver" {>= "6.0.0" & < "7.0.0"}
+  "tyxml" {>= "4.6" & < "4.7"}
+  "ocsigenserver" {>= "6.0" & < "7.0"}
   "lwt_log"
   "ipaddr" {>= "2.1"}
   "reactiveData" {>= "0.2.1"}