Support GHC 9.4 (#422)

* Support GHC 9.4

* Fix stack build

* Remove transformers dependancy

* Use newer cabal on CI

* Use CPP to remove Eq constraint for newer hashable

* Fic 8.4.4 build

.github/CODEOWNERS

@@ -1 +1 @@
-*  @chshersh @vrom911
+* @vrom911

.github/workflows/ci.yml

@@ -16,15 +16,18 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        cabal: ["3.4"]
+        cabal: ["3.8"]
         ghc:
           - "8.4.4"
           - "8.6.5"
           - "8.8.4"
           - "8.10.7"
           - "9.0.2"
-          - "9.2.4"
+          - "9.2.7"
+          - "9.4.4"
         exclude:
+          - os: macOS-latest
+            ghc: 9.2.7
           - os: macOS-latest
             ghc: 9.0.2
           - os: macOS-latest
@@ -36,6 +39,8 @@ jobs:
           - os: macOS-latest
             ghc: 8.4.4
 
+          - os: windows-latest
+            ghc: 9.2.7          
           - os: windows-latest
             ghc: 9.0.2
           - os: windows-latest
@@ -93,8 +98,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        stack: ["2.5"]
-        ghc: ["8.10.4"]
+        stack: ["2.9"]
+        ghc: ["9.2.6"]
 
     steps:
     - uses: actions/checkout@v3

CHANGELOG.md

@@ -3,6 +3,13 @@
 `tomland` uses [PVP Versioning][1].
 The changelog is available [on GitHub][2].
 
+## Unreleased
+
+* [#412](https://github.com/kowainik/tomland/issues/412):
+  Support GHC-9.4.4.
+* Upgrade `mtl` and `validation-selective` upper boundary.
+* Remove `transformers` dependency.
+
 ## 1.3.3.2 – Oct 5, 2022
 
 * [#395](https://github.com/kowainik/tomland/issues/395):

README.md

@@ -3,10 +3,7 @@
 ![palm](https://user-images.githubusercontent.com/4276606/51088259-7a777000-176e-11e9-9d76-6be4023c0ac3.png)
 
 [![GitHub CI](https://github.com/kowainik/tomland/workflows/CI/badge.svg)](https://github.com/kowainik/tomland/actions)
-[![AppVeyor CI](https://ci.appveyor.com/api/projects/status/github/kowainik/tomland?branch=main&svg=true)](https://ci.appveyor.com/project/kowainik/tomland)
 [![Hackage](https://img.shields.io/hackage/v/tomland.svg?logo=haskell)](https://hackage.haskell.org/package/tomland)
-[![Stackage LTS](http://stackage.org/package/tomland/badge/lts)](http://stackage.org/lts/package/tomland)
-[![Stackage Nightly](http://stackage.org/package/tomland/badge/nightly)](http://stackage.org/nightly/package/tomland)
 [![MPL-2.0 license](https://img.shields.io/badge/license-MPL--2.0-blue.svg)](https://github.com/kowainik/tomland/blob/main/LICENSE)
 
 > “A library is like an island in the middle of a vast sea of ignorance,

src/Toml/Codec/BiMap/Conversion.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP   #-}
 {-# LANGUAGE GADTs #-}
 
 {- |
@@ -427,7 +428,14 @@ values and 'AnyValue' as an array. Usually used as the
 
 @since 0.5.0
 -}
-_HashSet :: (Eq a, Hashable a) => TomlBiMap a AnyValue -> TomlBiMap (HS.HashSet a) AnyValue
+_HashSet
+#if MIN_VERSION_hashable(1,4,0)
+  :: (Hashable a)
+#else
+  :: (Eq a, Hashable a)
+#endif
+  => TomlBiMap a AnyValue
+  -> TomlBiMap (HS.HashSet a) AnyValue
 _HashSet bi = iso HS.toList HS.fromList >>> _Array bi
 {-# INLINE _HashSet #-}
 
@@ -624,7 +632,7 @@ _KeyInt = BiMap
 _Left :: (Show l, Show r) => TomlBiMap (Either l r) l
 _Left = prism Left $ \case
     Left l -> Right l
-    x -> wrongConstructor "Left" x
+    x      -> wrongConstructor "Left" x
 
 {- | 'BiMap' for 'Either' and its 'Right' part.
 
@@ -633,7 +641,7 @@ _Left = prism Left $ \case
 _Right :: (Show l, Show r) => TomlBiMap (Either l r) r
 _Right = prism Right $ \case
     Right r -> Right r
-    x -> wrongConstructor "Right" x
+    x       -> wrongConstructor "Right" x
 
 {- | 'BiMap' for 'Maybe' and its 'Just' part.
 
@@ -642,4 +650,4 @@ _Right = prism Right $ \case
 _Just :: Show r => TomlBiMap (Maybe r) r
 _Just = prism Just $ \case
     Just r -> Right r
-    x -> wrongConstructor "Just" x
+    x      -> wrongConstructor "Just" x

src/Toml/Codec/Combinator/Map.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE ApplicativeDo   #-}
+{-# LANGUAGE CPP             #-}
 {-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE TupleSections   #-}
 
@@ -74,8 +75,8 @@ import Prelude hiding (map)
 import Control.Applicative (empty)
 import Control.Monad (forM_)
 import Control.Monad.State (gets, modify)
-import Data.Hashable (Hashable)
 import Data.HashMap.Strict (HashMap)
+import Data.Hashable (Hashable)
 import Data.IntMap.Strict (IntMap)
 import Data.List.NonEmpty (NonEmpty (..))
 import Data.Map.Strict (Map)
@@ -87,7 +88,7 @@ import Toml.Codec.BiMap (BiMap (..), TomlBiMap)
 import Toml.Codec.Code (execTomlCodec)
 import Toml.Codec.Combinator.Common (whenLeftBiMapError)
 import Toml.Codec.Types (Codec (..), TomlCodec, TomlEnv, TomlState (..))
-import Toml.Type.Key (pattern (:||), Key)
+import Toml.Type.Key (Key, pattern (:||))
 import Toml.Type.TOML (TOML (..), insertTable, insertTableArrays)
 
 import qualified Data.HashMap.Strict as HashMap
@@ -237,7 +238,11 @@ If there's no key with the name @"myHashMap"@ then empty 'HashMap' is returned.
 -}
 hashMap
     :: forall k v
+#if MIN_VERSION_hashable(1,4,0)
+    .  (Hashable k)
+#else
     .  (Eq k, Hashable k)
+#endif
     => TomlCodec k  -- ^ Codec for 'HashMap' keys
     -> TomlCodec v  -- ^ Codec for 'HashMap' values
     -> Key          -- ^ TOML key where 'HashMap' is stored
@@ -261,7 +266,11 @@ key2 = "value2"
 -}
 tableHashMap
     :: forall k v
+#if MIN_VERSION_hashable(1,4,0)
+    .  (Hashable k)
+#else
     .  (Eq k, Hashable k)
+#endif
     => TomlBiMap Key k
     -- ^ Bidirectional converter between TOML 'Key's and 'HashMap' keys
     -> (Key -> TomlCodec v)

src/Toml/Codec/Combinator/Set.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP #-}
+
 {- |
 Module                  : Toml.Codec.Combinator.Set
 Copyright               : (c) 2018-2022 Kowainik
@@ -152,7 +154,11 @@ tomland decode error:  Key foo is not found
 @since 0.5.0
 -}
 arrayHashSetOf
-    :: (Hashable a, Eq a)
+#if MIN_VERSION_hashable(1,4,0)
+  :: (Hashable a)
+#else
+  :: (Eq a, Hashable a)
+#endif
     => TomlBiMap a AnyValue
     -> Key
     -> TomlCodec (HashSet a)
@@ -222,6 +228,15 @@ Decodes to an empty 'HashSet' in case of the missing field in @TOML@.
 
 @since 1.2.0.0
 -}
-hashSet :: forall a . (Hashable a, Eq a) => TomlCodec a -> Key -> TomlCodec (HashSet a)
+hashSet 
+    :: forall a 
+#if MIN_VERSION_hashable(1,4,0)
+    .  (Hashable a)
+#else
+    .  (Eq a, Hashable a)
+#endif
+    => TomlCodec a 
+    -> Key 
+    -> TomlCodec (HashSet a)
 hashSet codec key = dimap HS.toList HS.fromList (list codec key)
 {-# INLINE hashSet #-}

src/Toml/Codec/Generic.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE AllowAmbiguousTypes  #-}
+{-# LANGUAGE CPP                  #-}
 {-# LANGUAGE DataKinds            #-}
 {-# LANGUAGE FlexibleContexts     #-}
 {-# LANGUAGE FlexibleInstances    #-}
@@ -586,7 +587,12 @@ instance (Ord a, HasItemCodec a) => HasCodec (Set a) where
     {-# INLINE hasCodec #-}
 
 -- | @since 1.2.0.0
-instance (Hashable a, Eq a, HasItemCodec a) => HasCodec (HashSet a) where
+#if MIN_VERSION_hashable(1,4,0)
+instance (Hashable a, HasItemCodec a)
+#else
+instance (Hashable a, Eq a, HasItemCodec a)
+#endif
+  => HasCodec (HashSet a) where
     hasCodec = case hasItemCodec @a of
         Left prim   -> Toml.arrayHashSetOf prim
         Right codec -> Toml.hashSet codec
@@ -624,7 +630,12 @@ fieldName =
 
 @since 1.3.0.0
 -}
-instance (Hashable k, Eq k, HasCodec k, HasCodec v) => HasCodec (HashMap k v) where
+#if MIN_VERSION_hashable(1,4,0)
+instance (Hashable k, HasCodec k, HasCodec v)
+#else
+instance (Hashable k, Eq k, HasCodec k, HasCodec v)
+#endif
+  => HasCodec (HashMap k v) where
     hasCodec = Toml.hashMap (hasCodec @k "key") (hasCodec @v "val")
     {-# INLINE hasCodec #-}
 

src/Toml/Codec/Types.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE TupleSections         #-}
 {-# LANGUAGE TypeFamilies          #-}
+{-# LANGUAGE TypeOperators         #-}
 {-# LANGUAGE UndecidableInstances  #-}
 
 {- |

stack.yaml

@@ -1,9 +1,4 @@
-resolver: lts-17.5
+resolver: lts-20.12
 
 extra-deps:
-  - hashable-1.3.1.0
-
-flags:
-  tomland:
-    build-readme: true
-    build-play-tomland: true
+ - validation-selective-0.2.0.0

test/Test/Toml/Gen.hs

@@ -1,5 +1,6 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
+{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE DataKinds           #-}
 {-# LANGUAGE MultiWayIf          #-}
 {-# LANGUAGE PatternSynonyms     #-}
@@ -258,7 +259,14 @@ genFloat = Gen.float (Range.constant (-10000.0) 10000.0)
 genSet :: Ord a => Gen a -> Gen (Set a)
 genSet genA = fromList <$> genList genA
 
-genHashSet :: (Eq a, Hashable a) => Gen a -> Gen (HashSet a)
+genHashSet 
+#if MIN_VERSION_hashable(1,4,0)
+    :: (Hashable a)
+#else
+    :: (Eq a, Hashable a) 
+#endif
+    => Gen a 
+    -> Gen (HashSet a)
 genHashSet genA = fromList <$> genList genA
 
 genNonEmpty :: Gen a -> Gen (NonEmpty a)
@@ -387,7 +395,7 @@ genArray = Gen.recursive Gen.choice
 
 -- filters
 
--- | Discards strings that end with \
+-- | Discards strings that end with @\@
 genNotEscape :: Gen Text -> Gen Text
 genNotEscape gen = gen >>= \t ->
     if | Text.null t -> pure t

test/Test/Toml/Parser/Common.hs

@@ -41,7 +41,10 @@ import Data.Time (Day, LocalTime (..), TimeOfDay (..), TimeZone, ZonedTime (..),
                   minutesToTimeZone)
 import Test.Hspec (Expectation)
 import Test.Hspec.Megaparsec (shouldFailOn, shouldParse)
-import Text.Megaparsec (Parsec, ShowErrorComponent, Stream, parse)
+import Text.Megaparsec (Parsec, ShowErrorComponent, parse)
+#if __GLASGOW_HASKELL__ <= 804
+import Text.Megaparsec (Stream)
+#endif
 #if MIN_VERSION_megaparsec(9,0,0)
 import Text.Megaparsec.Stream (TraversableStream, VisualStream)
 #endif
@@ -58,7 +61,9 @@ import Toml.Type.UValue (UValue (..))
 
 parseX
     :: ( ShowErrorComponent e
+#if __GLASGOW_HASKELL__ <= 804
        , Stream s
+#endif
 #if MIN_VERSION_megaparsec(9,0,0)
        , VisualStream s
        , TraversableStream s

tomland.cabal

@@ -27,7 +27,7 @@ license:             MPL-2.0
 license-file:        LICENSE
 author:              Dmitrii Kovanikov, Veronika Romashkina
 maintainer:          Kowainik <xrom.xkov@gmail.com>
-copyright:           2018-2022 Kowainik
+copyright:           2018-2023 Kowainik
 category:            TOML, Text, Configuration
 build-type:          Simple
 extra-doc-files:     README.md
@@ -39,7 +39,8 @@ tested-with:         GHC == 8.4.4
                      GHC == 8.8.4
                      GHC == 8.10.7
                      GHC == 9.0.2
-                     GHC == 9.2.4
+                     GHC == 9.2.7
+                     GHC == 9.4.4
 
 source-repository head
   type:                git
@@ -56,7 +57,7 @@ flag build-play-tomland
   manual:              True
 
 common common-options
-  build-depends:       base >= 4.11 && < 4.17
+  build-depends:       base >= 4.11 && < 4.18
 
   ghc-options:         -Wall
                        -Wcompat
@@ -135,13 +136,12 @@ library
                      , deepseq ^>= 1.4
                      , hashable >= 1.3.1.0 && < 1.5
                      , megaparsec >= 7.0.5 && < 9.4
-                     , mtl ^>= 2.2
+                     , mtl >= 2.2 && < 2.4
                      , parser-combinators >= 1.1.0 && < 1.4
                      , text >= 1.2 && < 2.1
                      , time >= 1.8 && < 1.14
-                     , transformers >= 0.5 && < 0.7
                      , unordered-containers ^>= 0.2.7
-                     , validation-selective ^>= 0.1.0
+                     , validation-selective >= 0.1.0 && < 0.3
 
 executable readme
   import:              common-options