Use io-classes-1.2 and strict-checked-vars-0.1.0.1

IntersectMBO · Aug 2, 2023 · 2caa42b · 2caa42b
1 parent 5979d62
commit 2caa42b
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/cabal.project.local b/.github/workflows/cabal.project.local
@@ -4,8 +4,8 @@ ignore-project: False
 tests: True
 benchmarks: True
 
-package strict-stm
-  flags: +checktvarinvariant
+package strict-checked-vars
+  flags: +checktvarinvariants +checkmvarinvariants
 
 program-options
   ghc-options: -Werror
@@ -21,9 +21,6 @@ package io-sim
   ghc-options: -Werror
   flags: +asserts
 
-package io-classes
-  flags: +checktvarinvariant
-
 package typed-protocols
   ghc-options: -Werror
 

diff --git a/cabal.project b/cabal.project
@@ -16,9 +16,9 @@ repository cardano-haskell-packages
 index-state: 2023-03-29T00:00:00Z
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2023-05-29T09:27:07Z
+  , hackage.haskell.org 2023-07-28T17:40:00Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2023-05-16T03:39:10Z
+  , cardano-haskell-packages 2023-08-02T10:58:44Z
 
 packages: ./cardano-ping
           ./monoidal-synchronisation

diff --git a/cardano-client/cardano-client.cabal b/cardano-client/cardano-client.cabal
@@ -21,7 +21,7 @@ library
   build-depends:       base              >=4.14 && <4.19,
                        bytestring        >=0.10 && <0.12,
                        containers,
-                       io-classes       ^>=1.1,
+                       io-classes       ^>=1.2,
                        ouroboros-network-api,
                        ouroboros-network,
                        ouroboros-network-framework,

diff --git a/cardano-ping/cardano-ping.cabal b/cardano-ping/cardano-ping.cabal
@@ -29,7 +29,7 @@ library
                         contra-tracer                 >=0.1      && <0.2,
                         time,
 
-                        si-timers                    ^>=1.1,
+                        si-timers                    ^>=1.2,
                         strict-stm,
 
                         network-mux                  ^>=0.4,

diff --git a/network-mux/network-mux.cabal b/network-mux/network-mux.cabal
@@ -46,7 +46,7 @@ common demo-deps
 
 library
   build-depends:       base            >=4.14 && <4.19,
-                       io-classes     ^>=1.1,
+                       io-classes     ^>=1.2,
                        strict-stm,
                        si-timers,
                        contra-tracer   >=0.1 && <0.2,

diff --git a/ouroboros-network-api/ouroboros-network-api.cabal b/ouroboros-network-api/ouroboros-network-api.cabal
@@ -65,11 +65,11 @@ library
                        cardano-strict-containers,
                        contra-tracer,
 
-                       io-classes       ^>=1.1,
+                       io-classes       ^>=1.2,
                        network-mux      ^>=0.4,
                        strict-stm,
                        si-timers,
-                       typed-protocols  ^>=0.1.0.4,
+                       typed-protocols  ^>=0.1.0.6,
 
   ghc-options:         -Wall
                        -Wno-unticked-promoted-constructors

diff --git a/ouroboros-network-framework/ouroboros-network-framework.cabal b/ouroboros-network-framework/ouroboros-network-framework.cabal
@@ -86,7 +86,7 @@ library
                      , cardano-prelude
                      , contra-tracer
 
-                     , io-classes     ^>=1.1
+                     , io-classes     ^>=1.2
                      , si-timers
                      , strict-stm
 

diff --git a/ouroboros-network-protocols/ouroboros-network-protocols.cabal b/ouroboros-network-protocols/ouroboros-network-protocols.cabal
@@ -97,7 +97,7 @@ library
                        bytestring        >=0.10 && <0.12,
                        cborg             >=0.2.1 && <0.3,
 
-                       io-classes       ^>=1.1,
+                       io-classes       ^>=1.2,
                        si-timers,
 
                        ouroboros-network-api

diff --git a/ouroboros-network-testing/ouroboros-network-testing.cabal b/ouroboros-network-testing/ouroboros-network-testing.cabal
@@ -62,7 +62,7 @@ library
                        containers,
                        contra-tracer,
                        deque            ^>=0.4,
-                       io-classes       ^>=1.1,
+                       io-classes       ^>=1.2,
                        io-sim,
                        psqueues          >=0.2.3 && <0.3,
                        si-timers,

diff --git a/ouroboros-network/ouroboros-network.cabal b/ouroboros-network/ouroboros-network.cabal
@@ -117,15 +117,16 @@ library
                        cardano-strict-containers,
                        contra-tracer,
                        monoidal-synchronisation,
+                       strict-checked-vars ^>= 0.1.0.1,
 
-                       io-classes       ^>=1.1,
+                       io-classes       ^>=1.2,
                        io-classes-mtl   ^>=0.1,
                        network-mux,
                        si-timers,
                        ouroboros-network-api       ^>=0.5,
                        ouroboros-network-framework ^>=0.7,
                        ouroboros-network-protocols ^>=0.5.1.0,
-                       strict-stm                  ^>=1.1.0.1,
+                       strict-stm,
                        typed-protocols   >=0.1.0.4 && <1.0,
   if !os(windows)
     build-depends:     directory,

diff --git a/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerMetric.hs b/ouroboros-network/src/Ouroboros/Network/PeerSelection/PeerMetric.hs
@@ -33,7 +33,8 @@ module Ouroboros.Network.PeerSelection.PeerMetric
   , newPeerMetric'
   ) where
 
-import           Control.Concurrent.Class.MonadSTM.Strict
+import           Control.Concurrent.Class.MonadSTM.Strict.TVar.Checked.Switch
+import           Control.Monad.Class.MonadSTM
 import           Control.DeepSeq (NFData (..))
 import           Control.Monad (when)
 import           Control.Monad.Class.MonadTime.SI

diff --git a/ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound.hs b/ouroboros-network/src/Ouroboros/Network/TxSubmission/Inbound.hs
@@ -29,7 +29,8 @@ import           NoThunks.Class (NoThunks (..), unsafeNoThunks)
 
 import           Cardano.Prelude (forceElemsToWHNF)
 
-import           Control.Concurrent.Class.MonadSTM.Strict
+import           Control.Concurrent.Class.MonadSTM.Strict.TVar.Checked.Switch
+import           Control.Monad.Class.MonadSTM
 import           Control.Exception (assert)
 import           Control.Monad (unless)
 import           Control.Monad.Class.MonadThrow