Skip to content

Commit

Permalink
Bump cabal version numbers and bounds to 3.10 for release
Browse files Browse the repository at this point in the history
  • Loading branch information
Mikolaj committed Feb 23, 2023
1 parent 105196f commit b957e46
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 29 deletions.
6 changes: 3 additions & 3 deletions Cabal-QuickCheck/Cabal-QuickCheck.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: Cabal-QuickCheck
version: 3.9.0.0
version: 3.10.1.0
synopsis: QuickCheck instances for types in Cabal
category: Testing
description:
Expand All @@ -13,8 +13,8 @@ library
build-depends:
, base
, bytestring
, Cabal ^>=3.9.0.0
, Cabal-syntax ^>=3.9.0.0
, Cabal ^>=3.10.0.0
, Cabal-syntax ^>=3.10.0.0
, QuickCheck ^>=2.13.2 || ^>=2.14

exposed-modules:
Expand Down
6 changes: 3 additions & 3 deletions Cabal-described/Cabal-described.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: Cabal-described
version: 3.9.0.0
version: 3.10.1.0
synopsis: Described functionality for types in Cabal
category: Testing, Parsec
description: Provides rere bindings
Expand All @@ -11,8 +11,8 @@ library
ghc-options: -Wall
build-depends:
, base
, Cabal ^>=3.9.0.0
, Cabal-syntax ^>=3.9.0.0
, Cabal ^>=3.10.0.0
, Cabal-syntax ^>=3.10.0.0
, containers
, pretty
, QuickCheck
Expand Down
2 changes: 1 addition & 1 deletion Cabal-syntax/Cabal-syntax.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: Cabal-syntax
version: 3.9.0.0
version: 3.10.1.0
copyright: 2003-2023, Cabal Development Team (see AUTHORS file)
license: BSD-3-Clause
license-file: LICENSE
Expand Down
1 change: 1 addition & 0 deletions Cabal-syntax/src/Distribution/CabalSpecVersion.hs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ data CabalSpecVersion
| CabalSpecV3_4
| CabalSpecV3_6
| CabalSpecV3_8
-- 3.10: no changes
deriving (Eq, Ord, Show, Read, Enum, Bounded, Typeable, Data, Generic)

instance Binary CabalSpecVersion
Expand Down
6 changes: 3 additions & 3 deletions Cabal-tree-diff/Cabal-tree-diff.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: Cabal-tree-diff
version: 3.9.0.0
version: 3.10.1.0
synopsis: QuickCheck instances for types in Cabal
category: Testing
description: Provides tree-diff ToExpr instances for some types in Cabal
Expand All @@ -11,8 +11,8 @@ library
ghc-options: -Wall
build-depends:
, base
, Cabal-syntax ^>=3.9.0.0
, Cabal ^>=3.9.0.0
, Cabal-syntax ^>=3.10.0.0
, Cabal ^>=3.10.0.0
, tree-diff ^>=0.1 || ^>=0.2

exposed-modules: Data.TreeDiff.Instances.Cabal
Expand Down
4 changes: 2 additions & 2 deletions Cabal/Cabal.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: Cabal
version: 3.9.0.0
version: 3.10.1.0
copyright: 2003-2023, Cabal Development Team (see AUTHORS file)
license: BSD-3-Clause
license-file: LICENSE
Expand Down Expand Up @@ -34,7 +34,7 @@ library
hs-source-dirs: src

build-depends:
Cabal-syntax ^>= 3.9,
Cabal-syntax ^>= 3.10,
array >= 0.4.0.1 && < 0.6,
base >= 4.9 && < 5,
bytestring >= 0.10.0.0 && < 0.12,
Expand Down
2 changes: 1 addition & 1 deletion Cabal/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=3.9.0.0
VERSION=3.10.1.0

