From e4b72227c472dd52cfce69fbfa2d91789f13f52d Mon Sep 17 00:00:00 2001
From: Matthieu Dubuget <matthieu.dubuget@gmail.com>
Date: Sun, 3 Nov 2019 08:30:46 +0100
Subject: [PATCH] =?UTF-8?q?Passage=20=C3=A0=20dune?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dune                                    | 11 +++++++++++
 dune-project                            |  1 +
 jbuild-workspace.here => dune-workspace |  0
 jbuild                                  | 13 -------------
 ocaml-google-apps.opam                  |  8 ++++----
 5 files changed, 16 insertions(+), 17 deletions(-)
 create mode 100644 dune
 create mode 100644 dune-project
 rename jbuild-workspace.here => dune-workspace (100%)
 delete mode 100644 jbuild

diff --git a/dune b/dune
new file mode 100644
index 0000000..3939799
--- /dev/null
+++ b/dune
@@ -0,0 +1,11 @@
+(library
+  (name googleApps)
+  (public_name ocaml-google-apps)
+  (libraries gen_js_api)
+)
+
+(rule
+  (targets googleApps.ml)
+  (deps googleApps.mli)
+  (action (run %{bin:ocamlfind} gen_js_api/gen_js_api %{deps}))
+)
\ No newline at end of file
diff --git a/dune-project b/dune-project
new file mode 100644
index 0000000..de4fc20
--- /dev/null
+++ b/dune-project
@@ -0,0 +1 @@
+(lang dune 1.0)
diff --git a/jbuild-workspace.here b/dune-workspace
similarity index 100%
rename from jbuild-workspace.here
rename to dune-workspace
diff --git a/jbuild b/jbuild
deleted file mode 100644
index b41bed7..0000000
--- a/jbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-(jbuild_version 1)
-
-(library(
-  (name googleApps)
-  (public_name ocaml-google-apps)
-  (libraries (gen_js_api))
-))
-
-(rule(
-  (targets (googleApps.ml))
-  (deps (googleApps.mli))
-  (action (run ${bin:ocamlfind} gen_js_api/gen_js_api ${<}))
-))
\ No newline at end of file
diff --git a/ocaml-google-apps.opam b/ocaml-google-apps.opam
index 6264e09..c364b68 100644
--- a/ocaml-google-apps.opam
+++ b/ocaml-google-apps.opam
@@ -1,14 +1,14 @@
 opam-version: "2.0"
 name: "ocaml-google-apps"
-version: "0.3"
+version: "0.4"
 synopsis: "OCaml binding to Google Apps"
 description: """
 Binding to Google Apps using gen_js_api (https://github.com/LexiFi/gen_js_api):
 to be used with js_of_ocaml.
 
-Functions are added/adapted when I need it.
+Functions are added/adapted when needed.
 """
 maintainer: "Matthieu Dubuget <matthieu.dubuget@gmail.com>"
 authors: ["Matthieu Dubuget <matthieu.dubuget@gmail.com>"]
-build: [["jbuilder" "build" "-p" name "-j" jobs]]
-depends: ["jbuilder" "gen_js_api"]
+build: [["dune" "build" "-p" name "-j" jobs]]
+depends: ["dune" {build} "gen_js_api"]