From 3d88dab16acb1fda809bf0ea488cfc59797771cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?H=C3=A9cate=20Moonlight?= Date: Tue, 20 Feb 2024 11:42:00 +0100 Subject: [PATCH] Revert "Bump version numbers to 3.10.3.0" This reverts commit 34b75586be13f7a96e03acf5620d22b12ba1a7c0. --- Cabal-syntax/Cabal-syntax.cabal | 2 +- Cabal/Cabal.cabal | 2 +- Cabal/Makefile | 2 +- bootstrap/cabal-bootstrap-gen.cabal | 2 +- cabal-install-solver/cabal-install-solver.cabal | 2 +- cabal-install/cabal-install.cabal | 2 +- cabal-testsuite/cabal-testsuite.cabal | 8 ++++---- doc/conf.py | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cabal-syntax/Cabal-syntax.cabal b/Cabal-syntax/Cabal-syntax.cabal index cb943ac42..5a4429ecd 100644 --- 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.10.3.0 +version: 3.10.2.0 copyright: 2003-2023, Cabal Development Team (see AUTHORS file) license: BSD-3-Clause license-file: LICENSE diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index 29ec0efcb..d0087dd22 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: Cabal -version: 3.10.3.0 +version: 3.10.2.1 copyright: 2003-2023, Cabal Development Team (see AUTHORS file) license: BSD-3-Clause license-file: LICENSE diff --git a/Cabal/Makefile b/Cabal/Makefile index cb81a9602..7c85b735a 100644 --- a/Cabal/Makefile +++ b/Cabal/Makefile @@ -1,4 +1,4 @@ -VERSION=3.10.3.0 +VERSION=3.10.2.1 #KIND=devel KIND=rc diff --git a/bootstrap/cabal-bootstrap-gen.cabal b/bootstrap/cabal-bootstrap-gen.cabal index e3b0df660..df75818be 100644 --- a/bootstrap/cabal-bootstrap-gen.cabal +++ b/bootstrap/cabal-bootstrap-gen.cabal @@ -11,7 +11,7 @@ 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 || ^>=3.10.3 + , Cabal ^>=3.2.0.0 || ^>=3.4.1.0 || ^>=3.6.3.0 || ^>=3.8.1.0 || ^>=3.10.2.1 , Cabal-syntax ^>=3.8.1.0 || ^>=3.10.2.0 , cabal-install-parsers ^>=0.3.0.1 || ^>=0.4.5 || ^>=0.6 , cabal-plan ^>=0.7.0.0 diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal index 29c733c61..f0a71911b 100644 --- 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.10.3.0 +version: 3.10.2.1 synopsis: The command-line interface for Cabal and Hackage. description: The solver component used in cabal-install command-line program diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index f84303325..00119fea4 100644 --- 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.10.3.0 +Version: 3.10.2.1 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 056502af4..da6b49c3e 100644 --- a/cabal-testsuite/cabal-testsuite.cabal +++ b/cabal-testsuite/cabal-testsuite.cabal @@ -28,8 +28,8 @@ common shared build-depends: , base >= 4.9 && <4.20 -- this needs to match the in-tree lib:Cabal version - , Cabal ^>= 3.10.3.0 - , Cabal-syntax ^>= 3.10.3.0 + , Cabal ^>= 3.10.2.1 + , Cabal-syntax ^>= 3.10.2.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.10.3.0, - Cabal-syntax == 3.10.3.0, + setup-depends: Cabal == 3.10.2.1, + Cabal-syntax == 3.10.2.0, base, filepath, directory diff --git a/doc/conf.py b/doc/conf.py index a7f631111..4d4161ed8 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -13,7 +13,7 @@ import sphinx_rtd_theme sys.path.insert(0, os.path.abspath('.')) import cabaldomain -version = "3.10.3.0" +version = "3.10.2.1" extensions = [ 'sphinx.ext.extlinks', -- 2.11.4.GIT