#KIND=devel
KIND=rc
Expand Down
4 changes: 2 additions & 2 deletions bootstrap/cabal-bootstrap-gen.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ 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
, Cabal-syntax ^>=3.8.1.0
, Cabal ^>=3.2.0.0 || ^>=3.4.1.0 || ^>=3.6.3.0 || ^>=3.8.1.0 || ^>=3.10.1.0
, Cabal-syntax ^>=3.8.1.0 || ^>=3.10.1.0
, cabal-install-parsers ^>=0.3.0.1 || ^>=0.4.5 || ^>=0.6
, cabal-plan ^>=0.7.0.0
, containers ^>=0.6.0.1
Expand Down
6 changes: 3 additions & 3 deletions cabal-install-solver/cabal-install-solver.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: cabal-install-solver
version: 3.9.0.0
version: 3.10.1.0
synopsis: The command-line interface for Cabal and Hackage.
description:
The solver component used in cabal-install command-line program
Expand Down Expand Up @@ -107,8 +107,8 @@ library
, array >=0.4 && <0.6
, base >=4.10 && <4.18
, bytestring >=0.10.6.0 && <0.12
, Cabal ^>=3.9
, Cabal-syntax ^>=3.9
, Cabal ^>=3.10
, Cabal-syntax ^>=3.10
, containers >=0.5.6.2 && <0.7
, edit-distance ^>= 0.2.2
, filepath ^>=1.4.0.0
Expand Down
8 changes: 4 additions & 4 deletions cabal-install/cabal-install.cabal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Cabal-Version: 2.2

Name: cabal-install
Version: 3.9.0.0
Version: 3.10.1.0
Synopsis: The command-line interface for Cabal and Hackage.
Description:
The \'cabal\' command-line program simplifies the process of managing
Expand Down Expand Up @@ -49,13 +49,13 @@ common base-dep
build-depends: base >=4.10 && <4.18

common cabal-dep
build-depends: Cabal ^>=3.9
build-depends: Cabal ^>=3.10

common cabal-syntax-dep
build-depends: Cabal-syntax ^>=3.9
build-depends: Cabal-syntax ^>=3.10

common cabal-install-solver-dep
build-depends: cabal-install-solver ^>=3.9
build-depends: cabal-install-solver ^>=3.10

library
import: warnings, base-dep, cabal-dep, cabal-syntax-dep, cabal-install-solver-dep
Expand Down
2 changes: 2 additions & 0 deletions cabal-install/src/Distribution/Client/ProjectPlanning.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1200,6 +1200,7 @@ planPackages verbosity comp platform solver SolverSettings{..}
-- respective major Cabal version bundled with the respective GHC
-- release).
--
-- etc.
-- GHC 9.2 needs Cabal >= 3.6
-- GHC 9.0 needs Cabal >= 3.4
-- GHC 8.10 needs Cabal >= 3.2
Expand All @@ -1216,6 +1217,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 [9,6] = mkVersion [3,10]
| isGHC, compVer >= mkVersion [9,4] = mkVersion [3,8]
| isGHC, compVer >= mkVersion [9,2] = mkVersion [3,6]
| isGHC, compVer >= mkVersion [9,0] = mkVersion [3,4]
Expand Down
2 changes: 1 addition & 1 deletion cabal-install/src/Distribution/Client/Version.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ import Distribution.Version
-- program coverage information generated by HPC, and hence was moved to be a standalone value.
--
cabalInstallVersion :: Version
cabalInstallVersion = mkVersion [3,9]
cabalInstallVersion = mkVersion [3,10,1,0]
8 changes: 4 additions & 4 deletions cabal-testsuite/cabal-testsuite.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ common shared
build-depends:
, base >= 4.9 && <4.18
-- this needs to match the in-tree lib:Cabal version
, Cabal ^>= 3.9.0.0
, Cabal-syntax ^>= 3.9.0.0
, Cabal ^>= 3.10.0.0
, Cabal-syntax ^>= 3.10.0.0

ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns

Expand Down Expand Up @@ -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.8.*,
Cabal-syntax == 3.8.*,
setup-depends: Cabal == 3.10.*,
Cabal-syntax == 3.10.*,
base, filepath, directory
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
sys.path.insert(0, os.path.abspath('.'))
import cabaldomain

version = "3.9.0.0"
version = "3.10.1.0"

extensions = [
'sphinx.ext.extlinks',
Expand Down
2 changes: 1 addition & 1 deletion solver-benchmarks/solver-benchmarks.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ library
base,
bytestring,
containers,
Cabal-syntax ^>= 3.9,
Cabal-syntax ^>= 3.10,
directory,
filepath,
optparse-applicative,
Expand Down

0 comments on commit b957e46

Please sign in to comment.