From dddfb1a8ea50e8505a8197c9e1448c08033032a9 Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <Gabriel439@gmail.com>
Date: Sat, 19 May 2018 09:55:43 -0700
Subject: [PATCH] =?UTF-8?q?Version=201.13.1=20=E2=86=92=201.14.0=20(#386)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md  | 34 ++++++++++++++++++++++++++++++++++
 README.md     |  2 +-
 dhall.cabal   |  2 +-
 nix/dhall.nix |  2 +-
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96b83fd..8df504b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+1.14.0
+
+* BREAKING CHANGE TO THE LANGUAGE: Switch grammar of `Natural` and `Integer`
+    * `Natural` number literals are now unsigned and `Integer` literals always
+      require a sign
+    * This is a **VERY** disruptive change to most Dhall code in the wild but
+      was unanimously agreed upon here:
+      https://github.com/dhall-lang/dhall-lang/issues/138
+    * See also: https://github.com/dhall-lang/dhall-haskell/pull/381
+* BREAKING CHANGE TO THE LANGUAGE: Drop support for importing directories
+    * Importing `dir/` used to resolve to `dir/@`, which is no longer supported
+    * See: https://github.com/dhall-lang/dhall-haskell/pull/384
+* BREAKING CHANGE TO THE LANGUAGE: Change to the grammar for imports
+    * File path components can no longer contain `#` or `?` characters
+    * URL imports must now contain at least one path component
+    * URL path components must match the grammar for file path components
+    * See: https://github.com/dhall-lang/dhall-haskell/pull/390
+* BREAKING CHANGE TO THE API: Rename `Path{,Mode,Hashed,Type}` to
+  `Import{,Mode,Hashed,Type}`
+    * In practice this change is not breaking for the most common use cases
+      since this also provides a `Path` type synonym for backwards compatibility
+    * See: https://github.com/dhall-lang/dhall-haskell/pull/376
+* BUG FIX: Fix α-equivalence bug when type-checking `merge`
+    * `merge` expressions would sometimes reject valid code due to a
+       type-checking bug
+    * See: https://github.com/dhall-lang/dhall-haskell/pull/394
+* Improve import caching
+    * See: https://github.com/dhall-lang/dhall-haskell/pull/388
+    * See: https://github.com/dhall-lang/dhall-haskell/pull/392
+* Increase upper bound on `tasty`
+    * See: https://github.com/dhall-lang/dhall-haskell/pull/382
+* Fix lower bound on `insert-ordered-containers`
+    * See: https://github.com/dhall-lang/dhall-haskell/pull/377
+
 1.13.1
 
 * Increase upper bound on `ansi-terminal` and `megaparsec`
diff --git a/README.md b/README.md
index ed413e9..e924e09 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# `dhall 1.13.1`
+# `dhall 1.14.0`
 
 `dhall` is a total programming language specialized to configuration files
 
diff --git a/dhall.cabal b/dhall.cabal
index 85d12e6..86000cb 100644
--- a/dhall.cabal
+++ b/dhall.cabal
@@ -1,5 +1,5 @@
 Name: dhall
-Version: 1.13.1
+Version: 1.14.0
 Cabal-Version: >=1.8.0.2
 Build-Type: Simple
 Tested-With: GHC == 8.0.1
diff --git a/nix/dhall.nix b/nix/dhall.nix
index 92c6e8d..2531312 100644
--- a/nix/dhall.nix
+++ b/nix/dhall.nix
@@ -9,7 +9,7 @@
 }:
 mkDerivation {
   pname = "dhall";
-  version = "1.13.1";
+  version = "1.14.0";
   src = ./..;
   isLibrary = true;
   isExecutable = true;