ghc-9.6 support

coot · coot · commit 0386481e5d2c · 2023-04-20T19:09:51.000+02:00
diff --git a/cabal.project b/cabal.project
@@ -11,9 +11,13 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state:
-  , hackage.haskell.org 2022-11-06T00:00:00Z
+  , hackage.haskell.org 2023-03-25T12:00:00Z
   , cardano-haskell-packages 2022-11-15T17:30:00Z
 
+-- TODO: early ghc-9.6 support
+-- https://github.com/nikita-volkov/strict-list/issues/1
+allow-newer: strict-list:semigroupoids
+
 packages: ./io-sim
           ./io-classes
           ./io-classes-mtl
diff --git a/io-classes-mtl/CHANGELOG.md b/io-classes-mtl/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Revision history for io-classes-mtl
 
+## next version
+
+### Non breaking changes
+
+* Support `ghc-9.6`.
+
 ## 0.1.0.0 -- YYYY-mm-dd
 
 * First version. Released on an unsuspecting world.
diff --git a/io-classes-mtl/io-classes-mtl.cabal b/io-classes-mtl/io-classes-mtl.cabal
@@ -17,6 +17,7 @@ category:           Control
 build-type:         Simple
 extra-doc-files:    README.md
                     CHANGELOG.md
+tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6 }
 
 common warnings
     ghc-options: -Wall
@@ -41,7 +42,7 @@ library
                    ,  Control.Monad.Class.MonadTime.SI.Trans
                    ,  Control.Monad.Class.MonadTimer.Trans
                    ,  Control.Monad.Class.MonadTimer.SI.Trans
-    build-depends:    base >=4.9 && <4.18,
+    build-depends:    base >=4.9 && <4.19,
                       array,
                       mtl,
 
diff --git a/io-classes-mtl/src/Control/Monad/Class/MonadEventlog/Trans.hs b/io-classes-mtl/src/Control/Monad/Class/MonadEventlog/Trans.hs
@@ -2,12 +2,13 @@
 
 module Control.Monad.Class.MonadEventlog.Trans () where
 
-import           Control.Monad.Cont
-import           Control.Monad.Except
+import           Control.Monad.Cont (ContT)
+import           Control.Monad.Except (ExceptT)
 import qualified Control.Monad.RWS.Lazy as Lazy
 import qualified Control.Monad.RWS.Strict as Strict
 import qualified Control.Monad.State.Lazy as Lazy
 import qualified Control.Monad.State.Strict as Strict
+import           Control.Monad.Trans (lift)
 import qualified Control.Monad.Writer.Lazy as Lazy
 import qualified Control.Monad.Writer.Strict as Strict
 
