Merge pull request #125 from avsm/rel-1.4

prepare release 1.4.0
realworldocaml · Jun 11, 2019 · 523a139 · 523a139
2 parents 6ce807d + 9ff5a88
commit 523a139
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,10 +7,10 @@ env:
   - TO_TEST=tests OPAMBUILDTEST=true OCAML_VERSION=4.04.2
   - TO_TEST=tests OPAMBUILDTEST=true OCAML_VERSION=4.05.0
   - TO_TEST=tests OPAMBUILDTEST=true OCAML_VERSION=4.06.1
-  - TO_TEST=tests OPAMBUILDTEST=true OCAML_VERSION=4.07.0
+  - TO_TEST=tests OPAMBUILDTEST=true OCAML_VERSION=4.07.1
 before_install:
   # Download and use opam2
-  - wget -O ${HOME}/opam https://github.com/ocaml/opam/releases/download/2.0.2/opam-2.0.2-x86_64-linux
+  - wget -O ${HOME}/opam https://github.com/ocaml/opam/releases/download/2.0.4/opam-2.0.4-x86_64-linux
   - chmod +x ${HOME}/opam
   # Some opam boilerplate
   - export OPAMYES=1

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,9 @@
+### 1.4.0 (2019-06-11)
+- Add `--force-output` option to force generation of diff file (#118 @clecat)
+- Support OCaml 4.08.0 (#121 @xclerc)
+- README and documentation fixes (#122 #118 @andreypopp @clecat @samoht)
+- Use latest ocaml-migrate-parsetree interfaces (@avsm)
+
 ### 1.3.0 (2019-03-01)
 - Updated readme file with the new features: dune rules, named environment and
   ocaml versions, Some grammar correction too (@gpetiot, #101, aantron, #102)

diff --git a/lib/migrate_ast.ml b/lib/migrate_ast.ml
@@ -31,20 +31,20 @@ module Asttypes_ = Asttypes
 module Parsetree_ = Parsetree
 
 include (
-  Ast_406 :
-    module type of struct
-      include Ast_406
+  Migrate_parsetree.Ast_406 :
+  module type of struct
+      include Migrate_parsetree.Ast_406
     end
-    with module Location := Ast_406.Location
-     and module Outcometree := Ast_406.Outcometree
-     and module Asttypes := Ast_406.Asttypes
-     and module Ast_helper := Ast_406.Ast_helper
-     and module Parsetree := Ast_406.Parsetree
+    with module Location := Migrate_parsetree.Ast_406.Location
+     and module Outcometree := Migrate_parsetree.Ast_406.Outcometree
+     and module Asttypes := Migrate_parsetree.Ast_406.Asttypes
+     and module Ast_helper := Migrate_parsetree.Ast_406.Ast_helper
+     and module Parsetree := Migrate_parsetree.Ast_406.Parsetree
  )
 
-module Asttypes = Ast_406.Asttypes
-module Ast_helper = Ast_406.Ast_helper
-module Parsetree = Ast_406.Parsetree
+module Asttypes = Migrate_parsetree.Ast_406.Asttypes
+module Ast_helper = Migrate_parsetree.Ast_406.Ast_helper
+module Parsetree = Migrate_parsetree.Ast_406.Parsetree
 
 module Parse = struct
   open Migrate_parsetree
@@ -166,7 +166,7 @@ module Position = struct
 end
 
 module Location = struct
-  include Ast_406.Location
+  include Migrate_parsetree.Ast_406.Location
 
   let fmt fs {loc_start; loc_end; loc_ghost} =
     Format.fprintf fs "(%a..%a)%s" Position.fmt loc_start Position.fmt