Upgrade to dune and Opam 2

dataloader-lwt.opam

@@ -1,18 +1,21 @@
-opam-version: "1.2"
+opam-version: "2.0"
 maintainer: "Andreas Garnaes <andreas.garnaes@gmail.com>"
 authors: "Andreas Garnaes <andreas.garnaes@gmail.com>"
 homepage: "https://github.com/andreas/ocaml-dataloader"
 doc: "https://andreas.github.io/ocaml-dataloader/"
 bug-reports: "https://github.com/andreas/ocaml-dataloader/issues"
-dev-repo: "https://github.com/andreas/ocaml-dataloader.git"
-build: [["jbuilder" "build" "-p" name "-j" jobs]]
-build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
+dev-repo: "git+https://github.com/andreas/ocaml-dataloader.git"
+version: "0.0.1"
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
 depends: [
-  "jbuilder" {build}
+  "ocaml" {>= "4.03.0" }
+  "dune" {build & >= "1.0"}
   "dataloader"
   "lwt"
-  "alcotest" {test}
-]
-available: [
-  ocaml-version >= "4.03.0"
+  "alcotest" {with-test}
 ]
+synopsis: "Lwt support for dataloader"

dataloader-lwt/src/dune

@@ -0,0 +1,5 @@
+(library
+ (name dataloader_lwt)
+ (public_name dataloader-lwt)
+ (wrapped false)
+ (libraries dataloader lwt))

dataloader-lwt/test/dune

@@ -0,0 +1,3 @@
+(test
+ (libraries dataloader-lwt lwt.unix alcotest)
+ (name test))

dataloader-lwt/test/test.ml

@@ -26,7 +26,7 @@ let suite = [
     |> Lwt_main.run
   );
   ("failed load", `Quick, fun () ->
-    let loader = Dataloader_lwt.create ~load:(fun keys ->
+    let loader = Dataloader_lwt.create ~load:(fun _keys ->
       Lwt_result.fail (Failure "boom")
     ) in
     List.map (fun i ->

dataloader.opam

@@ -1,17 +1,19 @@
-opam-version: "1.2"
+opam-version: "2.0"
 maintainer: "Andreas Garnaes <andreas.garnaes@gmail.com>"
 authors: "Andreas Garnaes <andreas.garnaes@gmail.com>"
 homepage: "https://github.com/andreas/ocaml-dataloader"
 doc: "https://andreas.github.io/ocaml-dataloader/"
 bug-reports: "https://github.com/andreas/ocaml-dataloader/issues"
-dev-repo: "https://github.com/andreas/ocaml-dataloader.git"
-build: [["jbuilder" "build" "-p" name "-j" jobs]]
-build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]]
-depends: [
-  "jbuilder" {build}
-  "rresult"
-  "alcotest" {test}
+dev-repo: "git+https://github.com/andreas/ocaml-dataloader.git"
+version: "0.0.1"
+build: [
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
-available: [
-  ocaml-version >= "4.03.0"
+depends: [
+  "ocaml" {>= "4.03.0"}
+  "dune" {build & >= "1.0"}
+  "alcotest" {with-test}
 ]
+synopsis: "Dataloader for ocaml"

dataloader/src/dune

@@ -0,0 +1,4 @@
+(library
+ (name dataloader)
+ (public_name dataloader)
+ (wrapped false))

dataloader/test/dune

@@ -0,0 +1,3 @@
+(test
+ (libraries dataloader alcotest)
+ (name test))

dataloader/test/test.ml

@@ -1,6 +1,6 @@
 let suite = [
   ("load one", `Quick, fun () ->
-    let loader = Dataloader.create ~load:(fun keys fail ok ->
+    let loader = Dataloader.create ~load:(fun keys _fail ok ->
       ok keys
     ) in
     Dataloader.load loader 1
@@ -11,7 +11,7 @@ let suite = [
   );
   ("load n", `Quick, fun () ->
     let loader_calls = ref 0 in
-    let loader = Dataloader.create ~load:(fun keys fail ok ->
+    let loader = Dataloader.create ~load:(fun keys _fail ok ->
       loader_calls := !loader_calls + 1;
       ok keys
     ) in
@@ -24,13 +24,13 @@ let suite = [
     Alcotest.(check int) "Load calls" 1 !loader_calls
   );
   ("failed load", `Quick, fun () ->
-    let loader = Dataloader.create ~load:(fun keys fail ok ->
+    let loader = Dataloader.create ~load:(fun _keys fail _ok ->
       fail (Failure "boom")
     ) in
     List.iter (fun i ->
       Dataloader.load loader i
         (fun _ -> ())
-        (fun value -> Alcotest.failf "Expected failure, got %d" i)
+        (fun _value -> Alcotest.failf "Expected failure, got %d" i)
     ) [1;2;3;4;5;6;7;8;9;10];
     Dataloader.trigger loader;
   )

dune-project

@@ -0,0 +1,2 @@
+(lang dune 1.0)
+(name dataloader)