From fb0b5f93313217368400b1520c3df42c4bbaf4ab Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Wed, 26 May 2021 19:17:25 -0400 Subject: [PATCH 1/6] Add support for GHC 8.6 --- .github/workflows/ci.yaml | 5 +++-- .gitignore | 2 ++ witch.cabal | 9 ++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4ad38dd..f8984da 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,8 +18,9 @@ jobs: - { os: ubuntu-20.04, ghc: 9.0.1, cabal: 3.4.0.0 } - { os: macos-10.15, ghc: 9.0.1, cabal: 3.4.0.0 } - { os: windows-2019, ghc: 9.0.1, cabal: 3.4.0.0 } - - { os: ubuntu-20.04, ghc: 8.10.4, cabal: 3.2.0.0 } - - { os: ubuntu-20.04, ghc: 8.8.4, cabal: 3.0.0.0 } + - { os: ubuntu-20.04, ghc: 8.10.4, cabal: 3.4.0.0 } + - { os: ubuntu-20.04, ghc: 8.8.4, cabal: 3.4.0.0 } + - { os: ubuntu-20.04, ghc: 8.6.5, cabal: 3.4.0.0 } runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 diff --git a/.gitignore b/.gitignore index 24689d4..82bf4a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ +/.ghc.environment* /.stack-work/ /cabal.project.freeze /dist-newstyle/ +/dist/ /stack.yaml.lock diff --git a/witch.cabal b/witch.cabal index 67817f2..3731fab 100644 --- a/witch.cabal +++ b/witch.cabal @@ -18,7 +18,7 @@ source-repository head common basics build-depends: - , base >= 4.13.0 && < 4.16 + , base >= 4.12.0 && < 4.16 , bytestring >= 0.10.12 && < 0.11 , containers >= 0.6.2 && < 0.7 , text >= 1.2.4 && < 1.3 @@ -28,13 +28,16 @@ common basics -Weverything -Wno-all-missed-specialisations -Wno-implicit-prelude - -Wno-missing-deriving-strategies -Wno-missing-export-lists -Wno-missing-exported-signatures -Wno-redundant-constraints -Wno-safe -Wno-unsafe + if impl(ghc >= 8.8) + ghc-options: + -Wno-missing-deriving-strategies + if impl(ghc >= 8.10) ghc-options: -Wno-missing-safe-haskell-mode @@ -44,7 +47,7 @@ library import: basics build-depends: - , template-haskell >= 2.15.0 && < 2.18 + , template-haskell >= 2.14.0 && < 2.18 exposed-modules: Witch Witch.From From d436d21b9e60553f13498264f05a5b41cafdf44a Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Wed, 26 May 2021 19:25:42 -0400 Subject: [PATCH 2/6] Allow bytestring 0.11 --- witch.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/witch.cabal b/witch.cabal index 3731fab..a1e1ebc 100644 --- a/witch.cabal +++ b/witch.cabal @@ -19,7 +19,7 @@ source-repository head common basics build-depends: , base >= 4.12.0 && < 4.16 - , bytestring >= 0.10.12 && < 0.11 + , bytestring >= 0.10.12 && < 0.12 , containers >= 0.6.2 && < 0.7 , text >= 1.2.4 && < 1.3 , time >= 1.9 && < 1.12 From c641d61fc660ab4b08e21ab79a98e7895af2612d Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Wed, 26 May 2021 19:28:43 -0400 Subject: [PATCH 3/6] Relax constraints to allow more wired-in libraries --- witch.cabal | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/witch.cabal b/witch.cabal index a1e1ebc..b44c516 100644 --- a/witch.cabal +++ b/witch.cabal @@ -19,10 +19,10 @@ source-repository head common basics build-depends: , base >= 4.12.0 && < 4.16 - , bytestring >= 0.10.12 && < 0.12 - , containers >= 0.6.2 && < 0.7 - , text >= 1.2.4 && < 1.3 - , time >= 1.9 && < 1.12 + , bytestring >= 0.10.8 && < 0.12 + , containers >= 0.6.0 && < 0.7 + , text >= 1.2.3 && < 1.3 + , time >= 1.8 && < 1.12 default-language: Haskell2010 ghc-options: -Weverything From ef1c70846fd2d108c9873f4d6adc6f2809ff932e Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Wed, 26 May 2021 19:37:24 -0400 Subject: [PATCH 4/6] Fix time's lower bound --- witch.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/witch.cabal b/witch.cabal index b44c516..0df8486 100644 --- a/witch.cabal +++ b/witch.cabal @@ -22,7 +22,7 @@ common basics , bytestring >= 0.10.8 && < 0.12 , containers >= 0.6.0 && < 0.7 , text >= 1.2.3 && < 1.3 - , time >= 1.8 && < 1.12 + , time >= 1.9.1 && < 1.12 default-language: Haskell2010 ghc-options: -Weverything From 0f3fd280ece254791e81a793eb0a6f8d5139466a Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Wed, 26 May 2021 19:47:24 -0400 Subject: [PATCH 5/6] Allow GHC 8.4 --- .github/workflows/ci.yaml | 1 + witch.cabal | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f8984da..72c551e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,6 +21,7 @@ jobs: - { os: ubuntu-20.04, ghc: 8.10.4, cabal: 3.4.0.0 } - { os: ubuntu-20.04, ghc: 8.8.4, cabal: 3.4.0.0 } - { os: ubuntu-20.04, ghc: 8.6.5, cabal: 3.4.0.0 } + - { os: ubuntu-20.04, ghc: 8.4.4, cabal: 3.4.0.0 } runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 diff --git a/witch.cabal b/witch.cabal index 0df8486..de9c0f6 100644 --- a/witch.cabal +++ b/witch.cabal @@ -18,9 +18,9 @@ source-repository head common basics build-depends: - , base >= 4.12.0 && < 4.16 + , base >= 4.11.0 && < 4.16 , bytestring >= 0.10.8 && < 0.12 - , containers >= 0.6.0 && < 0.7 + , containers >= 0.5.11 && < 0.7 , text >= 1.2.3 && < 1.3 , time >= 1.9.1 && < 1.12 default-language: Haskell2010 @@ -47,7 +47,7 @@ library import: basics build-depends: - , template-haskell >= 2.14.0 && < 2.18 + , template-haskell >= 2.13.0 && < 2.18 exposed-modules: Witch Witch.From From 1bdbfbdf3d5ef8f972b97e00d190850470d02844 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Wed, 26 May 2021 20:03:34 -0400 Subject: [PATCH 6/6] Allow GHC 8.2 --- .github/workflows/ci.yaml | 1 + .gitignore | 2 ++ witch.cabal | 12 ++++++++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 72c551e..0e1057b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -22,6 +22,7 @@ jobs: - { os: ubuntu-20.04, ghc: 8.8.4, cabal: 3.4.0.0 } - { os: ubuntu-20.04, ghc: 8.6.5, cabal: 3.4.0.0 } - { os: ubuntu-20.04, ghc: 8.4.4, cabal: 3.4.0.0 } + - { os: ubuntu-20.04, ghc: 8.2.2, cabal: 3.4.0.0 } runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 diff --git a/.gitignore b/.gitignore index 82bf4a7..f9aca15 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ +/.cabal-sandbox/ /.ghc.environment* /.stack-work/ /cabal.project.freeze +/cabal.sandbox.config /dist-newstyle/ /dist/ /stack.yaml.lock diff --git a/witch.cabal b/witch.cabal index de9c0f6..eef982c 100644 --- a/witch.cabal +++ b/witch.cabal @@ -18,9 +18,9 @@ source-repository head common basics build-depends: - , base >= 4.11.0 && < 4.16 + , base >= 4.10.0 && < 4.16 , bytestring >= 0.10.8 && < 0.12 - , containers >= 0.5.11 && < 0.7 + , containers >= 0.5.10 && < 0.7 , text >= 1.2.3 && < 1.3 , time >= 1.9.1 && < 1.12 default-language: Haskell2010 @@ -28,12 +28,16 @@ common basics -Weverything -Wno-all-missed-specialisations -Wno-implicit-prelude - -Wno-missing-export-lists + -Wno-missed-specialisations -Wno-missing-exported-signatures -Wno-redundant-constraints -Wno-safe -Wno-unsafe + if impl(ghc >= 8.4) + ghc-options: + -Wno-missing-export-lists + if impl(ghc >= 8.8) ghc-options: -Wno-missing-deriving-strategies @@ -47,7 +51,7 @@ library import: basics build-depends: - , template-haskell >= 2.13.0 && < 2.18 + , template-haskell >= 2.12.0 && < 2.18 exposed-modules: Witch Witch.From