From e80b0e3ff1cd40d97f5a977de0626a6b41e2c351 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Sat, 18 Mar 2023 13:27:42 -0500 Subject: [PATCH] Add support for GHC 9.6.1 (#85) --- .github/workflows/workflow.yaml | 12 ++++++------ source/library/Witch.hs | 2 +- source/library/Witch/From.hs | 2 +- witch.cabal | 15 ++++++--------- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index fdc0263..75429f4 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -87,12 +87,7 @@ "version": "12" }, { - "ghc": "9.0.2", - "platform": "ubuntu", - "version": "22.04" - }, - { - "ghc": "9.2.5", + "ghc": "9.2.7", "platform": "ubuntu", "version": "22.04" }, @@ -101,6 +96,11 @@ "platform": "ubuntu", "version": "22.04" }, + { + "ghc": "9.6.1", + "platform": "ubuntu", + "version": "22.04" + }, { "extension": ".exe", "ghc": "9.4.4", diff --git a/source/library/Witch.hs b/source/library/Witch.hs index 80f4856..6bca11b 100644 --- a/source/library/Witch.hs +++ b/source/library/Witch.hs @@ -81,7 +81,7 @@ module Witch -- ** Type applications - -- | Although you can use this library without the [@TypeApplications@](https://downloads.haskell.org/~ghc/9.0.1/docs/html/users_guide/exts/type_applications.html) + -- | Although you can use this library without the [@TypeApplications@](https://downloads.haskell.org/ghc/9.6.1/docs/users_guide/exts/type_applications.html) -- language extension, the extension is strongly recommended. Since most -- functions provided by this library are polymorphic in at least one type -- variable, it's easy to use them in a situation that would be ambiguous. diff --git a/source/library/Witch/From.hs b/source/library/Witch/From.hs index 4f6bb24..40883da 100644 --- a/source/library/Witch/From.hs +++ b/source/library/Witch/From.hs @@ -19,7 +19,7 @@ class From source target where -- > -- Avoid this: -- > from (x :: s) -- > - -- > -- Prefer this (using [@TypeApplications@](https://downloads.haskell.org/~ghc/9.0.1/docs/html/users_guide/exts/type_applications.html) language extension): + -- > -- Prefer this (using [@TypeApplications@](https://downloads.haskell.org/ghc/9.6.1/docs/users_guide/exts/type_applications.html) language extension): -- > from @s x -- -- The default implementation of this method simply calls 'Coerce.coerce', diff --git a/witch.cabal b/witch.cabal index d349821..8057f78 100644 --- a/witch.cabal +++ b/witch.cabal @@ -23,12 +23,12 @@ flag pedantic common library build-depends: - , base >= 4.15 && < 4.18 - , bytestring >= 0.10.12 && < 0.12 - , containers >= 0.6.4 && < 0.7 + , base >= 4.16.0 && < 4.19 + , bytestring >= 0.11.4 && < 0.12 + , containers >= 0.6.5 && < 0.7 , tagged >= 0.8.6 && < 0.9 , text >= 1.2.5 && < 1.3 || >= 2.0 && < 2.1 - , time >= 1.9.3 && < 1.13 + , time >= 1.11.1 && < 1.13 default-language: Haskell2010 ghc-options: -Weverything @@ -38,16 +38,13 @@ common library -Wno-missing-deriving-strategies -Wno-missing-export-lists -Wno-missing-exported-signatures + -Wno-missing-kind-signatures -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module -Wno-redundant-constraints -Wno-safe -Wno-unsafe - if impl(ghc >= 9.2) - ghc-options: - -Wno-missing-kind-signatures - if flag(pedantic) ghc-options: -Werror @@ -64,7 +61,7 @@ library import: library build-depends: - , template-haskell >= 2.17 && < 2.20 + , template-haskell >= 2.18 && < 2.21 exposed-modules: Witch Witch.Encoding