haskell · mergify · Mar 13, 2023 · Mar 13, 2023 · Mar 13, 2023 · Mar 13, 2023
diff --git a/Cabal-QuickCheck/Cabal-QuickCheck.cabal b/Cabal-QuickCheck/Cabal-QuickCheck.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal-QuickCheck
-version:       3.9.0.0
+version:       3.11.0.0
 synopsis:      QuickCheck instances for types in Cabal
 category:      Testing
 description:
@@ -13,8 +13,8 @@ library
   build-depends:
     , base
     , bytestring
-    , Cabal         ^>=3.9.0.0
-    , Cabal-syntax  ^>=3.9.0.0
+    , Cabal         ^>=3.11.0.0
+    , Cabal-syntax  ^>=3.11.0.0
     , QuickCheck    ^>=2.13.2 || ^>=2.14
 
   exposed-modules:

diff --git a/Cabal-described/Cabal-described.cabal b/Cabal-described/Cabal-described.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal-described
-version:       3.9.0.0
+version:       3.11.0.0
 synopsis:      Described functionality for types in Cabal
 category:      Testing, Parsec
 description:   Provides rere bindings
@@ -11,8 +11,8 @@ library
   ghc-options:      -Wall
   build-depends:
     , base
-    , Cabal             ^>=3.9.0.0
-    , Cabal-syntax      ^>=3.9.0.0
+    , Cabal             ^>=3.11.0.0
+    , Cabal-syntax      ^>=3.11.0.0
     , containers
     , pretty
     , QuickCheck

diff --git a/Cabal-syntax/Cabal-syntax.cabal b/Cabal-syntax/Cabal-syntax.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal-syntax
-version:       3.9.0.0
+version:       3.11.0.0
 copyright:     2003-2023, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 license-file:  LICENSE

diff --git a/Cabal-syntax/src/Distribution/CabalSpecVersion.hs b/Cabal-syntax/src/Distribution/CabalSpecVersion.hs
@@ -30,6 +30,7 @@ data CabalSpecVersion
     | CabalSpecV3_4
     | CabalSpecV3_6
     | CabalSpecV3_8
+    -- 3.10: no changes
   deriving (Eq, Ord, Show, Read, Enum, Bounded, Typeable, Data, Generic)
 
 instance Binary CabalSpecVersion

diff --git a/Cabal-tree-diff/Cabal-tree-diff.cabal b/Cabal-tree-diff/Cabal-tree-diff.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal-tree-diff
-version:       3.9.0.0
+version:       3.11.0.0
 synopsis:      QuickCheck instances for types in Cabal
 category:      Testing
 description:   Provides tree-diff ToExpr instances for some types in Cabal
@@ -11,8 +11,8 @@ library
   ghc-options:      -Wall
   build-depends:
     , base
-    , Cabal-syntax  ^>=3.9.0.0
-    , Cabal         ^>=3.9.0.0
+    , Cabal-syntax  ^>=3.11.0.0
+    , Cabal         ^>=3.11.0.0
     , tree-diff     ^>=0.1 || ^>=0.2
 
   exposed-modules:  Data.TreeDiff.Instances.Cabal

diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal
-version:       3.9.0.0
+version:       3.11.0.0
 copyright:     2003-2023, Cabal Development Team (see AUTHORS file)
 license:       BSD-3-Clause
 license-file:  LICENSE
@@ -34,7 +34,7 @@ library
   hs-source-dirs: src
 
   build-depends:
-    Cabal-syntax ^>= 3.9,
+    Cabal-syntax ^>= 3.11,
     array      >= 0.4.0.1  && < 0.6,
     base       >= 4.9      && < 5,
     bytestring >= 0.10.0.0 && < 0.12,

diff --git a/Cabal/Makefile b/Cabal/Makefile
@@ -1,4 +1,4 @@
-VERSION=3.9.0.0
+VERSION=3.11.0.0
 
 #KIND=devel
 KIND=rc

diff --git a/bootstrap/cabal-bootstrap-gen.cabal b/bootstrap/cabal-bootstrap-gen.cabal
@@ -11,8 +11,8 @@ executable cabal-bootstrap-gen
     , aeson                  ^>=1.5.2.0  || ^>=2.0.3.0 || ^>=2.1.0.0
     , base                   ^>=4.12.0.0 || ^>=4.13.0.0 || ^>=4.14.0.0 || ^>=4.15.0.0 || ^>=4.16.0.0 || ^>=4.17.0.0
     , bytestring             ^>=0.10.8.2 || ^>=0.11.0.0
