From 9a10932e1fe02ab3706a94b29b09af2ccc14bc58 Mon Sep 17 00:00:00 2001 From: Fraser Tweedale Date: Tue, 31 Oct 2023 15:44:42 +1000 Subject: [PATCH] deps: switch to crypton Switch to the crypton ecosystem. This also reset the lowest supported GHC version to 8.8, so bump the *base* min bound to the corresponding version. Fixes: https://github.com/frasertweedale/hs-jose/issues/114 --- .github/workflows/haskell-ci.yml | 24 ++---------------------- CHANGELOG.md | 12 ++++++++++++ jose.cabal | 12 ++++++------ 3 files changed, 20 insertions(+), 28 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 75f4423..0bb185d 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -63,26 +63,6 @@ jobs: compilerVersion: 8.8.4 setup-method: hvr-ppa allow-failure: false - - compiler: ghc-8.6.5 - compilerKind: ghc - compilerVersion: 8.6.5 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.4.4 - compilerKind: ghc - compilerVersion: 8.4.4 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.2.2 - compilerKind: ghc - compilerVersion: 8.2.2 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.0.2 - compilerKind: ghc - compilerVersion: 8.0.2 - setup-method: hvr-ppa - allow-failure: false fail-fast: false steps: - name: apt @@ -228,8 +208,8 @@ jobs: touch cabal.project touch cabal.project.local echo "packages: ${PKGDIR_jose}" >> cabal.project - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package jose" >> cabal.project ; fi - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi + echo "package jose" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project cat >> cabal.project <> cabal.project.local diff --git a/CHANGELOG.md b/CHANGELOG.md index 1216394..5eaac46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## Version NEXT + +- Migrate to the *crypton* library ecosystem. *crypton* was a hard + fork of *cryptonite*, which was no longer maintained. With this + change, the minimum supported version of GHC increased to 8.8. + There are no other notable changes in this release. + +- The `v0.10` series is the last release series to support + *cryptonite*. It will continue to receive important bug fixes + until the end of 2024. + + ## Version 0.10 (2022-09-01) - Introduce `newtype JOSE e m a` which behaves like `ExceptT e m a` diff --git a/jose.cabal b/jose.cabal index 4246c2d..e22e213 100644 --- a/jose.cabal +++ b/jose.cabal @@ -33,7 +33,7 @@ copyright: Copyright (C) 2013-2021 Fraser Tweedale category: Cryptography build-type: Simple tested-with: - GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.7 || ==9.6.3 || == 9.8.1 + GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.7 || ==9.6.3 || == 9.8.1 flag demos description: Build demonstration programs @@ -76,7 +76,7 @@ common common -Wredundant-strictness-flags build-depends: - base >= 4.9 && < 5 + base >= 4.13 && < 5 , bytestring >= 0.10 && < 0.13 , lens >= 4.16 , mtl >= 2.2.1 @@ -111,14 +111,14 @@ library , base64-bytestring >= 1.2.1.0 && < 1.3 , concise >= 0.1 , containers >= 0.5 - , cryptonite >= 0.24 + , crypton >= 0.31 , memory >= 0.7 , monad-time >= 0.3 , template-haskell >= 2.11 , text >= 1.1 , time >= 1.5 , network-uri >= 2.6 - , x509 >= 1.4 + , crypton-x509 >= 1.7.6 hs-source-dirs: src @@ -144,10 +144,10 @@ test-suite tests , aeson , base64-bytestring , containers - , cryptonite + , crypton , time , network-uri - , x509 + , crypton-x509 , pem , concise