diff --git a/io-classes-mtl/src/Control/Monad/Class/MonadST/Trans.hs b/io-classes-mtl/src/Control/Monad/Class/MonadST/Trans.hs
@@ -1,12 +1,13 @@
 {-# OPTIONS_GHC -Wno-orphans #-}
 module Control.Monad.Class.MonadST.Trans () where
 
-import           Control.Monad.Cont
-import           Control.Monad.Except
+import           Control.Monad.Cont (ContT)
+import           Control.Monad.Except (ExceptT)
 import qualified Control.Monad.RWS.Lazy as Lazy
 import qualified Control.Monad.RWS.Strict as Strict
 import qualified Control.Monad.State.Lazy as Lazy
 import qualified Control.Monad.State.Strict as Strict
+import           Control.Monad.Trans (lift)
 import qualified Control.Monad.Writer.Lazy as Lazy
 import qualified Control.Monad.Writer.Strict as Strict
 
diff --git a/io-classes-mtl/src/Control/Monad/Class/MonadThrow/Trans.hs b/io-classes-mtl/src/Control/Monad/Class/MonadThrow/Trans.hs
@@ -2,11 +2,12 @@
 {-# OPTIONS_GHC -Wno-orphans #-}
 module Control.Monad.Class.MonadThrow.Trans () where
 
-import           Control.Monad.Except
+import           Control.Monad.Except (ExceptT (..), runExceptT)
 import qualified Control.Monad.RWS.Lazy as Lazy
 import qualified Control.Monad.RWS.Strict as Strict
 import qualified Control.Monad.State.Lazy as Lazy
 import qualified Control.Monad.State.Strict as Strict
+import           Control.Monad.Trans (lift)
 import qualified Control.Monad.Writer.Lazy as Lazy
 import qualified Control.Monad.Writer.Strict as Strict
  
diff --git a/io-classes-mtl/src/Control/Monad/Class/MonadTime/SI/Trans.hs b/io-classes-mtl/src/Control/Monad/Class/MonadTime/SI/Trans.hs
@@ -2,12 +2,13 @@
 
 module Control.Monad.Class.MonadTime.SI.Trans () where
 
-import           Control.Monad.Cont
-import           Control.Monad.Except
+import           Control.Monad.Cont (ContT)
+import           Control.Monad.Except (ExceptT)
 import qualified Control.Monad.RWS.Lazy as Lazy
 import qualified Control.Monad.RWS.Strict as Strict
 import qualified Control.Monad.State.Lazy as Lazy
 import qualified Control.Monad.State.Strict as Strict
+import           Control.Monad.Trans (lift)
 import qualified Control.Monad.Writer.Lazy as Lazy
 import qualified Control.Monad.Writer.Strict as Strict
 
diff --git a/io-classes-mtl/src/Control/Monad/Class/MonadTime/Trans.hs b/io-classes-mtl/src/Control/Monad/Class/MonadTime/Trans.hs
@@ -2,12 +2,13 @@
 
 module Control.Monad.Class.MonadTime.Trans () where
 
-import           Control.Monad.Cont
-import           Control.Monad.Except
+import           Control.Monad.Cont (ContT)
+import           Control.Monad.Except (ExceptT)
 import qualified Control.Monad.RWS.Lazy as Lazy
 import qualified Control.Monad.RWS.Strict as Strict
 import qualified Control.Monad.State.Lazy as Lazy
 import qualified Control.Monad.State.Strict as Strict
+import           Control.Monad.Trans (lift)
 import qualified Control.Monad.Writer.Lazy as Lazy
 import qualified Control.Monad.Writer.Strict as Strict
 
diff --git a/io-classes/CHANGELOG.md b/io-classes/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## next version
 
+### Non breaking changes
+
+* Support `ghc-9.6`.
+
 ## 1.0.0.0
 
 ### Breaking changes
diff --git a/io-classes/io-classes.cabal b/io-classes/io-classes.cabal
@@ -17,7 +17,7 @@ category:            Control
 build-type:          Simple
 extra-source-files:  CHANGELOG.md
                      README.md
-tested-with:         GHC == { 8.10, 9.2, 9.4 }
+tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6 }
 
 source-repository head
   type:     git
@@ -90,7 +90,7 @@ library
                        TypeFamilyDependencies
                        TypeOperators
                        UndecidableInstances
-  build-depends:       base  >=4.9 && <4.18,
+  build-depends:       base  >=4.9 && <4.19,
                        array,
                        async >=2.1,
                        bytestring,
diff --git a/io-classes/src/Control/Monad/Class/MonadAsync.hs b/io-classes/src/Control/Monad/Class/MonadAsync.hs
@@ -29,7 +29,11 @@ module Control.Monad.Class.MonadAsync
 
 import           Prelude hiding (read)
 
+#if MIN_VERSION_base(4,18,0)
+import           Control.Applicative (Alternative (..))
+#else
 import           Control.Applicative (Alternative (..), liftA2)
+#endif
 import           Control.Monad (forever)
 import           Control.Monad.Class.MonadFork
 import           Control.Monad.Class.MonadSTM
diff --git a/io-classes/src/Control/Monad/Class/MonadThrow.hs b/io-classes/src/Control/Monad/Class/MonadThrow.hs
@@ -25,7 +25,7 @@ import           Control.Exception (Exception (..), MaskingState, SomeException)
 import qualified Control.Exception as IO
 import           Control.Monad (liftM)
 
-import           Control.Monad.Reader (ReaderT (..), lift)
+import           Control.Monad.Reader (ReaderT (..), runReaderT, lift)
 
 import           Control.Monad.STM (STM)
 import qualified Control.Monad.STM as STM
diff --git a/io-sim/io-sim.cabal b/io-sim/io-sim.cabal
@@ -17,7 +17,7 @@ category:            Testing
 build-type:          Simple
 extra-source-files:  CHANGELOG.md
                      README.md
-tested-with:         GHC == { 8.10, 9.2, 9.4 }
+tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6 }
 
 flag asserts
   description: Enable assertions
@@ -75,7 +75,7 @@ library
                        RankNTypes,
                        ScopedTypeVariables,
                        TypeFamilies
-  build-depends:       base              >=4.9 && <4.18,
+  build-depends:       base              >=4.9 && <4.19,
                        io-classes       ^>=1.0,
                        exceptions        >=0.10,
                        containers,
diff --git a/si-timers/si-timers.cabal b/si-timers/si-timers.cabal
@@ -16,7 +16,7 @@ category:            Control
 build-type:          Simple
 extra-source-files:  CHANGELOG.md
                      README.md
-tested-with:         GHC == { 8.10, 9.2, 9.4 }
+tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6 }
 
 flag asserts
   description: Enable assertions
@@ -54,7 +54,7 @@ library
                        NumericUnderscores,
                        ScopedTypeVariables,
                        TypeFamilies
-  build-depends:       base              >=4.9 && <4.18,
+  build-depends:       base              >=4.9 && <4.19,
                        mtl,
                        stm,
                        time              >=1.9.1 && <1.13,
diff --git a/strict-mvar/strict-mvar.cabal b/strict-mvar/strict-mvar.cabal
@@ -17,7 +17,7 @@ category:            Control
 build-type:          Simple
 extra-source-files:  CHANGELOG.md
                      README.md
-tested-with:         GHC == { 8.10, 9.2, 9.4 }
+tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6 }
 
 source-repository head
   type:     git
@@ -34,7 +34,7 @@ library
 
   exposed-modules:     Control.Concurrent.Class.MonadMVar.Strict
   default-language:    Haskell2010
-  build-depends:       base        >= 4.9 && <4.18,
+  build-depends:       base        >= 4.9 && <4.19,
                        io-classes ^>= 1.0
   ghc-options:         -Wall
                        -Wno-unticked-promoted-constructors
diff --git a/strict-stm/strict-stm.cabal b/strict-stm/strict-stm.cabal
@@ -18,7 +18,7 @@ category:            Control
 build-type:          Simple
 extra-source-files:  CHANGELOG.md
                      README.md
-tested-with:         GHC == { 8.10, 9.2, 9.4 }
+tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6 }
 
 source-repository head
   type:     git
@@ -55,7 +55,7 @@ library
                        GADTs,
                        NamedFieldPuns,
                        TypeOperators
-  build-depends:       base        >= 4.9 && <4.18,
+  build-depends:       base        >= 4.9 && <4.19,
                        array,
                        stm         >= 2.5 && <2.6,
 
