Bump dependencies and cabal-version (backport #10082) (#10094)

* Bump a number of dependencies base and QuickCheck. (cherry picked from commit 5226cd8) # Conflicts: # cabal-install-solver/cabal-install-solver.cabal * Bump `cabal-version` For `Cabal` and `cabal-install`. (cherry picked from commit bb24ef5) * fixup! Bump a number of dependencies --------- Co-authored-by: Francesco Ariis <[email protected]> Co-authored-by: brandon s allbery kf8nh <[email protected]>
haskell · Jun 11, 2024 · d873282 · d873282
1 parent 8e3cfd3
commit d873282
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -1,4 +1,4 @@
-cabal-version: 2.2
+cabal-version: 3.0
 name:          Cabal
 version:       3.12.0.0
 copyright:     2003-2024, Cabal Development Team (see AUTHORS file)

diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal
@@ -102,7 +102,7 @@ library
 
   build-depends:
     , array         >=0.4      && <0.6
-    , base          >=4.11     && <4.20
+    , base          >=4.11     && <4.21
     , bytestring    >=0.10.6.0 && <0.13
     , Cabal         ^>=3.12
     , Cabal-syntax  ^>=3.12
@@ -134,7 +134,7 @@ Test-Suite unit-tests
      UnitTests.Distribution.Solver.Modular.MessageUtils
 
    build-depends:
-     , base        >= 4.11  && <4.20
+     , base        >= 4.11  && <4.21
      , Cabal
      , Cabal-syntax
      , cabal-install-solver

diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -1,4 +1,4 @@
-Cabal-Version:      2.2
+Cabal-Version:      3.0
 
 Name:               cabal-install
 Version:            3.11.0.0
@@ -51,7 +51,7 @@ common warnings
       ghc-options: -Wunused-packages
 
 common base-dep
-    build-depends: base >=4.11 && <4.20
+    build-depends: base >=4.11 && <4.21
 
 common cabal-dep
     build-depends: Cabal ^>=3.12
@@ -353,7 +353,7 @@ test-suite unit-tests
           tasty-expected-failure,
           tasty-hunit >= 0.10,
           tree-diff,
-          QuickCheck >= 2.14.3 && <2.15
+          QuickCheck >= 2.14.3 && <2.16
 
 
 -- Tests to run with a limited stack and heap size
@@ -438,5 +438,5 @@ test-suite long-tests
         tasty-expected-failure,
         tasty-hunit >= 0.10,
         tasty-quickcheck,
-        QuickCheck >= 2.14 && <2.15,
+        QuickCheck >= 2.14 && <2.16,
         pretty-show >= 1.6.15