Merge commit '1e56f63c3197e7ca1c1e506e083c2bad25d08793' into ghc-9.0

1 files changed, 38 insertions, 26 deletions

diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal
index 8c20d7ad..7b854553 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
+version:              1.9.0
 synopsis:             Library exposing some functionality of Haddock.
 
 description:          Haddock is a documentation-generation tool for Haskell
@@ -12,15 +12,27 @@ description:          Haddock is a documentation-generation tool for Haskell
                       itself, see the [haddock package](https://hackage.haskell.org/package/haddock).
 
 license:              BSD-2-Clause
-license-files:        LICENSE
+license-file:         LICENSE
 maintainer:           Alec Theriault <alec.theriault@gmail.com>, Alex Biehl <alexbiehl@gmail.com>, Simon Hengel <sol@typeful.net>, Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
 homepage:             http://www.haskell.org/haddock/
 bug-reports:          https://github.com/haskell/haddock/issues
 category:             Documentation
-tested-with:          GHC==8.12.*, GHC==8.10.*, GHC==8.8.1
+tested-with:          GHC == 7.4.2
+                    , GHC == 7.6.3
+                    , GHC == 7.8.4
+                    , GHC == 7.10.3
+                    , GHC == 8.0.2
+                    , GHC == 8.2.2
+                    , GHC == 8.4.4
+                    , GHC == 8.6.5
+                    , GHC == 8.8.3
+                    , GHC == 8.10.1
+                    , GHC == 9.0.1
 
 extra-source-files:
   CHANGES.md
+  fixtures/examples/*.input
+  fixtures/examples/*.parsed
 
 common lib-defaults
   default-language: Haskell2010
@@ -33,9 +45,9 @@ common lib-defaults
     , text         ^>= 1.2.3.0
     , parsec       ^>= 3.1.13.0
 
-  ghc-options: -funbox-strict-fields -Wall -fwarn-tabs
+  ghc-options: -funbox-strict-fields -Wall
   if impl(ghc >= 8.0)
-    ghc-options: -Wcompat -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances
+    ghc-options: -Wcompat -Wnoncanonical-monad-instances
 
 library
   import: lib-defaults
@@ -49,33 +61,34 @@ library
     Documentation.Haddock.Types
 
   other-modules:
+    CompatPrelude
     Documentation.Haddock.Parser.Util
     Documentation.Haddock.Parser.Monad
+    Documentation.Haddock.Parser.Identifier
 
 test-suite spec
   import: lib-defaults
   type:             exitcode-stdio-1.0
   main-is:          Spec.hs
   hs-source-dirs:
-      test
-      src
-
-  cpp-options:
-      -DTEST
+    test
+    src
 
   other-modules:
-      Documentation.Haddock.Doc
-      Documentation.Haddock.Markup
-      Documentation.Haddock.Parser
-      Documentation.Haddock.Parser.Monad
-      Documentation.Haddock.Parser.Util
-      Documentation.Haddock.Parser.UtilSpec
-      Documentation.Haddock.ParserSpec
-      Documentation.Haddock.Types
+    CompatPrelude
+    Documentation.Haddock.Doc
+    Documentation.Haddock.Markup
+    Documentation.Haddock.Parser
+    Documentation.Haddock.Parser.Monad
+    Documentation.Haddock.Parser.Util
+    Documentation.Haddock.Parser.UtilSpec
+    Documentation.Haddock.ParserSpec
+    Documentation.Haddock.Types
+    Documentation.Haddock.Parser.Identifier
 
   build-depends:
-    , base-compat  ^>= 0.9.3 || ^>= 0.10.0
-    , QuickCheck   ^>= 2.11.3
+    , base-compat  ^>= 0.9.3 || ^>= 0.11.0
+    , QuickCheck   ^>= 2.11  || ^>= 2.13.2 || ^>= 2.14 
     , deepseq      ^>= 1.3.0.0 || ^>= 1.4.0.0
 
   -- NB: build-depends & build-tool-depends have independent
@@ -83,10 +96,10 @@ test-suite spec
   --     version of `hspec` & `hspec-discover` to ensure
   --     intercompatibility
   build-depends:
-    , hspec                         ^>= 2.5.5
+    , hspec                          >= 2.4.4    && < 2.8
 
   build-tool-depends:
-    , hspec-discover:hspec-discover ^>= 2.5.5
+    , hspec-discover:hspec-discover  >= 2.4.4    && < 2.8
 
 test-suite fixtures
   type:             exitcode-stdio-1.0
@@ -94,7 +107,6 @@ test-suite fixtures
   main-is:          Fixtures.hs
   ghc-options:      -Wall
   hs-source-dirs:   fixtures
-  buildable:        False
   build-depends:
       -- intra-package dependency
     , haddock-library
@@ -102,11 +114,11 @@ test-suite fixtures
     , base
 
       -- extra dependencies
-    , base-compat  >= 0.9.3   && < 0.11
+    , base-compat           ^>= 0.9.3 || ^>= 0.11.0
     , directory             ^>= 1.3.0.2
     , filepath              ^>= 1.4.1.2
-    , optparse-applicative  ^>= 0.14.0.0
-    , tree-diff             ^>= 0.0.0.1
+    , optparse-applicative  ^>= 0.15
+    , tree-diff             ^>= 0.1
 
 source-repository head
   type:     git