diff --git a/cabal.project b/cabal.project index e89a2cd531222b58662af6b7da9876ddccd9646c..ca8908a98537c6af13fc56bf3aaeaa53be7c0f66 100644 --- a/cabal.project +++ b/cabal.project @@ -1,12 +1,10 @@ -with-compiler: ghc-9.4 +with-compiler: ghc-9.6 packages: ./ ./haddock-api ./haddock-library ./haddock-test -with-compiler: ghc-9.4 - allow-newer: ghc-paths:Cabal, *:base, diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal index 5923ba37828abe70596cce0b5396d80ac2206454..053a64763c084508c0d71d65a962dda59ff89d8d 100644 --- a/haddock-api/haddock-api.cabal +++ b/haddock-api/haddock-api.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: haddock-api -version: 2.27.0 +version: 2.28.0 synopsis: A documentation-generation tool for Haskell libraries description: Haddock is a documentation-generation tool for Haskell libraries @@ -13,7 +13,7 @@ bug-reports: https://github.com/haskell/haddock/issues copyright: (c) Simon Marlow, David Waern category: Documentation build-type: Simple -tested-with: GHC==9.4.* +tested-with: GHC==9.6.* extra-source-files: CHANGES.md @@ -44,7 +44,7 @@ library -- this package typically supports only single major versions build-depends: base ^>= 4.16.0 - , ghc ^>= 9.4 + , ghc ^>= 9.6 , ghc-paths ^>= 0.1.0.9 , haddock-library ^>= 1.11 , xhtml ^>= 3000.2.2 @@ -180,7 +180,7 @@ test-suite spec Haddock.Backends.Hyperlinker.Parser Haddock.Backends.Hyperlinker.Types - build-depends: ghc ^>= 9.4 + build-depends: ghc ^>= 9.6 , ghc-paths ^>= 0.1.0.12 , haddock-library ^>= 1.11 , xhtml ^>= 3000.2.2 diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal index 2e015f2aae2e7111e2665263c24911441e8d966a..ca2db9e55a54f9274a359a0a44d7abce302c00c4 100644 --- a/haddock-library/haddock-library.cabal +++ b/haddock-library/haddock-library.cabal @@ -39,7 +39,7 @@ common lib-defaults default-language: Haskell2010 build-depends: - , base >= 4.5 && < 4.17 + , base >= 4.5 && < 4.19 , containers ^>= 0.4.2.1 || ^>= 0.5.0.0 || ^>= 0.6.0.1 , text ^>= 1.2.3.0 || ^>= 2.0 , parsec ^>= 3.1.13.0 diff --git a/haddock-test/haddock-test.cabal b/haddock-test/haddock-test.cabal index 4e3bfd298fd425a3f7911bf07e2eea241256aa9e..e49e23dfc2a3d13af05429c1d39c2bc1878ee4bc 100644 --- a/haddock-test/haddock-test.cabal +++ b/haddock-test/haddock-test.cabal @@ -10,14 +10,14 @@ bug-reports: https://github.com/haskell/haddock/issues copyright: (c) Simon Marlow, David Waern category: Documentation build-type: Simple -tested-with: GHC==9.4.* +tested-with: GHC==9.6.* stability: experimental library default-language: Haskell2010 ghc-options: -Wall hs-source-dirs: src - build-depends: base >= 4.3 && < 4.17, bytestring, directory, process, filepath, Cabal + build-depends: base >= 4.3 && < 4.19, bytestring, directory, process, filepath, Cabal exposed-modules: Test.Haddock diff --git a/haddock.cabal b/haddock.cabal index 7882fdab6c949c2111f342c02f8c0a2d6fd5b0f4..a63e1929ff64ee14c8f0dee54b0421bb0b768c6d 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: haddock -version: 2.27.0 +version: 2.28.0 synopsis: A documentation-generation tool for Haskell libraries description: This is Haddock, a tool for automatically generating documentation @@ -35,7 +35,7 @@ bug-reports: https://github.com/haskell/haddock/issues copyright: (c) Simon Marlow, David Waern category: Documentation build-type: Simple -tested-with: GHC==9.4.* +tested-with: GHC==9.6.* extra-source-files: CHANGES.md @@ -68,7 +68,7 @@ executable haddock -- haddock typically only supports a single GHC major version build-depends: - base ^>= 4.13.0.0 || ^>= 4.14.0.0 || ^>= 4.15.0.0 || ^>= 4.16.0.0 || ^>= 4.17.0.0 || ^>= 4.18.0.0 + base ^>= 4.13.0.0 || ^>= 4.14.0.0 || ^>= 4.15.0.0 || ^>= 4.16.0.0 || ^>= 4.17.0.0 || ^>= 4.18.0.0 || ^>= 4.19.0.0 if flag(in-ghc-tree) hs-source-dirs: haddock-api/src, haddock-library/src @@ -150,7 +150,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.27.0 + build-depends: haddock-api == 2.28.0 test-suite html-test type: exitcode-stdio-1.0