Bump version numbers for 3.12.0.0

Version fields, constraints, licences, and bootstrap.
ffaf1 · Mar 8, 2024 · cdf50d7 · cdf50d7
1 parent 880831f
commit cdf50d7
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 26 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/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -68,7 +68,7 @@ jobs:
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
         # If you remove something from here.. then add it to the old-ghcs job.
-        ghc: ["9.8.1", "9.6.3", "9.4.8", "9.2.8", "9.0.2", "8.10.7", "8.8.4", "8.6.5"]
+        ghc: ["9.8.2", "9.6.4", "9.4.8", "9.2.8", "9.0.2", "8.10.7", "8.8.4", "8.6.5"]
         exclude:
           # corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356
           - os: "windows-latest"

diff --git 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.12.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.12.0.0
+    , Cabal-syntax  ^>=3.12.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,6 +1,6 @@
 cabal-version: 2.2
 name:          Cabal-described
-version:       3.11.0.0
+version:       3.12.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.12.0.0
+    , Cabal-syntax      ^>=3.12.0.0
     , containers
     , pretty
     , QuickCheck

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.12.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.12.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.12.0.0
+    , Cabal         ^>=3.12.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.12.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.12,
     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.12.0.0
 
 #KIND=devel
 KIND=rc

diff --git a/Makefile b/Makefile
@@ -37,7 +37,7 @@ SPDX_EXCEPTION_HS:=Cabal-syntax/src/Distribution/SPDX/LicenseExceptionId.hs
 
 spdx : $(SPDX_LICENSE_HS) $(SPDX_EXCEPTION_HS)
 
-SPDX_LICENSE_VERSIONS:=3.0 3.2 3.6 3.9 3.10 3.16
+SPDX_LICENSE_VERSIONS:=3.0 3.2 3.6 3.9 3.10 3.16 3.23
 
 $(SPDX_LICENSE_HS) : templates/SPDX.LicenseId.template.hs cabal-dev-scripts/src/GenUtils.hs cabal-dev-scripts/src/GenSPDX.hs license-list-data/licenses-3.0.json license-list-data/licenses-3.2.json
 	cabal run --builddir=dist-newstyle-meta --project-file=cabal.project.meta gen-spdx -- templates/SPDX.LicenseId.template.hs $(SPDX_LICENSE_VERSIONS:%=license-list-data/licenses-%.json) $(SPDX_LICENSE_HS)
@@ -199,13 +199,13 @@ tags :
 ##############################################################################
 
 bootstrap-json-%: phony
-	cabal build --project=cabal.project.release --with-compiler=ghc-$* --dry-run cabal-install:exe:cabal
+	cabal build --project-file=cabal.project.release --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
 
 bootstrap-jsons: $(BOOTSTRAP_GHC_VERSIONS:%=bootstrap-json-%)
 

diff --git a/bootstrap/cabal-bootstrap-gen.cabal b/bootstrap/cabal-bootstrap-gen.cabal
@@ -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.4.1.0  || ^>=3.6.3.0 || ^>=3.10.1.0
-    , Cabal-syntax           ^>=3.10.1.0
+    , Cabal                  ^>=3.4.1.0  || ^>=3.6.3.0 || ^>=3.10.1.0 || ^>=3.12.0.0
+    , Cabal-syntax           ^>=3.12.0.0
     , cabal-install-parsers  ^>=0.3.0.1  || ^>=0.4.5 || ^>=0.6
     , cabal-plan             ^>=0.7.0.0
     , containers             ^>=0.6.0.1

diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal
@@ -103,8 +103,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.12
+    , Cabal-syntax  ^>=3.12
     , containers    >=0.5.6.2  && <0.8
     , edit-distance ^>= 0.2.2
     , filepath      ^>=1.4.0.0 || ^>=1.5.0.0

diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -54,10 +54,10 @@ common base-dep
     build-depends: base >=4.10 && <4.20
 
 common cabal-dep
-    build-depends: Cabal ^>=3.11
+    build-depends: Cabal ^>=3.12
 
 common cabal-syntax-dep
-    build-depends: Cabal-syntax ^>=3.11
+    build-depends: Cabal-syntax ^>=3.12
 
 common cabal-install-solver-dep
     build-depends: cabal-install-solver ^>=3.11

diff --git 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.11.0.0
-    , Cabal-syntax ^>= 3.11.0.0
+    , Cabal ^>= 3.12.0.0
+    , Cabal-syntax ^>= 3.12.0.0
     , Cabal-tests
 
   ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns

diff --git a/cabal.project.release b/cabal.project.release
@@ -6,3 +6,4 @@ tests: False
 benchmarks: False
 optimization: True
 index-state: hackage.haskell.org 2024-02-13T10:16:13Z
+allow-newer: hackage-security:Cabal-syntax