Merge pull request #77 from input-output-hk/js/update-fourmolu-ghc

Update GHC and fourmolu

Author: nc6

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["8.10.7", "9.2.8", "9.6.4", "9.8.1", "9.10.1"]
+        ghc: ["9.6.7", "9.8.4", "9.10.2", "9.12.2"]
         os: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v3
@@ -31,7 +31,7 @@ jobs:
       run: cabal update
 
     - name: Cabal Configure
-      run: cabal configure --enable-tests --enable-benchmarks --write-ghc-environment-files=always
+      run: cabal configure --enable-tests --write-ghc-environment-files=always
 
     - uses: actions/cache@v3
       if: matrix.os != 'macos-latest'
@@ -72,12 +72,11 @@ jobs:
 
     - name: Install fourmolu
       run: |
-        FOURMOLU_VERSION="0.14.0.0"
+        FOURMOLU_VERSION="0.18.0.0"
         mkdir -p "$HOME/.local/bin"
         curl -sL "https://github.com/fourmolu/fourmolu/releases/download/v${FOURMOLU_VERSION}/fourmolu-${FOURMOLU_VERSION}-linux-x86_64" -o "$HOME/.local/bin/fourmolu"
         chmod a+x "$HOME/.local/bin/fourmolu"
         echo "$HOME/.local/bin" >> $GITHUB_PATH
 
     - name: Run fourmolu
       run: ./scripts/fourmolize.sh
-

cuddle.cabal

@@ -19,29 +19,8 @@ extra-doc-files: CHANGELOG.md
 common warnings
   ghc-options: -Wall -Werror
 
-common ghc2021
-  -- These options are all on by default in GHC2021, so once we drop GHC8 we
-  -- can remove this section.
-  default-extensions:
-    DataKinds
-    DeriveGeneric
-    DeriveTraversable
-    FlexibleContexts
-    FlexibleInstances
-    GeneralizedNewtypeDeriving
-    ImportQualifiedPost
-    InstanceSigs
-    MultiParamTypeClasses
-    NamedFieldPuns
-    PolyKinds
-    RankNTypes
-    ScopedTypeVariables
-    StandaloneDeriving
-    TypeApplications
-    TypeSynonymInstances
-
 library
-  import:           warnings, ghc2021
+  import:           warnings
   exposed-modules:
     Codec.CBOR.Cuddle.CBOR.Gen
     Codec.CBOR.Cuddle.CDDL
@@ -64,7 +43,7 @@ library
 
   -- other-extensions:
   build-depends:
-    , base                >=4.14.0.0
+    , base                >=4.18.3.0
     , base16-bytestring
     , boxes
     , bytestring
@@ -88,11 +67,11 @@ library
     , tree-diff
 
   hs-source-dirs:   src
-  default-language: Haskell2010
+  default-language: GHC2021
 
 executable example
-  import:           warnings, ghc2021
-  default-language: Haskell2010
+  import:           warnings
+  default-language: GHC2021
   other-modules:
     Conway
     Monad
@@ -109,8 +88,8 @@ executable example
     , text
 
 executable cuddle
-  import:           warnings, ghc2021
-  default-language: Haskell2010
+  import:           warnings
+  default-language: GHC2021
   hs-source-dirs:   ./bin/
   main-is:          Main.hs
   build-depends:
@@ -126,8 +105,8 @@ executable cuddle
     , text
 
 test-suite cuddle-test
-  import:           warnings, ghc2021
-  default-language: Haskell2010
+  import:           warnings
+  default-language: GHC2021
   other-modules:
     Test.Codec.CBOR.Cuddle.CDDL.Examples
     Test.Codec.CBOR.Cuddle.CDDL.Gen

example/Conway.hs

@@ -1,10 +1,9 @@
 {-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
 
-{-# HLINT ignore "Use camelCase" #-}
-{-# HLINT ignore "Evaluate" #-}
+{- HLINT ignore "Use camelCase" -}
+{- HLINT ignore "Evaluate" -}
 
 module Conway where
 

example/Monad.hs

@@ -1,9 +1,8 @@
 {-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecursiveDo #-}
-{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
 
-{-# HLINT ignore "Use camelCase" #-}
+{- HLINT ignore "Use camelCase" -}
 
 module Monad where
 

src/Codec/CBOR/Cuddle/CBOR/Gen.hs

@@ -5,10 +5,7 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE PatternSynonyms #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE ViewPatterns #-}
-{-# OPTIONS_GHC -Wno-unticked-promoted-constructors #-}
 
 -- | Generate example CBOR given a CDDL specification
 module Codec.CBOR.Cuddle.CBOR.Gen (generateCBORTerm, generateCBORTerm') where

src/Codec/CBOR/Cuddle/CDDL.hs

@@ -1,6 +1,5 @@
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DerivingStrategies #-}
-{-# OPTIONS_GHC -Wno-orphans #-}
 
 -- | This module defined the data structure of CDDL as specified in
 --   https://datatracker.ietf.org/doc/rfc8610/

src/Codec/CBOR/Cuddle/CDDL/Resolve.hs

@@ -2,7 +2,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE LambdaCase #-}
--- {-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE ViewPatterns #-}

src/Codec/CBOR/Cuddle/Comments.hs

@@ -2,10 +2,8 @@
 {-# LANGUAGE DefaultSignatures #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DerivingStrategies #-}
-{-# LANGUAGE EmptyCase #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TypeOperators #-}
 
 module Codec.CBOR.Cuddle.Comments (
   HasComment (..),

src/Codec/CBOR/Cuddle/Huddle.hs

@@ -1,14 +1,9 @@
-{-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE FunctionalDependencies #-}
-{-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE PartialTypeSignatures #-}
-{-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE UndecidableInstances #-}
-{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
 
 -- | Module for building CDDL in Haskell
 --

src/Codec/CBOR/Cuddle/Huddle/HuddleM.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE DataKinds #-}
+
 -- | Monad for declaring Huddle constructs
 module Codec.CBOR.Cuddle.Huddle.HuddleM (
   module Huddle,