Merge pull request haskell#9897 from sheaf/wip/bump-cabal-3-13

Bump project version from 3.11 to 3.13
erikd · Apr 23, 2024 · 3395fa1 · 3395fa1
2 parents 959d72b + 88737ef
commit 3395fa1
Show file tree

Hide file tree

Showing 31 changed files with 3,243 additions and 3,148 deletions.
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.4", "9.8.1"]
+        ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.4", "9.8.2"]
         include:
           - os: macos-latest
             ghc: "9.2.8"

diff --git a/Cabal-QuickCheck/Cabal-QuickCheck.cabal b/Cabal-QuickCheck/Cabal-QuickCheck.cabal
@@ -1,8 +1,9 @@
 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
+build-type:    Simple
 description:
   Provides QuickCheck Arbitrary instances for some types in Cabal
 
@@ -13,8 +14,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
@@ -1,18 +1,19 @@
 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
+build-type:    Simple
 
 library
   default-language: Haskell2010
   hs-source-dirs:   src
   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
@@ -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-hooks/Setup.hs b/Cabal-hooks/Setup.hs
@@ -0,0 +1,4 @@
+import Distribution.Simple
+
+main :: IO ()
+main = defaultMain
diff --git a/Cabal-hooks/src/Distribution/Simple/SetupHooks.hs b/Cabal-hooks/src/Distribution/Simple/SetupHooks.hs
@@ -266,7 +266,7 @@ Usage example:
 >     base        >= 4.18 && < 5,
 >     Cabal-hooks >= 0.1  && < 0.2
 >
-> The declared Cabal version should also be at least 3.12.
+> The declared Cabal version should also be at least 3.14.
 
 > -- In SetupHooks.hs, next to your .cabal file
 > module SetupHooks where

diff --git 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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-VERSION=3.11.0.0
+VERSION=3.13.0.0
 
 #KIND=devel
 KIND=rc

diff --git a/Makefile b/Makefile
@@ -229,13 +229,13 @@ tags :
 ##############################################################################
 
 bootstrap-json-%: phony
-	cabal build --project-file=cabal.project.release --with-compiler=ghc-$* --dry-run cabal-install:exe:cabal
+	cabal build --project-file=cabal.project.bootstrap --with-compiler=ghc-$* --dry-run cabal-install:exe:cabal
 	cp dist-newstyle/cache/plan.json bootstrap/linux-$*.plan.json
 	@# -v0 to avoid build output on stdout
 	cd bootstrap && cabal run -v0 cabal-bootstrap-gen -- linux-$*.plan.json \
 		| python3 -m json.tool > linux-$*.json
 
-BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.7 9.4.4
+BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.8 9.4.8 9.6.4 9.8.2
 
 .PHONY: bootstrap-jsons
 bootstrap-jsons: $(BOOTSTRAP_GHC_VERSIONS:%=bootstrap-json-%)

diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py
@@ -79,7 +79,15 @@ class PackageSource(Enum):
 
 FetchPlan = Dict[Path, FetchInfo]
 
-local_packages: List[PackageName] = ["Cabal-syntax", "Cabal", "cabal-install-solver", "cabal-install"]
+local_packages: List[PackageName] = [ "Cabal-syntax"
+                                    , "Cabal"
+                                    , "Cabal-hooks"
+                                    , "Cabal-QuickCheck"
+                                    , "Cabal-described"
+                                    , "Cabal-tests"
+                                    , "Cabal-tree-diff"
+                                    , "cabal-install-solver"
+                                    , "cabal-install" ]
 
 class Compiler:
     def __init__(self, ghc_path: Path):

diff --git a/bootstrap/cabal-bootstrap-gen.cabal b/bootstrap/cabal-bootstrap-gen.cabal
@@ -9,10 +9,10 @@ executable cabal-bootstrap-gen
   main-is:          Main.hs
   build-depends:
     , 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
+    , 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 || ^>=4.18.0.0
     , bytestring             ^>=0.10.8.2 || ^>=0.11.0.0
-    , Cabal                  ^>=3.4.1.0  || ^>=3.6.3.0 || ^>=3.10.1.0
-    , Cabal-syntax           ^>=3.8.1.0 || ^>=3.10.1.0
+    , Cabal                  ^>=3.4.1.0  || ^>=3.6.3.0 || ^>=3.10.1.0 || ^>=3.12.1.0
+    , Cabal-syntax           ^>=3.8.1.0 || ^>=3.10.1.0 || ^>=3.12.1.0
         -- For the release process, we need the last *two* Cabal-syntax
         -- versions here: one to make CI green when release Cabal-syntax is
         -- not yet on Hackage and we are bumping versions.  The second for

diff --git a/bootstrap/generate_bootstrap_plans b/bootstrap/generate_bootstrap_plans
@@ -20,4 +20,4 @@ run "9_0_2"
 run "9_2_8"
 run "9_4_8"
 run "9_6_4"
-run "9_8_1"
+run "9_8_2"