Merge pull request #143 from avsm/sexp-v13

uri-sexp: use the v0.13.0 ppx directives and fix travis for 4.08/9
mirage · Jan 2, 2020 · cd27611 · cd27611
2 parents 21f76c7 + 296da39
commit cd27611
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,4 +17,5 @@ env:
    - DISTRO=debian-testing OCAML_VERSION=4.05
    - DISTRO=alpine OCAML_VERSION=4.06
    - DISTRO=debian-stable OCAML_VERSION=4.07 DEPOPTS="uri-sexp"
-   - DISTRO=alpine OCAML_VGERSION=4.08
+   - DISTRO=alpine OCAML_VERSION=4.08
+   - DISTRO=alpine OCAML_VERSION=4.09
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+v3.2.0 2020-01-01
+-----------------
+
+* sexp: use the sexplib v0.13 ppx directives (@avsm).
+
 v3.1.0 2019-11-23
 -----------------
 

diff --git a/lib_sexp/uri_sexp.ml b/lib_sexp/uri_sexp.ml
@@ -18,13 +18,13 @@ struct
 	] [@@deriving sexp]
 
 	type t = {
-          scheme: string option [@default None] [@sexp_drop_default];
-          userinfo: string option [@default None] [@sexp_drop_default];
-          host: string option [@default None] [@sexp_drop_default];
-          port: int option [@default None] [@sexp_drop_default];
-          path: string [@default ""] [@sexp_drop_default];
-          query: (string * string list) sexp_list;
-          fragment: string option [@default None] [@sexp_drop_default]
+          scheme: string option [@default None] [@sexp_drop_default.sexp];
+          userinfo: string option [@default None] [@sexp_drop_default.sexp];
+          host: string option [@default None] [@sexp_drop_default.sexp];
+          port: int option [@default None] [@sexp_drop_default.sexp];
+          path: string [@default ""] [@sexp_drop_default.sexp];
+          query: (string * string list) list [@sexp.list];
+          fragment: string option [@default None] [@sexp_drop_default.sexp]
 	} [@@deriving sexp]
 
 end

diff --git a/uri-sexp.opam b/uri-sexp.opam
@@ -14,7 +14,7 @@ ocaml-uri with sexp support
 depends: [
   "uri" {= version}
   "dune" {>= "1.2.0"}
-  "ppx_sexp_conv" {>= "v0.9.0"}
+  "ppx_sexp_conv" {>= "v0.13.0"}
   "sexplib0"
   "ounit" {with-test}
 ]