From cfc8362c760beb9db2009e2f2ef3e5dadaa5caf8 Mon Sep 17 00:00:00 2001
From: Mikhail Glushenkov <mikhail.glushenkov@gmail.com>
Date: Wed, 14 Feb 2018 21:21:32 +0000
Subject: [PATCH] Version bump.
---
Cabal/Cabal.cabal | 2 +-
appveyor.yml | 4 ++--
cabal-install/bootstrap.sh | 4 ++--
cabal-install/cabal-install.cabal | 2 +-
cabal-testsuite/cabal-testsuite.cabal | 2 +-
solver-benchmarks/solver-benchmarks.cabal | 2 +-
travis-common.sh | 2 +-
travis-deploy.sh | 2 +-
validate.sh | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
mode change 100644 => 100755 validate.sh
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
index 780488cbce..74fa714add 100644
--- a/Cabal/Cabal.cabal
+++ b/Cabal/Cabal.cabal
@@ -1,5 +1,5 @@
name: Cabal
-version: 2.1.0.0
+version: 2.3.0.0
copyright: 2003-2017, Cabal Development Team (see AUTHORS file)
license: BSD3
license-file: LICENSE
diff --git a/appveyor.yml b/appveyor.yml
index 8260ef14c8..02cd630f6a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,9 +29,9 @@ build_script:
- Setup install
# hackage-repo-tool doesn't build on Windows:
# https://github.com/well-typed/hackage-security/issues/175
- # - echo "" | ..\cabal install hackage-repo-tool --allow-newer=Cabal,time --constraint="Cabal == 2.1.0.0"
+ # - echo "" | ..\cabal install hackage-repo-tool --allow-newer=Cabal,time --constraint="Cabal == 2.3.0.0"
- cd ..\cabal-testsuite
- - ghc --make -threaded -i Setup.hs -package Cabal-2.1.0.0
+ - ghc --make -threaded -i Setup.hs -package Cabal-2.3.0.0
- echo "" | ..\appveyor-retry ..\cabal install --only-dependencies --enable-tests
- Setup configure --user --ghc-option=-Werror --enable-tests
- Setup build
diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
index 8b79dd60d1..4da7c69412 100755
--- a/cabal-install/bootstrap.sh
+++ b/cabal-install/bootstrap.sh
@@ -221,8 +221,8 @@ NETWORK_VER="2.6.3.2"; NETWORK_VER_REGEXP="2\.[0-6]\."
# >= 2.0 && < 2.7
NETWORK_URI_VER="2.6.1.0"; NETWORK_URI_VER_REGEXP="2\.6\."
# >= 2.6 && < 2.7
-CABAL_VER="2.1.0.0"; CABAL_VER_REGEXP="2\.1\.[0-9]"
- # >= 2.1 && < 2.2
+CABAL_VER="2.3.0.0"; CABAL_VER_REGEXP="2\.3\.[0-9]"
+ # >= 2.3 && < 2.4
TRANS_VER="0.5.5.0"; TRANS_VER_REGEXP="0\.[45]\."
# >= 0.2.* && < 0.6
MTL_VER="2.2.1"; MTL_VER_REGEXP="[2]\."
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index 6ed5c7b447..40318bc6ed 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -1,5 +1,5 @@
Name: cabal-install
-Version: 2.1.0.0
+Version: 2.3.0.0
Synopsis: The command-line interface for Cabal and Hackage.
Description:
The \'cabal\' command-line program simplifies the process of managing
diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal
index aadd018853..bbc690a0b1 100644
--- a/cabal-testsuite/cabal-testsuite.cabal
+++ b/cabal-testsuite/cabal-testsuite.cabal
@@ -1,5 +1,5 @@
name: cabal-testsuite
-version: 2.1.0.0
+version: 2.3.0.0
copyright: 2003-2017, Cabal Development Team (see AUTHORS file)
license: BSD3
license-file: LICENSE
diff --git a/solver-benchmarks/solver-benchmarks.cabal b/solver-benchmarks/solver-benchmarks.cabal
index 757aed010e..cd247f39cc 100644
--- a/solver-benchmarks/solver-benchmarks.cabal
+++ b/solver-benchmarks/solver-benchmarks.cabal
@@ -1,5 +1,5 @@
name: solver-benchmarks
-version: 2.1.0.0
+version: 2.3.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
index 264c21f308..e85fa1dd64 100644
--- a/travis-common.sh
+++ b/travis-common.sh
@@ -1,7 +1,7 @@
set -e
HACKAGE_REPO_TOOL_VERSION="0.1.1"
-CABAL_VERSION="2.1.0.0"
+CABAL_VERSION="2.3.0.0"
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
ARCH="x86_64-linux"
diff --git a/travis-deploy.sh b/travis-deploy.sh
index d02c7ecab3..55090dcb01 100755
--- 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/Cabal-2.1.0.0/doc/html/Cabal \
+ mv dist-newstyle/build/Cabal-2.3.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
old mode 100644
new mode 100755
index 3b04f4257b..2ac342f534
--- a/validate.sh
+++ b/validate.sh
@@ -44,7 +44,7 @@ CABALTESTS=${CABALTESTS-true}
CABALINSTALLTESTS=${CABALINSTALLTESTS-true}
CABALSUITETESTS=${CABALSUITETESTS-true}
-CABAL_VERSION="2.1.0.0"
+CABAL_VERSION="2.3.0.0"
if [ "$(uname)" = "Linux" ]; then
ARCH="x86_64-linux"
else
--
GitLab