Merge pull request #124 from kit-ty-kate/release-3.5.3

Release 3.5.3
ocaml-ppx · Jul 30, 2020 · 9e213a3 · 9e213a3
2 parents 6f187a6 + 036a2b3
commit 9e213a3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,16 +7,14 @@ script: bash -ex ./.travis-docker.sh
 env:
   global:
   - PINS="ppx_deriving_yojson:."
+  - PACKAGE="ppx_deriving_yojson"
+  - DISTRO="ubuntu-16.04"
   matrix:
-  - PACKAGE="ppx_deriving_yojson" DISTRO="ubuntu-16.04"    OCAML_VERSION="4.11.0+trunk"
-    OCAML_BETA="enable"
-    PINS="ppx_deriving_yojson:.
-      ppx_deriving:https://github.com/ocaml-ppx/ppx_deriving.git#pre-ppxlib
-      ppx_tools:https://github.com/kit-ty-kate/ppx_tools.git#411"
-  - PACKAGE="ppx_deriving_yojson" DISTRO="ubuntu-16.04"    OCAML_VERSION="4.10"
-  - PACKAGE="ppx_deriving_yojson" DISTRO="ubuntu-16.04"    OCAML_VERSION="4.09"
-  - PACKAGE="ppx_deriving_yojson" DISTRO="ubuntu-16.04"    OCAML_VERSION="4.08"
-  - PACKAGE="ppx_deriving_yojson" DISTRO="ubuntu-16.04"    OCAML_VERSION="4.07"
-  - PACKAGE="ppx_deriving_yojson" DISTRO="ubuntu-16.04"    OCAML_VERSION="4.06"
-  - PACKAGE="ppx_deriving_yojson" DISTRO="ubuntu-16.04"    OCAML_VERSION="4.05"
-  - PACKAGE="ppx_deriving_yojson" DISTRO="ubuntu-16.04"    OCAML_VERSION="4.04"
+  - OCAML_VERSION="4.11.0+trunk" OCAML_BETA="enable"
+  - OCAML_VERSION="4.10"
+  - OCAML_VERSION="4.09"
+  - OCAML_VERSION="4.08"
+  - OCAML_VERSION="4.07"
+  - OCAML_VERSION="4.06"
+  - OCAML_VERSION="4.05"
+  - OCAML_VERSION="4.04"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 Changelog
 =========
 
+3.5.3
+-----
+
+  * Support for OCaml 4.11 (requires feature from `ppx_deriving.4.5`)
+    (#122)
+    Thierry Martinez
+  * Documentation improvements
+    (#115)
+    Olivier Andrieu
+
 3.5.2
 -----
 

diff --git a/ppx_deriving_yojson.opam b/ppx_deriving_yojson.opam
@@ -7,23 +7,20 @@ bug-reports: "https://github.com/ocaml-ppx/ppx_deriving_yojson/issues"
 dev-repo: "git://github.com/ocaml-ppx/ppx_deriving_yojson.git"
 tags: [ "syntax" "json" ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
-  ["dune" "runtest" "-p" name] {with-test}
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
   "ocaml" {>= "4.04.0"}
   "yojson" {>= "1.6.0" & < "2.0.0"}
   "result"
-  "ppx_deriving" {>= "4.0" & < "5.0"}
+  "ppx_deriving" {>= "4.5" & < "5.0"}
   "ppx_tools"
-  "ppxfind"
-  "dune"
-  "cppo"         {build}
-  "ounit"        {with-test & >= "2.0.0"}
-]
-conflicts: [
-  "ppx_deriving" {= "4.2"}
+  "ppxfind" {build}
+  "dune" {>= "1.0"}
+  "cppo" {build}
+  "ounit" {with-test & >= "2.0.0"}
 ]
 synopsis:
   "JSON codec generator for OCaml"