From 123291c0939789aa7c3e4970c4a22adf50c0a9ee Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Wed, 1 Aug 2018 01:36:32 +0100 Subject: [PATCH] Version bump. --- Cabal/Cabal.cabal | 2 +- Cabal/Makefile | 2 +- Cabal/doc/conf.py | 2 +- appveyor.yml | 2 +- cabal-install/bootstrap.sh | 4 ++-- cabal-install/cabal-install.cabal | 2 +- cabal-testsuite/PackageTests/Check/MissingGlobDirectory/cabal.out | 2 -- cabal-testsuite/cabal-testsuite.cabal | 2 +- solver-benchmarks/solver-benchmarks.cabal | 2 +- travis-common.sh | 2 +- travis-deploy.sh | 2 +- validate.sh | 2 +- 12 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index d79fb62a2..f9470b9aa 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -1,5 +1,5 @@ name: Cabal -version: 2.3.0.0 +version: 2.5.0.0 copyright: 2003-2018, Cabal Development Team (see AUTHORS file) license: BSD3 license-file: LICENSE diff --git a/Cabal/Makefile b/Cabal/Makefile index 88da6fed3..16b96c7a2 100644 --- a/Cabal/Makefile +++ b/Cabal/Makefile @@ -1,5 +1,5 @@ -VERSION=2.3.0.0 +VERSION=2.5.0.0 #KIND=devel KIND=rc diff --git a/Cabal/doc/conf.py b/Cabal/doc/conf.py index 4cb6b9307..408a683c9 100644 --- a/Cabal/doc/conf.py +++ b/Cabal/doc/conf.py @@ -13,7 +13,7 @@ import sphinx_rtd_theme sys.path.insert(0, os.path.abspath('.')) import cabaldomain -version = "2.3.0.0" +version = "2.5.0.0" extensions = ['sphinx.ext.extlinks'] diff --git a/appveyor.yml b/appveyor.yml index c3c1f549a..358bedac3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,7 +27,7 @@ build_script: - cabal %CABOPTS% new-test Cabal - appveyor-retry cabal %CABOPTS% new-build exe:cabal exe:cabal-tests --only-dependencies - cabal %CABOPTS% new-build exe:cabal - - cabal %CABOPTS% new-run cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.0.2\cabal-install-2.3.0.0\build\cabal\cabal.exe + - cabal %CABOPTS% new-run cabal-tests -- -j3 --with-cabal=dist-newstyle\build\x86_64-windows\ghc-8.0.2\cabal-install-2.5.0.0\build\cabal\cabal.exe - appveyor-retry cabal %CABOPTS% new-build cabal-install:tests --only-dependencies - cd cabal-install - cabal %CABOPTS% new-run cabal-install:memory-usage-tests diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh index e17c79f2e..7cd966034 100755 --- a/cabal-install/bootstrap.sh +++ b/cabal-install/bootstrap.sh @@ -221,8 +221,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="2.3.0.0"; CABAL_VER_REGEXP="2\.3\.[0-9]" - # >= 2.3 && < 2.4 +CABAL_VER="2.5.0.0"; CABAL_VER_REGEXP="2\.5\.[0-9]" + # >= 2.5 && < 2.6 TRANS_VER="0.5.5.0"; TRANS_VER_REGEXP="0\.[45]\." # >= 0.2.* && < 0.6 MTL_VER="2.2.2"; MTL_VER_REGEXP="[2]\." diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index 15e838b27..d97c39435 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -1,5 +1,5 @@ Name: cabal-install -Version: 2.3.0.0 +Version: 2.5.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/PackageTests/Check/MissingGlobDirectory/cabal.out b/cabal-testsuite/PackageTests/Check/MissingGlobDirectory/cabal.out index 763ba6844..3df4fdc03 100644 --- a/cabal-testsuite/PackageTests/Check/MissingGlobDirectory/cabal.out +++ b/cabal-testsuite/PackageTests/Check/MissingGlobDirectory/cabal.out @@ -1,6 +1,4 @@ # cabal check -Warning: The package will not build sanely due to these errors: -Warning: This package description follows version 2.4 of the Cabal specification. This tool only supports up to version 2.3.0.0. Warning: These warnings may cause trouble when distributing the package: Warning: In 'data-files': the pattern 'another-non-existent-directory/**/*.dat' attempts to match files in the directory 'another-non-existent-directory', but there is no directory by that name. Warning: In 'extra-doc-files': the pattern 'non-existent-directory/*.html' attempts to match files in the directory 'non-existent-directory', but there is no directory by that name. diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal index ab6453f7c..bd73c3a05 100644 --- a/cabal-testsuite/cabal-testsuite.cabal +++ b/cabal-testsuite/cabal-testsuite.cabal @@ -1,5 +1,5 @@ name: cabal-testsuite -version: 2.3.0.0 +version: 2.5.0.0 copyright: 2003-2018, 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 fed4f05f0..cff94a073 100644 --- a/solver-benchmarks/solver-benchmarks.cabal +++ b/solver-benchmarks/solver-benchmarks.cabal @@ -1,5 +1,5 @@ name: solver-benchmarks -version: 2.3.0.0 +version: 2.5.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 e85fa1dd6..4acad2155 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.3.0.0" +CABAL_VERSION="2.5.0.0" if [ "$TRAVIS_OS_NAME" = "linux" ]; then ARCH="x86_64-linux" diff --git a/travis-deploy.sh b/travis-deploy.sh index 243011d4d..26be19a68 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/`uname -m`-$TRAVIS_OS_NAME/ghc-$GHCVER/Cabal-2.3.0.0/doc/html/Cabal \ + mv dist-newstyle/build/`uname -m`-$TRAVIS_OS_NAME/ghc-$GHCVER/Cabal-2.5.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 index 2ac342f53..c95358595 100755 --- a/validate.sh +++ b/validate.sh @@ -44,7 +44,7 @@ CABALTESTS=${CABALTESTS-true} CABALINSTALLTESTS=${CABALINSTALLTESTS-true} CABALSUITETESTS=${CABALSUITETESTS-true} -CABAL_VERSION="2.3.0.0" +CABAL_VERSION="2.5.0.0" if [ "$(uname)" = "Linux" ]; then ARCH="x86_64-linux" else -- 2.11.4.GIT