Tentative 2.24 release

Adjusted changelogs and versions in `.cabal` files in preparation for
the upcoming release bundled with GHC 8.10.

7 files changed, 18 insertions, 9 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 88656da4..b0600381 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+## Changes in 2.24.0
+
+ * Reify oversaturated data family instances correctly (#1103)
+
+ * Removed the majority of Haddock's possible `panic` routes through
+   the TTG refactor to make extension variants empty
+
 ## Changes in 2.23.0
 
  * "Linuwial" is the new default theme (#721, #782, #949)
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index 8ad0ae64..0324fcd6 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -1,6 +1,6 @@
 cabal-version:        2.0
 name:                 haddock-api
-version:              2.23.0
+version:              2.24.0
 synopsis:             A documentation-generation tool for Haskell libraries
 description:          Haddock is a documentation-generation tool for Haskell
                       libraries
@@ -45,7 +45,7 @@ library
   build-depends: base            ^>= 4.14.0
                , ghc             ^>= 8.10
                , ghc-paths       ^>= 0.1.0.9
-               , haddock-library ^>= 1.8.0
+               , haddock-library ^>= 1.9.0
                , xhtml           ^>= 3000.2.2
 
   -- Versions for the dependencies below are transitively pinned by
@@ -167,7 +167,7 @@ test-suite spec
 
   build-depends: ghc             ^>= 8.10
                , ghc-paths       ^>= 0.1.0.12
-               , haddock-library ^>= 1.8.0
+               , haddock-library ^>= 1.9.0
                , xhtml           ^>= 3000.2.2
                , hspec           >= 2.4.4 && < 2.8
                , QuickCheck      >= 2.11  && < 2.14
diff --git a/haddock-api/src/Haddock/Backends/Hoogle.hs b/haddock-api/src/Haddock/Backends/Hoogle.hs
index b38d4047..b4a605f2 100644
--- a/haddock-api/src/Haddock/Backends/Hoogle.hs
+++ b/haddock-api/src/Haddock/Backends/Hoogle.hs
@@ -260,7 +260,7 @@ ppCtor dflags dat subdocs con@ConDeclH98 {}
         tyVarBndr2Type :: HsTyVarBndr GhcRn -> HsType GhcRn
         tyVarBndr2Type (UserTyVar _ n) = HsTyVar noExtField NotPromoted n
         tyVarBndr2Type (KindedTyVar _ n k) = HsKindSig noExtField (reL (HsTyVar noExtField NotPromoted n)) k
-        tyVarBndr2Type (XTyVarBndr _) = panic "haddock:ppCtor"
+        tyVarBndr2Type (XTyVarBndr nec) = noExtCon nec
 
 ppCtor dflags _dat subdocs con@(ConDeclGADT { })
    = concatMap (lookupCon dflags subdocs) (getConNames con) ++ f
diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs
index 3ce2fabb..17be6fa1 100644
--- a/haddock-api/src/Haddock/InterfaceFile.hs
+++ b/haddock-api/src/Haddock/InterfaceFile.hs
@@ -83,7 +83,7 @@ binaryInterfaceMagic = 0xD0Cface
 --
 binaryInterfaceVersion :: Word16
 #if (__GLASGOW_HASKELL__ >= 809) && (__GLASGOW_HASKELL__ < 811)
-binaryInterfaceVersion = 35
+binaryInterfaceVersion = 36
 
 binaryInterfaceVersionCompatibility :: [Word16]
 binaryInterfaceVersionCompatibility = [binaryInterfaceVersion]
diff --git a/haddock-library/CHANGES.md b/haddock-library/CHANGES.md
index d112db45..5b400d7c 100644
--- a/haddock-library/CHANGES.md
+++ b/haddock-library/CHANGES.md
@@ -1,7 +1,9 @@
-## Changes in version 1.8.0.1
+## Changes in version 1.9.0
 
  * Fix build-time regression for `base < 4.7` (#1119)
 
+ * Update parsing to strip whitespace from table cells (#1074)
+
 ## Changes in version 1.8.0
 
  * Support inline markup in markdown-style links (#875)
diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal
index 294ef5be..57f45887 100644
--- a/haddock-library/haddock-library.cabal
+++ b/haddock-library/haddock-library.cabal
@@ -1,6 +1,6 @@
 cabal-version:        2.2
 name:                 haddock-library
-version:              1.8.0.1
+version:              1.9.0
 synopsis:             Library exposing some functionality of Haddock.
 
 description:          Haddock is a documentation-generation tool for Haskell
diff --git a/haddock.cabal b/haddock.cabal
index 425ed454..f01fe8fc 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -1,6 +1,6 @@
 cabal-version:        2.4
 name:                 haddock
-version:              2.23.0
+version:              2.24.0
 synopsis:             A documentation-generation tool for Haskell libraries
 description:
   This is Haddock, a tool for automatically generating documentation
@@ -144,7 +144,7 @@ executable haddock
   else
     -- in order for haddock's advertised version number to have proper meaning,
     -- we pin down to a single haddock-api version.
-    build-depends:  haddock-api == 2.23.0
+    build-depends:  haddock-api == 2.24.0
 
 test-suite html-test
   type:             exitcode-stdio-1.0