Merge pull request #6426 from phadej/bump-version-3.3

Bump version 3.3

Cabal/Cabal.cabal

@@ -1,6 +1,6 @@
 cabal-version: >=1.10
 name:          Cabal
-version:       3.1.0.0
+version:       3.3.0.0
 copyright:     2003-2019, Cabal Development Team (see AUTHORS file)
 license:       BSD3
 license-file:  LICENSE

Cabal/Distribution/InstalledPackageInfo.hs

@@ -62,7 +62,8 @@ import qualified Text.PrettyPrint    as Disp
 import Distribution.Types.InstalledPackageInfo
 import Distribution.Types.InstalledPackageInfo.FieldGrammar
 
-
+-- $setup
+-- >>> :set -XOverloadedStrings
 
 installedComponentId :: InstalledPackageInfo -> ComponentId
 installedComponentId ipi =

Cabal/Distribution/PackageDescription/Check.hs

@@ -1287,7 +1287,7 @@ checkCabalVersion pkg =
            [ prettyShow (Dependency name (eliminateMajorBoundSyntax versionRange) Set.empty)
            | Dependency name versionRange _ <- depsUsingMajorBoundSyntax ]
 
-  , checkVersion [2,1] (any (not . null)
+  , checkVersion [3,0] (any (not . null)
                         (concatMap buildInfoField
                          [ asmSources
                          , cmmSources
@@ -1296,7 +1296,7 @@ checkCabalVersion pkg =
       PackageDistInexcusable $
            "The use of 'asm-sources', 'cmm-sources', 'extra-bundled-libraries' "
         ++ " and 'extra-library-flavours' requires the package "
-        ++ " to specify at least 'cabal-version: >= 2.1'."
+        ++ " to specify at least 'cabal-version: 3.0'."
 
   , checkVersion [2,5] (any (not . null) $ buildInfoField extraDynLibFlavours) $
       PackageDistInexcusable $

Cabal/Makefile

@@ -1,4 +1,4 @@
-VERSION=3.1.0.0
+VERSION=3.3.0.0
 
 #KIND=devel
 KIND=rc

Cabal/doc/conf.py

@@ -13,7 +13,7 @@
 sys.path.insert(0, os.path.abspath('.'))
 import cabaldomain
 
-version = "3.1.0.0"
+version = "3.3.0.0"
 
 extensions = ['sphinx.ext.extlinks', 'sphinx.ext.todo']
 

appveyor.yml

@@ -55,7 +55,7 @@ build_script:
   - cabal %CABOPTS% v2-test Cabal
   - appveyor-retry cabal %CABOPTS% v2-build exe:cabal exe:cabal-tests --only-dependencies
   - cabal %CABOPTS% v2-build exe:cabal
-  - cabal %CABOPTS% v2-run cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.1.0.0\x\cabal\build\cabal\cabal.exe
+  - cabal %CABOPTS% v2-run cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.6.5\cabal-install-3.3.0.0\x\cabal\build\cabal\cabal.exe
   - appveyor-retry cabal %CABOPTS% v2-build cabal-install:tests --only-dependencies
   - cd cabal-install
   - cabal %CABOPTS% v2-run cabal-install:memory-usage-tests

cabal-install/Distribution/Client/ProjectPlanning.hs

@@ -1094,6 +1094,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 [8,10] = mkVersion [3,2]
       | isGHC, compVer >= mkVersion [8,8]  = mkVersion [3,0]
       | isGHC, compVer >= mkVersion [8,6]  = mkVersion [2,4]
       | isGHC, compVer >= mkVersion [8,4]  = mkVersion [2,2]

cabal-install/bootstrap.sh

@@ -224,8 +224,8 @@ NETWORK_URI_VER="2.6.1.0"; NETWORK_URI_VER_REGEXP="2\.6\.(0\.[2-9]|[1-9])"
                        # >= 2.6.0.2 && < 2.7
 NETWORK_VER="2.7.0.0"; NETWORK_VER_REGEXP="2\.[0-7]\."
                        # >= 2.0 && < 2.7
-CABAL_VER="3.1.0.0";   CABAL_VER_REGEXP="3\.1\.[0-9]"
-                       # >= 2.5 && < 2.6
+CABAL_VER="3.3.0.0";   CABAL_VER_REGEXP="3\.3\.[0-9]"
+                       # >= 3.3 && < 3.4
 TRANS_VER="0.5.5.0";   TRANS_VER_REGEXP="0\.[45]\."
                        # >= 0.2.* && < 0.6
 MTL_VER="2.2.2";       MTL_VER_REGEXP="[2]\."

cabal-install/cabal-install.cabal

@@ -4,7 +4,7 @@ Cabal-Version:      >= 1.10
 -- To update this file, edit 'cabal-install.cabal.pp' and run
 -- 'make cabal-install-prod' in the project's root folder.
 Name:               cabal-install
-Version:            3.1.0.0
+Version:            3.3.0.0
 Synopsis:           The command-line interface for Cabal and Hackage.
 Description:
     The \'cabal\' command-line program simplifies the process of managing
@@ -318,7 +318,7 @@ executable cabal
         base16-bytestring >= 0.1.1 && < 0.2,
         binary     >= 0.7.3    && < 0.9,
         bytestring >= 0.10.6.0 && < 0.11,
-        Cabal      == 3.1.*,
+        Cabal      == 3.3.*,
         containers >= 0.5.6.2  && < 0.7,
         cryptohash-sha256 >= 0.11 && < 0.12,
         deepseq    >= 1.4.1.1  && < 1.5,

cabal-install/cabal-install.cabal.pp

@@ -10,7 +10,7 @@
 -- To update this file, edit 'cabal-install.cabal.pp' and run
 -- 'make cabal-install-prod' in the project's root folder.
 Name:               cabal-install
-Version:            3.1.0.0
+Version:            3.3.0.0
 #
 # NOTE: when updating build-depends, don't forget to update version regexps in bootstrap.sh.
 #
@@ -22,7 +22,7 @@
         base16-bytestring >= 0.1.1 && < 0.2,
         binary     >= 0.7.3    && < 0.9,
         bytestring >= 0.10.6.0 && < 0.11,
-        Cabal      == 3.1.*,
+        Cabal      == 3.3.*,
         containers >= 0.5.6.2  && < 0.7,
         cryptohash-sha256 >= 0.11 && < 0.12,
         deepseq    >= 1.4.1.1  && < 1.5,
@@ -488,7 +488,7 @@
 
     cpp-options: -DMONOLITHIC
     build-depends:
-        Cabal      == 3.1.*,
+        Cabal      == 3.3.*,
         cabal-install-solver-dsl,
         QuickCheck >= 2.8.2,
         array,

cabal-testsuite/cabal-testsuite.cabal

@@ -28,7 +28,7 @@ common shared
   build-depends:
     , base >= 4.6 && <4.14
     -- this needs to match the in-tree lib:Cabal version
-    , Cabal == 3.1.0.0
+    , Cabal == 3.3.0.0
 
   ghc-options: -Wall -fwarn-tabs
 
@@ -103,5 +103,5 @@ executable setup
 
 custom-setup
   -- we only depend on even stable releases of lib:Cabal
-  setup-depends: Cabal == 2.2.* || == 2.4.* || == 3.0.* || ==3.1.*,
+  setup-depends: Cabal == 2.2.* || == 2.4.* || == 3.0.*,
                  base, filepath, directory

travis-common.sh

@@ -1,7 +1,7 @@
 set -e
 
-CABAL_VERSION="3.1.0.0"
-CABAL_INSTALL_VERSION="3.1.0.0"
+CABAL_VERSION="3.3.0.0"
+CABAL_INSTALL_VERSION="3.3.0.0"
 
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
     ARCH="x86_64-linux"

travis-deploy.sh

@@ -8,7 +8,7 @@ deploy() {
     (cd cabal-website && git checkout --track -b gh-pages origin/gh-pages)
     rm -rf cabal-website/doc
     mkdir -p cabal-website/doc/html
-    mv dist-newstyle/build/`uname -m`-$TRAVIS_OS_NAME/ghc-$GHCVER/Cabal-3.1.0.0/doc/html/Cabal \
+    mv dist-newstyle/build/`uname -m`-$TRAVIS_OS_NAME/ghc-$GHCVER/Cabal-3.3.0.0/doc/html/Cabal \
        cabal-website/doc/html/Cabal
     (cd cabal-website && git add --all .)
     (cd cabal-website && \