Require Dune 2.7.0

aantron · Oct 21, 2020 · dcfe904 · dcfe904
1 parent 27c4b85
commit dcfe904
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 .PHONY : build
 build :
-	dune build
+	dune build -p markup,markup-lwt
 
 # This is not part of the ordinary build process. The output file, entities.ml,
 # is checked into git.
@@ -12,7 +12,7 @@ entities :
 COVERAGE := _coverage
 
 .PHONY : test
-test : build
+test :
 	dune runtest
 
 .PHONY : coverage

diff --git a/dune-project b/dune-project
@@ -1 +1 @@
-(lang dune 1.0)
+(lang dune 2.7)
diff --git a/markup-lwt.opam b/markup-lwt.opam
@@ -14,7 +14,7 @@ dev-repo: "git+https://github.com/aantron/markup.ml.git"
 
 depends: [
   "base-unix"
-  "dune"
+  "dune" {>= "2.7.0"}
   "lwt"
   "markup"
   "ocaml"

diff --git a/markup.opam b/markup.opam
@@ -13,7 +13,7 @@ maintainer: "Anton Bachin <antonbachin@yahoo.com>"
 dev-repo: "git+https://github.com/aantron/markup.ml.git"
 
 depends: [
-  "dune"
+  "dune" {>= "2.7.0"}
   "ocaml" {>= "4.02.0"}
   "uchar"
   "uutf" {>= "1.0.0"}

diff --git a/test/dune b/test/dune
@@ -3,7 +3,7 @@
  (libraries markup ounit2 test_support)
  (flags (:standard -w +A-44-48)))
 
-(alias
- (name runtest)
+(rule
+ (alias runtest)
  (package markup)
  (action (run %{exe:test.exe} -runner sequential)))
diff --git a/test/js_of_ocaml/dune b/test/js_of_ocaml/dune
@@ -1,4 +1,5 @@
 (executable
  (name test_js_of_ocaml)
+ (modes js)
  (libraries markup markup-lwt)
  (flags (:standard -w +A-44)))
diff --git a/test/lwt_unix/dune b/test/lwt_unix/dune
@@ -3,7 +3,7 @@
  (libraries lwt.unix markup-lwt.unix ounit2 test_support)
  (flags (:standard -w +A-44)))
 
-(alias
- (name runtest)
+(rule
+ (alias runtest)
  (package markup-lwt)
  (action (run %{exe:test_lwt.exe} -runner sequential)))