-    , Cabal                  ^>=3.2.0.0  || ^>=3.4.1.0  || ^>=3.6.3.0 || ^>=3.8.1.0
-    , Cabal-syntax           ^>=3.8.1.0
+    , Cabal                  ^>=3.2.0.0  || ^>=3.4.1.0  || ^>=3.6.3.0 || ^>=3.10.1.0
+    , Cabal-syntax           ^>=3.10.1.0
     , cabal-install-parsers  ^>=0.3.0.1  || ^>=0.4.5 || ^>=0.6
     , cabal-plan             ^>=0.7.0.0
     , containers             ^>=0.6.0.1

diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          cabal-install-solver
-version:       3.9.0.0
+version:       3.11.0.0
 synopsis:      The command-line interface for Cabal and Hackage.
 description:
   The solver component used in cabal-install command-line program
@@ -107,8 +107,8 @@ library
     , array         >=0.4      && <0.6
     , base          >=4.10     && <4.18
     , bytestring    >=0.10.6.0 && <0.12
-    , Cabal         ^>=3.9
-    , Cabal-syntax  ^>=3.9
+    , Cabal         ^>=3.11
+    , Cabal-syntax  ^>=3.11
     , containers    >=0.5.6.2  && <0.7
     , edit-distance ^>= 0.2.2
     , filepath      ^>=1.4.0.0

diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -1,7 +1,7 @@
 Cabal-Version:      2.2
 
 Name:               cabal-install
-Version:            3.9.0.0
+Version:            3.11.0.0
 Synopsis:           The command-line interface for Cabal and Hackage.
 Description:
     The \'cabal\' command-line program simplifies the process of managing
@@ -49,13 +49,13 @@ common base-dep
     build-depends: base >=4.10 && <4.18
 
 common cabal-dep
-    build-depends: Cabal ^>=3.9
+    build-depends: Cabal ^>=3.11
 
 common cabal-syntax-dep
-    build-depends: Cabal-syntax ^>=3.9
+    build-depends: Cabal-syntax ^>=3.11
 
 common cabal-install-solver-dep
-    build-depends: cabal-install-solver ^>=3.9
+    build-depends: cabal-install-solver ^>=3.11
 
 library
     import: warnings, base-dep, cabal-dep, cabal-syntax-dep, cabal-install-solver-dep

diff --git a/cabal-install/src/Distribution/Client/ProjectPlanning.hs b/cabal-install/src/Distribution/Client/ProjectPlanning.hs
@@ -1221,6 +1221,7 @@ planPackages verbosity comp platform solver SolverSettings{..}
     -- TODO: long-term, this compatibility matrix should be
     --       stored as a field inside 'Distribution.Compiler.Compiler'
     setupMinCabalVersionConstraint
+      | isGHC, compVer >= mkVersion [9,6]  = mkVersion [3,10]
       | isGHC, compVer >= mkVersion [9,4]  = mkVersion [3,8]
       | isGHC, compVer >= mkVersion [9,2]  = mkVersion [3,6]
       | isGHC, compVer >= mkVersion [9,0]  = mkVersion [3,4]

diff --git a/cabal-install/src/Distribution/Client/Version.hs b/cabal-install/src/Distribution/Client/Version.hs
@@ -13,4 +13,4 @@ import Distribution.Version
 -- program coverage information generated by HPC, and hence was moved to be a standalone value.
 --
 cabalInstallVersion :: Version
-cabalInstallVersion = mkVersion [3,9]
+cabalInstallVersion = mkVersion [3,11]
diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal
@@ -28,8 +28,8 @@ common shared
   build-depends:
     , base >= 4.9 && <4.18
     -- this needs to match the in-tree lib:Cabal version
-    , Cabal ^>= 3.9.0.0
-    , Cabal-syntax ^>= 3.9.0.0
+    , Cabal ^>= 3.11.0.0
+    , Cabal-syntax ^>= 3.11.0.0
 
   ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
 
@@ -115,6 +115,6 @@ custom-setup
   -- and due to Custom complexity and ConstraintSetupCabalMaxVersion
   -- it has to be the latest release version plus
   -- you have to use the latest cabal-install release
-  setup-depends: Cabal == 3.8.*,
-                 Cabal-syntax == 3.8.*,
+  setup-depends: Cabal == 3.10.*,
+                 Cabal-syntax == 3.10.*,
                  base, filepath, directory
diff --git a/doc/conf.py b/doc/conf.py
@@ -13,7 +13,7 @@
 sys.path.insert(0, os.path.abspath('.'))
 import cabaldomain
 
-version = "3.9.0.0"
+version = "3.11.0.0"
 
 extensions = [
     'sphinx.ext.extlinks',

diff --git a/solver-benchmarks/solver-benchmarks.cabal b/solver-benchmarks/solver-benchmarks.cabal
@@ -31,7 +31,7 @@ library
     base,
     bytestring,
     containers,
-    Cabal-syntax ^>= 3.9,
+    Cabal-syntax ^>= 3.11,
     directory,
     filepath,
     optparse-applicative,