Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump project version from 3.11 to 3.13
Browse files Browse the repository at this point in the history
sheaf committed Apr 23, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 0863c2b commit dc0e4af
Showing 30 changed files with 3,239 additions and 3,148 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bootstrap.yml
Original file line number Diff line number Diff line change
@@ -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"
7 changes: 4 additions & 3 deletions Cabal-QuickCheck/Cabal-QuickCheck.cabal
Original file line number Diff line number Diff line change
@@ -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:
7 changes: 4 additions & 3 deletions Cabal-described/Cabal-described.cabal
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions Cabal-hooks/Cabal-hooks.cabal
Original file line number Diff line number Diff line change
@@ -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,
2 changes: 1 addition & 1 deletion Cabal-hooks/src/Distribution/Simple/SetupHooks.hs
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Cabal-syntax/Cabal-syntax.cabal
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions Cabal-tree-diff/Cabal-tree-diff.cabal
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions Cabal/Cabal.cabal
Original file line number Diff line number Diff line change
@@ -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,
2 changes: 1 addition & 1 deletion Cabal/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=3.11.0.0
VERSION=3.13.0.0

#KIND=devel
KIND=rc
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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-%)
10 changes: 9 additions & 1 deletion bootstrap/bootstrap.py
Original file line number Diff line number Diff line change
@@ -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):
6 changes: 3 additions & 3 deletions bootstrap/cabal-bootstrap-gen.cabal
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion bootstrap/generate_bootstrap_plans
Original file line number Diff line number Diff line change
@@ -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"
Loading

0 comments on commit dc0e4af

Please sign in to comment.