diff --git a/cabal.project b/cabal.project index e4454824..0b0e5376 100644 --- a/cabal.project +++ b/cabal.project @@ -11,7 +11,7 @@ repository cardano-haskell-packages d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee index-state: - hackage.haskell.org 2024-07-01T07:04:30Z + hackage.haskell.org 2024-08-27T07:58:31Z , cardano-haskell-packages 2024-06-27T10:53:24Z packages: ./typed-protocols diff --git a/typed-protocols-cborg/src/Network/TypedProtocol/Codec/CBOR.hs b/typed-protocols-cborg/src/Network/TypedProtocol/Codec/CBOR.hs index 22d1721e..bb2183a5 100644 --- a/typed-protocols-cborg/src/Network/TypedProtocol/Codec/CBOR.hs +++ b/typed-protocols-cborg/src/Network/TypedProtocol/Codec/CBOR.hs @@ -11,7 +11,7 @@ module Network.TypedProtocol.Codec.CBOR ) where import Control.Monad.Class.MonadST (MonadST (..)) -import Control.Monad.ST +import Control.Monad.ST hiding (stToIO) import qualified Codec.CBOR.Decoding as CBOR (Decoder) import qualified Codec.CBOR.Encoding as CBOR (Encoding) @@ -68,7 +68,7 @@ mkCodecCborStrictBS cborMsgEncode cborMsgDecode = :: (forall s. CBOR.Decoder s a) -> m (DecodeStep BS.ByteString DeserialiseFailure m a) convertCborDecoder cborDecode = - withLiftST (convertCborDecoderBS cborDecode) + convertCborDecoderBS cborDecode stToIO convertCborDecoderBS :: forall s m a. Functor m @@ -123,7 +123,7 @@ mkCodecCborLazyBS cborMsgEncode cborMsgDecode = :: (forall s. CBOR.Decoder s a) -> m (DecodeStep LBS.ByteString CBOR.DeserialiseFailure m a) convertCborDecoder cborDecode = - withLiftST (convertCborDecoderLBS cborDecode) + convertCborDecoderLBS cborDecode stToIO convertCborDecoderLBS :: forall s m a. Monad m diff --git a/typed-protocols-examples/typed-protocols-examples.cabal b/typed-protocols-examples/typed-protocols-examples.cabal index 592a9817..3e8987a2 100644 --- a/typed-protocols-examples/typed-protocols-examples.cabal +++ b/typed-protocols-examples/typed-protocols-examples.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: typed-protocols-examples -version: 0.2.0.2 +version: 0.2.0.3 synopsis: Examples and tests for the typed-protocols framework -- description: license: Apache-2.0 @@ -48,8 +48,7 @@ library cborg, serialise, contra-tracer, - io-classes, - si-timers, + io-classes:{io-classes,si-timers}, time, typed-protocols, typed-protocols-cborg @@ -77,9 +76,8 @@ test-suite test , typed-protocols , typed-protocols-cborg , typed-protocols-examples - , io-classes + , io-classes:{io-classes,si-timers} , io-sim - , si-timers , QuickCheck , tasty , tasty-quickcheck diff --git a/typed-protocols/CHANGELOG.md b/typed-protocols/CHANGELOG.md index 983be47f..16b444cb 100644 --- a/typed-protocols/CHANGELOG.md +++ b/typed-protocols/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for typed-protocols-cborg +## 0.1.1.1 + +* Use `io-classes-1.6` + ## 0.1.0.7 -- 2023-10-20 * Improved performance of `prop_codecs_splitsM` and `prop_codecs_compatM`. diff --git a/typed-protocols/typed-protocols.cabal b/typed-protocols/typed-protocols.cabal index 1d92114d..69353ceb 100644 --- a/typed-protocols/typed-protocols.cabal +++ b/typed-protocols/typed-protocols.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: typed-protocols -version: 0.1.1.0 +version: 0.1.1.1 synopsis: A framework for strongly typed protocols -- description: license: Apache-2.0 @@ -32,7 +32,7 @@ library , TypeOperators , BangPatterns build-depends: base, - io-classes >= 1.0 && < 1.4 + io-classes ^>= 1.6 hs-source-dirs: src default-language: Haskell2010