Skip to content

Commit

Permalink
Merge pull request #78 from LeapYear/chinn/ghc-9.2
Browse files Browse the repository at this point in the history
Support GHC 9.2
  • Loading branch information
brandon-leapyear committed Nov 13, 2021
2 parents d9aa6ab + 29e7b74 commit 384f97c
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,9 @@ workflows:
- run_build_and_test:
name: test_latest
latest: true
- run_build_and_test:
name: test_ghc_9.2
stack_yaml: stack-ghc-9.2.yaml
- run_build_and_test:
name: test_ghc_9.0
stack_yaml: stack-ghc-9.0.yaml
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
.stack-work/
/.ci/
stack-ghc-*.yaml.lock
6 changes: 3 additions & 3 deletions aeson-schemas.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ library
, first-class-families >=0.3.0.0 && <0.9
, hashable >=1.2.7.0 && <1.5
, megaparsec >=6.0.0 && <10
, template-haskell >=2.12.0.0 && <2.18
, template-haskell >=2.12.0.0 && <2.19
, text >=1.2.2.2 && <1.3
, unordered-containers >=0.2.8.0 && <0.3
if impl(ghc >= 8.0)
Expand Down Expand Up @@ -133,7 +133,7 @@ test-suite aeson-schemas-test
, tasty-golden
, tasty-hunit
, tasty-quickcheck
, template-haskell >=2.12.0.0 && <2.18
, template-haskell >=2.12.0.0 && <2.19
, text >=1.2.2.2 && <1.3
, th-orphans
, th-test-utils
Expand Down Expand Up @@ -169,7 +169,7 @@ benchmark aeson-schemas-bench
, first-class-families >=0.3.0.0 && <0.9
, hashable >=1.2.7.0 && <1.5
, megaparsec >=6.0.0 && <10
, template-haskell >=2.12.0.0 && <2.18
, template-haskell >=2.12.0.0 && <2.19
, text >=1.2.2.2 && <1.3
, th-test-utils
, unordered-containers >=0.2.8.0 && <0.3
Expand Down
2 changes: 1 addition & 1 deletion package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies:
- first-class-families >= 0.3.0.0 && < 0.9
- hashable >= 1.2.7.0 && < 1.5
- megaparsec >= 6.0.0 && < 10
- template-haskell >= 2.12.0.0 && < 2.18
- template-haskell >= 2.12.0.0 && < 2.19
- text >= 1.2.2.2 && < 1.3
- unordered-containers >= 0.2.8.0 && < 0.3

Expand Down
4 changes: 3 additions & 1 deletion stack-ghc-9.0.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
resolver: nightly-2021-10-07
resolver: nightly-2021-11-12

extra-deps:
- aeson-2.0.0.0
- aeson-qq-0.8.4
# https://github.com/simonmar/happy/issues/215
- happy-1.20.0

ghc-options:
'$locals': -Werror
22 changes: 22 additions & 0 deletions stack-ghc-9.2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
resolver: nightly-2021-11-12
compiler: ghc-9.2.1

extra-deps:
- aeson-2.0.2.0
- attoparsec-0.14.2
- base-compat-0.12.1
- base-compat-batteries-0.12.1
- th-test-utils-1.1.1
# https://github.com/simonmar/happy/issues/215
- happy-1.20.0
# https://github.com/DanBurton/haskell-src-meta/pull/23
- github: DanBurton/haskell-src-meta
commit: 3f521f9f14d0bd135d352dc8fae19151b6077f77
subdirs:
- haskell-src-meta
# https://github.com/haskell-hint/hint/pull/139
- github: haskell-hint/hint
commit: 068c1960bbb92477172c10c23c3033e3b3d172d1

ghc-options:
'$locals': -Werror

0 comments on commit 384f97c

Please sign in to comment.