From 8ccaa72d2f7ba126c452d65a26a403457af0b53c Mon Sep 17 00:00:00 2001 From: sheaf Date: Tue, 16 Apr 2024 16:14:49 +0200 Subject: [PATCH] Bump project version from 3.11 to 3.13 --- Cabal-QuickCheck/Cabal-QuickCheck.cabal | 6 +++--- Cabal-described/Cabal-described.cabal | 6 +++--- Cabal-hooks/Cabal-hooks.cabal | 4 ++-- Cabal-syntax/Cabal-syntax.cabal | 2 +- Cabal-tree-diff/Cabal-tree-diff.cabal | 6 +++--- Cabal/Cabal.cabal | 4 ++-- Cabal/Makefile | 2 +- cabal-install-solver/cabal-install-solver.cabal | 6 +++--- cabal-install/cabal-install.cabal | 6 +++--- .../package-with-hooks/package-with-hooks.cabal | 2 +- .../PackageTests/NewBuild/CmdRepl/CustomSetup/foo/foo.cabal | 2 +- cabal-testsuite/cabal-testsuite.cabal | 2 +- doc/cabal-commands.rst | 2 +- doc/conf.py | 2 +- solver-benchmarks/solver-benchmarks.cabal | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Cabal-QuickCheck/Cabal-QuickCheck.cabal b/Cabal-QuickCheck/Cabal-QuickCheck.cabal index cbdb8598b55..e3789f7655a 100644 --- a/Cabal-QuickCheck/Cabal-QuickCheck.cabal +++ b/Cabal-QuickCheck/Cabal-QuickCheck.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: Cabal-QuickCheck -version: 3.11.0.0 +version: 3.13.0.0 synopsis: QuickCheck instances for types in Cabal category: Testing description: @@ -13,8 +13,8 @@ library build-depends: , base , bytestring - , Cabal ^>=3.11.0.0 - , Cabal-syntax ^>=3.11.0.0 + , Cabal ^>=3.13.0.0 + , Cabal-syntax ^>=3.13.0.0 , QuickCheck ^>=2.13.2 || ^>=2.14 exposed-modules: diff --git a/Cabal-described/Cabal-described.cabal b/Cabal-described/Cabal-described.cabal index 99b9b6c722d..cebad16950e 100644 --- a/Cabal-described/Cabal-described.cabal +++ b/Cabal-described/Cabal-described.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: Cabal-described -version: 3.11.0.0 +version: 3.13.0.0 synopsis: Described functionality for types in Cabal category: Testing, Parsec description: Provides rere bindings @@ -11,8 +11,8 @@ library ghc-options: -Wall build-depends: , base - , Cabal ^>=3.11.0.0 - , Cabal-syntax ^>=3.11.0.0 + , Cabal ^>=3.13.0.0 + , Cabal-syntax ^>=3.13.0.0 , containers , pretty , QuickCheck diff --git a/Cabal-hooks/Cabal-hooks.cabal b/Cabal-hooks/Cabal-hooks.cabal index e9768013129..b1b5f236243 100644 --- a/Cabal-hooks/Cabal-hooks.cabal +++ b/Cabal-hooks/Cabal-hooks.cabal @@ -27,8 +27,8 @@ library hs-source-dirs: src build-depends: - Cabal-syntax >= 3.11 && < 3.13, - Cabal >= 3.11 && < 3.13, + Cabal-syntax >= 3.13 && < 3.15, + Cabal >= 3.13 && < 3.15, base >= 4.9 && < 5, containers >= 0.5.0.0 && < 0.8, filepath >= 1.3.0.1 && < 1.5, diff --git a/Cabal-syntax/Cabal-syntax.cabal b/Cabal-syntax/Cabal-syntax.cabal index a6bdd769d5f..7cb73b50bae 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.11.0.0 +version: 3.13.0.0 copyright: 2003-2024, Cabal Development Team (see AUTHORS file) license: BSD-3-Clause license-file: LICENSE diff --git a/Cabal-tree-diff/Cabal-tree-diff.cabal b/Cabal-tree-diff/Cabal-tree-diff.cabal index 34e0b6de00b..a6f65532b1c 100644 --- a/Cabal-tree-diff/Cabal-tree-diff.cabal +++ b/Cabal-tree-diff/Cabal-tree-diff.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: Cabal-tree-diff -version: 3.11.0.0 +version: 3.13.0.0 synopsis: QuickCheck instances for types in Cabal category: Testing description: Provides tree-diff ToExpr instances for some types in Cabal @@ -11,8 +11,8 @@ library ghc-options: -Wall build-depends: , base - , Cabal-syntax ^>=3.11.0.0 - , Cabal ^>=3.11.0.0 + , Cabal-syntax ^>=3.13.0.0 + , Cabal ^>=3.13.0.0 , tree-diff ^>=0.1 || ^>=0.2 || ^>=0.3 exposed-modules: Data.TreeDiff.Instances.Cabal diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal index 6b35ac92e12..18713475970 100644 --- a/Cabal/Cabal.cabal +++ b/Cabal/Cabal.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: Cabal -version: 3.11.0.0 +version: 3.13.0.0 copyright: 2003-2024, Cabal Development Team (see AUTHORS file) license: BSD-3-Clause license-file: LICENSE @@ -34,7 +34,7 @@ library hs-source-dirs: src build-depends: - Cabal-syntax ^>= 3.11, + Cabal-syntax ^>= 3.13, array >= 0.4.0.1 && < 0.6, base >= 4.9 && < 5, bytestring >= 0.10.0.0 && < 0.13, diff --git a/Cabal/Makefile b/Cabal/Makefile index 4215e971b76..a99f4edaeb5 100644 --- a/Cabal/Makefile +++ b/Cabal/Makefile @@ -1,4 +1,4 @@ -VERSION=3.11.0.0 +VERSION=3.13.0.0 #KIND=devel KIND=rc diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal index 86b448ebb89..a531ef12635 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.11.0.0 +version: 3.13.0.0 synopsis: The command-line interface for Cabal and Hackage. description: The solver component used in cabal-install command-line program @@ -101,8 +101,8 @@ library , array >=0.4 && <0.6 , base >=4.10 && <4.20 , bytestring >=0.10.6.0 && <0.13 - , Cabal ^>=3.11 - , Cabal-syntax ^>=3.11 + , Cabal ^>=3.13 + , Cabal-syntax ^>=3.13 , containers >=0.5.6.2 && <0.8 , edit-distance ^>= 0.2.2 , directory >= 1.3.7.0 && < 1.4 diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index d0531c78158..7ac3b83e716 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -55,13 +55,13 @@ common base-dep build-depends: base >=4.10 && <4.20 common cabal-dep - build-depends: Cabal ^>=3.11 + build-depends: Cabal ^>=3.13 common cabal-syntax-dep - build-depends: Cabal-syntax ^>=3.11 + build-depends: Cabal-syntax ^>=3.13 common cabal-install-solver-dep - build-depends: cabal-install-solver ^>=3.11 + build-depends: cabal-install-solver ^>=3.13 library import: warnings, base-dep, cabal-dep, cabal-syntax-dep, cabal-install-solver-dep diff --git a/cabal-testsuite/PackageTests/HooksPreprocessor/package-with-hooks/package-with-hooks.cabal b/cabal-testsuite/PackageTests/HooksPreprocessor/package-with-hooks/package-with-hooks.cabal index 341b9c928ee..28c7a11a1b6 100644 --- a/cabal-testsuite/PackageTests/HooksPreprocessor/package-with-hooks/package-with-hooks.cabal +++ b/cabal-testsuite/PackageTests/HooksPreprocessor/package-with-hooks/package-with-hooks.cabal @@ -1,4 +1,4 @@ -cabal-version: 3.12 +cabal-version: 3.14 name: package-with-hooks version: 0.1.0.0 license: BSD-3-Clause diff --git a/cabal-testsuite/PackageTests/NewBuild/CmdRepl/CustomSetup/foo/foo.cabal b/cabal-testsuite/PackageTests/NewBuild/CmdRepl/CustomSetup/foo/foo.cabal index f655e2b0ee1..76ce6283257 100644 --- a/cabal-testsuite/PackageTests/NewBuild/CmdRepl/CustomSetup/foo/foo.cabal +++ b/cabal-testsuite/PackageTests/NewBuild/CmdRepl/CustomSetup/foo/foo.cabal @@ -9,7 +9,7 @@ extra-doc-files: CHANGELOG.md custom-setup setup-depends: - Cabal <= 3.11 + Cabal <= 3.13 , base common warnings diff --git a/cabal-testsuite/cabal-testsuite.cabal b/cabal-testsuite/cabal-testsuite.cabal index 56b62690268..0c98732c977 100644 --- a/cabal-testsuite/cabal-testsuite.cabal +++ b/cabal-testsuite/cabal-testsuite.cabal @@ -28,7 +28,7 @@ common shared build-depends: , base >= 4.9 && <4.20 -- this needs to match the in-tree lib:Cabal version - , Cabal ^>= 3.11.0.0 + , Cabal ^>= 3.13.0.0 ghc-options: -Wall diff --git a/doc/cabal-commands.rst b/doc/cabal-commands.rst index 9655099129a..503034d5600 100644 --- a/doc/cabal-commands.rst +++ b/doc/cabal-commands.rst @@ -312,7 +312,7 @@ Or using the json output: .. code-block:: json { - "cabal-version": "3.11.0.0", + "cabal-version": "3.13.0.0", "compiler": { "flavour": "ghc", "id": "ghc-9.6.4", diff --git a/doc/conf.py b/doc/conf.py index dfe5a1b5324..6f70381427d 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -13,7 +13,7 @@ sys.path.insert(0, os.path.abspath('.')) import cabaldomain -version = "3.11.0.0" +version = "3.13.0.0" extensions = [ 'sphinx.ext.extlinks', diff --git a/solver-benchmarks/solver-benchmarks.cabal b/solver-benchmarks/solver-benchmarks.cabal index 22ef92117fd..42ebd616f9a 100644 --- a/solver-benchmarks/solver-benchmarks.cabal +++ b/solver-benchmarks/solver-benchmarks.cabal @@ -31,7 +31,7 @@ library base, bytestring, containers, - Cabal-syntax ^>= 3.11, + Cabal-syntax ^>= 3.13, directory, filepath, optparse-applicative,