Bump Cabal versions from 2.5 -> 3.0

hvr · Mar 6, 2019 · 8daff80 · 8daff80
1 parent 252b4c8
commit 8daff80
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 19 deletions.
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -1,5 +1,6 @@
+cabal-version: >=1.10
 name:          Cabal
-version:       2.5.0.0
+version:       3.0.0.0
 copyright:     2003-2018, Cabal Development Team (see AUTHORS file)
 license:       BSD3
 license-file:  LICENSE
@@ -16,7 +17,6 @@ description:
   The Haskell Cabal is part of a larger infrastructure for distributing,
   organizing, and cataloging Haskell libraries and tools.
 category:       Distribution
-cabal-version:  >=1.10
 build-type:     Simple
 -- If we use a new Cabal feature, this needs to be changed to Custom so
 -- we can bootstrap.

diff --git a/Cabal/ChangeLog.md b/Cabal/ChangeLog.md
@@ -1,4 +1,4 @@
-# 2.6.0.0 (current development version)
+# 3.0.0.0 (current development version)
   * TODO
   * Introduce set notation for `^>=` and `==` operators.
   * 'check' reports warnings for various ghc-\*-options fields separately

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

diff --git a/Cabal/doc/conf.py b/Cabal/doc/conf.py
@@ -13,7 +13,7 @@
 sys.path.insert(0, os.path.abspath('.'))
 import cabaldomain
 
-version = "2.5.0.0"
+version = "3.0.0.0"
 
 extensions = ['sphinx.ext.extlinks', 'sphinx.ext.todo']
 

diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
@@ -224,7 +224,7 @@ 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="2.5.0.0";   CABAL_VER_REGEXP="2\.5\.[0-9]"
+CABAL_VER="3.0.0.0";   CABAL_VER_REGEXP="3\.0\.[0-9]"
                        # >= 2.5 && < 2.6
 TRANS_VER="0.5.5.0";   TRANS_VER_REGEXP="0\.[45]\."
                        # >= 0.2.* && < 0.6

diff --git a/cabal-install/cabal-install.cabal b/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:            2.5.0.0
+Version:            3.0.0.0
 Synopsis:           The command-line interface for Cabal and Hackage.
 Description:
     The \'cabal\' command-line program simplifies the process of managing
@@ -311,7 +311,7 @@ executable cabal
         base16-bytestring >= 0.1.1 && < 0.2,
         binary     >= 0.7.3    && < 0.9,
         bytestring >= 0.10.6.0 && < 0.11,
-        Cabal      == 2.5.*,
+        Cabal      == 3.0.*,
         containers >= 0.5.6.2  && < 0.7,
         cryptohash-sha256 >= 0.11 && < 0.12,
         deepseq    >= 1.4.1.1  && < 1.5,

diff --git a/cabal-install/cabal-install.cabal.pp b/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:            2.5.0.0
+Version:            3.0.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      == 2.5.*,
+        Cabal      == 3.0.*,
         containers >= 0.5.6.2  && < 0.7,
         cryptohash-sha256 >= 0.11 && < 0.12,
         deepseq    >= 1.4.1.1  && < 1.5,
@@ -472,7 +472,7 @@
 
     cpp-options: -DMONOLITHIC
     build-depends:
-        Cabal      == 2.5.*,
+        Cabal      == 3.0.*,
         cabal-install-solver-dsl,
         QuickCheck >= 2.8.2,
         array,

diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal
@@ -1,5 +1,5 @@
 name:          cabal-testsuite
-version:       2.5.0.0
+version:       3.0.0.0
 copyright:     2003-2018, Cabal Development Team (see AUTHORS file)
 license:       BSD3
 license-file:  LICENSE
@@ -64,7 +64,7 @@ executable cabal-tests
   build-depends:
     async,
     base,
-    Cabal == 2.5.0.0,
+    Cabal == 3.0.0.0,
     clock,
     filepath,
     process,
@@ -81,5 +81,5 @@ custom-setup
   -- lib:Cabal dependency, and some stable lib:Cabal version for its
   -- custom-setup's one (due to 'setupMaxCabalVersionConstraint' in
   -- 'D.C.ProjectPlanning').
-  setup-depends: Cabal == 2.5.0.0,
+  setup-depends: Cabal == 3.0.0.0,
                  base
diff --git a/solver-benchmarks/solver-benchmarks.cabal b/solver-benchmarks/solver-benchmarks.cabal
@@ -1,5 +1,5 @@
 name:          solver-benchmarks
-version:       2.5.0.0
+version:       3.0.0.0
 copyright:     2003-2017, Cabal Development Team (see AUTHORS file)
 license:       BSD3
 license-file:  LICENSE

diff --git a/travis-common.sh b/travis-common.sh
@@ -1,8 +1,8 @@
 set -e
 
 HACKAGE_REPO_TOOL_VERSION="0.1.1.1"
-CABAL_VERSION="2.5.0.0"
-CABAL_INSTALL_VERSION="2.5.0.0"
+CABAL_VERSION="3.0.0.0"
+CABAL_INSTALL_VERSION="3.0.0.0"
 
 if [ "$TRAVIS_OS_NAME" = "linux" ]; then
     ARCH="x86_64-linux"

diff --git a/travis-deploy.sh b/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-2.5.0.0/doc/html/Cabal \
+    mv dist-newstyle/build/`uname -m`-$TRAVIS_OS_NAME/ghc-$GHCVER/Cabal-3.0.0.0/doc/html/Cabal \
        cabal-website/doc/html/Cabal
     (cd cabal-website && git add --all .)
     (cd cabal-website && \

diff --git a/validate.sh b/validate.sh
@@ -177,7 +177,7 @@ timed $CABALPLAN --version
 #######################################################################
 
 # NOTE: This should match cabal-testsuite version
-CABAL_VERSION="2.5.0.0"
+CABAL_VERSION="3.0.0.0"
 
 if [ "$(uname)" = "Linux" ]; then
     ARCH="x86_64-linux"