Skip to content

Commit 7d140c5

Browse files
authored
Bump version numbers for 3.12.0.0 (#9788)
* Bump version numbers for 3.12.0.0 Version fields, constraints, licences, and bootstrap. ☞ N.B.: - This commit removes 8.10.7 from bootstrap list. - This release only deals with Cabal, not cabal-install. * Update index state in cabal.project.release This is needed since we need the new (0.6.2.5) release of hackage-security. * Regenerate bootstrap .json files
1 parent e867d30 commit 7d140c5

22 files changed

+2587
-2662
lines changed

.github/workflows/bootstrap.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
matrix:
3232
os: [ubuntu-latest]
33-
ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.4", "9.8.1"]
33+
ghc: ["9.0.2", "9.2.8", "9.4.8", "9.6.4", "9.8.2"]
3434
include:
3535
- os: macos-latest
3636
ghc: "9.2.8"

.github/workflows/validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
matrix:
6969
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
7070
# If you remove something from here.. then add it to the old-ghcs job.
71-
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"]
71+
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"]
7272
exclude:
7373
# corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356
7474
- os: "windows-latest"

Cabal-QuickCheck/Cabal-QuickCheck.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-QuickCheck
3-
version: 3.11.0.0
3+
version: 3.12.0.0
44
synopsis: QuickCheck instances for types in Cabal
55
category: Testing
66
description:
@@ -13,8 +13,8 @@ library
1313
build-depends:
1414
, base
1515
, bytestring
16-
, Cabal ^>=3.11.0.0
17-
, Cabal-syntax ^>=3.11.0.0
16+
, Cabal ^>=3.12.0.0
17+
, Cabal-syntax ^>=3.12.0.0
1818
, QuickCheck ^>=2.13.2 || ^>=2.14
1919

2020
exposed-modules:

Cabal-described/Cabal-described.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-described
3-
version: 3.11.0.0
3+
version: 3.12.0.0
44
synopsis: Described functionality for types in Cabal
55
category: Testing, Parsec
66
description: Provides rere bindings
@@ -11,8 +11,8 @@ library
1111
ghc-options: -Wall
1212
build-depends:
1313
, base
14-
, Cabal ^>=3.11.0.0
15-
, Cabal-syntax ^>=3.11.0.0
14+
, Cabal ^>=3.12.0.0
15+
, Cabal-syntax ^>=3.12.0.0
1616
, containers
1717
, pretty
1818
, QuickCheck

Cabal-syntax/Cabal-syntax.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-syntax
3-
version: 3.11.0.0
3+
version: 3.12.0.0
44
copyright: 2003-2024, Cabal Development Team (see AUTHORS file)
55
license: BSD-3-Clause
66
license-file: LICENSE

Cabal-tree-diff/Cabal-tree-diff.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal-tree-diff
3-
version: 3.11.0.0
3+
version: 3.12.0.0
44
synopsis: QuickCheck instances for types in Cabal
55
category: Testing
66
description: Provides tree-diff ToExpr instances for some types in Cabal
@@ -11,8 +11,8 @@ library
1111
ghc-options: -Wall
1212
build-depends:
1313
, base
14-
, Cabal-syntax ^>=3.11.0.0
15-
, Cabal ^>=3.11.0.0
14+
, Cabal-syntax ^>=3.12.0.0
15+
, Cabal ^>=3.12.0.0
1616
, tree-diff ^>=0.1 || ^>=0.2 || ^>=0.3
1717

1818
exposed-modules: Data.TreeDiff.Instances.Cabal

Cabal/Cabal.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: Cabal
3-
version: 3.11.0.0
3+
version: 3.12.0.0
44
copyright: 2003-2024, Cabal Development Team (see AUTHORS file)
55
license: BSD-3-Clause
66
license-file: LICENSE
@@ -34,7 +34,7 @@ library
3434
hs-source-dirs: src
3535

3636
build-depends:
37-
Cabal-syntax ^>= 3.11,
37+
Cabal-syntax ^>= 3.12,
3838
array >= 0.4.0.1 && < 0.6,
3939
base >= 4.9 && < 5,
4040
bytestring >= 0.10.0.0 && < 0.13,

Cabal/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=3.11.0.0
1+
VERSION=3.12.0.0
22

33
#KIND=devel
44
KIND=rc

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,13 @@ tags :
199199
##############################################################################
200200

201201
bootstrap-json-%: phony
202-
cabal build --project=cabal.project.release --with-compiler=ghc-$* --dry-run cabal-install:exe:cabal
202+
cabal build --project-file=cabal.project.release --with-compiler=ghc-$* --dry-run cabal-install:exe:cabal
203203
cp dist-newstyle/cache/plan.json bootstrap/linux-$*.plan.json
204204
@# -v0 to avoid build output on stdout
205205
cd bootstrap && cabal run -v0 cabal-bootstrap-gen -- linux-$*.plan.json \
206206
| python3 -m json.tool > linux-$*.json
207207

208-
BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.7 9.4.4
208+
BOOTSTRAP_GHC_VERSIONS := 9.0.2 9.2.8 9.4.8 9.6.4 9.8.2
209209

210210
bootstrap-jsons: $(BOOTSTRAP_GHC_VERSIONS:%=bootstrap-json-%)
211211

bootstrap/cabal-bootstrap-gen.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ executable cabal-bootstrap-gen
88
ghc-options: -Wall
99
main-is: Main.hs
1010
build-depends:
11-
, aeson ^>=1.5.2.0 || ^>=2.0.3.0 || ^>=2.1.0.0
12-
, 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
11+
, aeson ^>=1.5.2.0 || ^>=2.0.3.0 || ^>=2.1.0.0 || ^>=2.2.0.0
12+
, 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 || ^>= 4.19.0.0
1313
, bytestring ^>=0.10.8.2 || ^>=0.11.0.0
14-
, Cabal ^>=3.4.1.0 || ^>=3.6.3.0 || ^>=3.10.1.0
15-
, Cabal-syntax ^>=3.10.1.0
14+
, Cabal ^>=3.4.1.0 || ^>=3.6.3.0 || ^>=3.10.1.0 || ^>=3.12.0.0
15+
, Cabal-syntax ^>=3.10.1.0 || ^>=3.12.0.0
1616
, cabal-install-parsers ^>=0.3.0.1 || ^>=0.4.5 || ^>=0.6
1717
, cabal-plan ^>=0.7.0.0
1818
, containers ^>=0.6.0.1

0 commit comments

Comments
 (0)