Skip to content

Commit f81b46a

Browse files
committed
Bump project version from 3.11 to 3.13
1 parent 0863c2b commit f81b46a

File tree

28 files changed

+10132
-3157
lines changed

28 files changed

+10132
-3157
lines changed

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.13.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.13.0.0
17+
, Cabal-syntax ^>=3.13.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.13.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.13.0.0
15+
, Cabal-syntax ^>=3.13.0.0
1616
, containers
1717
, pretty
1818
, QuickCheck

Cabal-hooks/Cabal-hooks.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ library
2727
hs-source-dirs: src
2828

2929
build-depends:
30-
Cabal-syntax >= 3.11 && < 3.13,
31-
Cabal >= 3.11 && < 3.13,
30+
Cabal-syntax >= 3.13 && < 3.15,
31+
Cabal >= 3.13 && < 3.15,
3232
base >= 4.9 && < 5,
3333
containers >= 0.5.0.0 && < 0.8,
3434
filepath >= 1.3.0.1 && < 1.5,

Cabal-hooks/src/Distribution/Simple/SetupHooks.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ Usage example:
266266
> base >= 4.18 && < 5,
267267
> Cabal-hooks >= 0.1 && < 0.2
268268
>
269-
> The declared Cabal version should also be at least 3.12.
269+
> The declared Cabal version should also be at least 3.14.
270270
271271
> -- In SetupHooks.hs, next to your .cabal file
272272
> module SetupHooks where

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.13.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.13.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.13.0.0
15+
, Cabal ^>=3.13.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.13.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.13,
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.13.0.0
22

33
#KIND=devel
44
KIND=rc

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ bootstrap-json-%: phony
235235
cd bootstrap && cabal run -v0 cabal-bootstrap-gen -- linux-$*.plan.json \
236236
| python3 -m json.tool > linux-$*.json
237237

238-
BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.7 9.4.4
238+
BOOTSTRAP_GHC_VERSIONS := 8.10.7 9.0.2 9.2.8 9.4.8 9.6.4 9.8.2
239239

240240
.PHONY: bootstrap-jsons
241241
bootstrap-jsons: $(BOOTSTRAP_GHC_VERSIONS:%=bootstrap-json-%)

bootstrap/bootstrap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class PackageSource(Enum):
7979

8080
FetchPlan = Dict[Path, FetchInfo]
8181

82-
local_packages: List[PackageName] = ["Cabal-syntax", "Cabal", "cabal-install-solver", "cabal-install"]
82+
local_packages: List[PackageName] = ["Cabal-syntax", "Cabal", "Cabal-hooks", "cabal-install-solver", "cabal-install"]
8383

8484
class Compiler:
8585
def __init__(self, ghc_path: Path):

bootstrap/cabal-bootstrap-gen.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ executable cabal-bootstrap-gen
99
main-is: Main.hs
1010
build-depends:
1111
, 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
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
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.8.1.0 || ^>=3.10.1.0
14+
, Cabal ^>=3.4.1.0 || ^>=3.6.3.0 || ^>=3.10.1.0 || ^>=3.12.1.0
15+
, Cabal-syntax ^>=3.8.1.0 || ^>=3.10.1.0 || ^>=3.12.1.0
1616
-- For the release process, we need the last *two* Cabal-syntax
1717
-- versions here: one to make CI green when release Cabal-syntax is
1818
-- not yet on Hackage and we are bumping versions. The second for

bootstrap/generate_bootstrap_plans

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ run "9_0_2"
2020
run "9_2_8"
2121
run "9_4_8"
2222
run "9_6_4"
23-
run "9_8_1"
23+
run "9_8_2"

0 commit comments

Comments
 (0)