Merge pull request #108 from samoht/dune-warning

samoht · web-flow · commit b514d6a9b525 · 2020-05-11T17:40:19.000+02:00
Fix dune warning
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 _build
 .merlin
 *.swp
+_opam
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+### v1.2.1 (2020-05-11)
+
+* Fix minimal dune version (1.4) (#108 @samoht)
+
 ### v1.2.0 (2019-11-01)
 
 * adapt to mirage-protocols 4.0.0 and tcpip 4.0.0 changes (#105 @hannesm)
diff --git a/charrua-client-lwt.opam b/charrua-client-lwt.opam
@@ -14,7 +14,7 @@ build: [
 ]
 
 depends: [
-  "dune" {>= "1.2.0"}
+  "dune" {>= "1.4.0"}
   "ocaml" {>= "4.06.0"}
   "alcotest"     {with-test}
   "cstruct-unix" {with-test}
diff --git a/charrua-client-mirage.opam b/charrua-client-mirage.opam
@@ -13,7 +13,7 @@ build: [
 ]
 
 depends: [
-  "dune" {>= "1.2.0"}
+  "dune" {>= "1.4.0"}
   "ocaml" {>= "4.06.0"}
   "charrua-client-lwt" {= version}
   "ipaddr" {>= "4.0.0"}
diff --git a/charrua-client.opam b/charrua-client.opam
@@ -14,7 +14,7 @@ build: [
 ]
 
 depends: [
-  "dune" {>= "1.2.0"}
+  "dune" {>= "1.4.0"}
   "ocaml" {>= "4.06.0"}
   "alcotest"     {with-test}
   "cstruct-unix" {with-test}
diff --git a/charrua-server.opam b/charrua-server.opam
@@ -15,7 +15,7 @@ build: [
 
 depends: [
   "ocaml"         {>= "4.06.0"}
-  "dune"          {>= "1.2.0"}
+  "dune"          {>= "1.4.0"}
   "ppx_sexp_conv" {>= "v0.9.0"}
   "menhir"        {build}
   "charrua"       {= version}
diff --git a/charrua-unix.opam b/charrua-unix.opam
@@ -10,7 +10,7 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "dune" {>= "1.2.0"}
+  "dune" {>= "1.4.0"}
   "ocaml" {>= "4.06.0"}
   "lwt" {>="3.0.0"}
   "lwt_log"
diff --git a/charrua.opam b/charrua.opam
@@ -14,7 +14,7 @@ build: [
 
 depends: [
   "ocaml"         {>= "4.06.0"}
-  "dune"          {>= "1.2.0"}
+  "dune"          {>= "1.4.0"}
   "ppx_sexp_conv" {>="v0.10.0"}
   "ppx_cstruct"
   "cstruct"       {>= "3.0.1"}
diff --git a/dune-project b/dune-project
@@ -1,3 +1,3 @@
-(lang dune 1.2)
+(lang dune 1.4)
 (name charrua)
 (using menhir 2.0)

-Original file line number
+Diff line change
 _build
 .merlin
 *.swp
 +_opam
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ build: [`
`14`	`14`	`]`
`15`	`15`
`16`	`16`	`depends: [`
`17`		`- "dune" {>= "1.2.0"}`
	`17`	`+ "dune" {>= "1.4.0"}`
`18`	`18`	`"ocaml" {>= "4.06.0"}`
`19`	`19`	`"alcotest" {with-test}`
`20`	`20`	`"cstruct-unix" {with-test}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ build: [`
`13`	`13`	`]`
`14`	`14`
`15`	`15`	`depends: [`
`16`		`- "dune" {>= "1.2.0"}`
	`16`	`+ "dune" {>= "1.4.0"}`
`17`	`17`	`"ocaml" {>= "4.06.0"}`
`18`	`18`	`"charrua-client-lwt" {= version}`
`19`	`19`	`"ipaddr" {>= "4.0.0"}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ build: [`
`10`	`10`	`["dune" "build" "-p" name "-j" jobs]`
`11`	`11`	`]`
`12`	`12`	`depends: [`
`13`		`- "dune" {>= "1.2.0"}`
	`13`	`+ "dune" {>= "1.4.0"}`
`14`	`14`	`"ocaml" {>= "4.06.0"}`
`15`	`15`	`"lwt" {>="3.0.0"}`
`16`	`16`	`"lwt_log"`