Moved io-classes-mtl to a sublibrary of io-classes

input-output-hk · Aug 26, 2024 · 601938c · 601938c
1 parent 032578f
commit 601938c
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 314 deletions.
diff --git a/cabal.project b/cabal.project
@@ -2,7 +2,6 @@ index-state: hackage.haskell.org 2024-05-17T03:42:00Z
 
 packages: ./io-sim
           ./io-classes
-          ./io-classes-mtl
 
 package io-sim
   flags: +asserts

diff --git a/io-classes-mtl/CHANGELOG.md b/io-classes-mtl/CHANGELOG.md
diff --git a/io-classes-mtl/LICENSE b/io-classes-mtl/LICENSE
diff --git a/io-classes-mtl/NOTICE b/io-classes-mtl/NOTICE
diff --git a/io-classes-mtl/README.md b/io-classes-mtl/README.md
diff --git a/io-classes-mtl/io-classes-mtl.cabal b/io-classes-mtl/io-classes-mtl.cabal
diff --git a/io-classes/CHANGELOG.md b/io-classes/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Breaking changes
 
 * `strict-stm`, `strict-mvar` and `si-timers` are now public sublibraries of `io-classes` package.
+* Moved `io-classes-mtl` to `io-classes` as a public sublibrary.
 
 ## 1.5.0.0
 

diff --git a/io-classes/io-classes.cabal b/io-classes/io-classes.cabal
@@ -183,6 +183,30 @@ library si-timers
   if flag(asserts)
      ghc-options:      -fno-ignore-asserts
 
+-- https://github.com/haskell/cabal/issues/10277
+library io-classes-mtl
+    import:           warnings
+    visibility:       public
+    exposed-modules:  Control.Monad.Class.Trans
+                   ,  Control.Monad.Class.MonadEventlog.Trans
+                   ,  Control.Monad.Class.MonadSay.Trans
+                   ,  Control.Monad.Class.MonadST.Trans
+                   ,  Control.Monad.Class.MonadSTM.Trans
+                   ,  Control.Monad.Class.MonadThrow.Trans
+                   ,  Control.Monad.Class.MonadTime.Trans
+                   ,  Control.Monad.Class.MonadTime.SI.Trans
+                   ,  Control.Monad.Class.MonadTimer.Trans
+                   ,  Control.Monad.Class.MonadTimer.SI.Trans
+    build-depends:    base >=4.9 && <4.21,
+                      array,
+                      mtl,
+
+                      io-classes:{io-classes,si-timers}
+
+    hs-source-dirs:   mtl
+    default-language: Haskell2010
+    default-extensions:  ImportQualifiedPost
+
 library testlib
   import:              warnings
   visibility:          public

diff --git a/...ontrol/Monad/Class/MonadEventlog/Trans.hs → ...ontrol/Monad/Class/MonadEventlog/Trans.hs b/...ontrol/Monad/Class/MonadEventlog/Trans.hs → ...ontrol/Monad/Class/MonadEventlog/Trans.hs
diff --git a/.../src/Control/Monad/Class/MonadST/Trans.hs → .../mtl/Control/Monad/Class/MonadST/Trans.hs b/.../src/Control/Monad/Class/MonadST/Trans.hs → .../mtl/Control/Monad/Class/MonadST/Trans.hs
diff --git a/...src/Control/Monad/Class/MonadSTM/Trans.hs → ...mtl/Control/Monad/Class/MonadSTM/Trans.hs b/...src/Control/Monad/Class/MonadSTM/Trans.hs → ...mtl/Control/Monad/Class/MonadSTM/Trans.hs
diff --git a/...src/Control/Monad/Class/MonadSay/Trans.hs → ...mtl/Control/Monad/Class/MonadSay/Trans.hs b/...src/Control/Monad/Class/MonadSay/Trans.hs → ...mtl/Control/Monad/Class/MonadSay/Trans.hs
diff --git a/...c/Control/Monad/Class/MonadThrow/Trans.hs → ...l/Control/Monad/Class/MonadThrow/Trans.hs b/...c/Control/Monad/Class/MonadThrow/Trans.hs → ...l/Control/Monad/Class/MonadThrow/Trans.hs
diff --git a/...Control/Monad/Class/MonadTime/SI/Trans.hs → ...Control/Monad/Class/MonadTime/SI/Trans.hs b/...Control/Monad/Class/MonadTime/SI/Trans.hs → ...Control/Monad/Class/MonadTime/SI/Trans.hs
diff --git a/...rc/Control/Monad/Class/MonadTime/Trans.hs → ...tl/Control/Monad/Class/MonadTime/Trans.hs b/...rc/Control/Monad/Class/MonadTime/Trans.hs → ...tl/Control/Monad/Class/MonadTime/Trans.hs
diff --git a/...ontrol/Monad/Class/MonadTimer/SI/Trans.hs → ...ontrol/Monad/Class/MonadTimer/SI/Trans.hs b/...ontrol/Monad/Class/MonadTimer/SI/Trans.hs → ...ontrol/Monad/Class/MonadTimer/SI/Trans.hs
diff --git a/...c/Control/Monad/Class/MonadTimer/Trans.hs → ...l/Control/Monad/Class/MonadTimer/Trans.hs b/...c/Control/Monad/Class/MonadTimer/Trans.hs → ...l/Control/Monad/Class/MonadTimer/Trans.hs
diff --git a/...sses-mtl/src/Control/Monad/Class/Trans.hs → io-classes/mtl/Control/Monad/Class/Trans.hs b/...sses-mtl/src/Control/Monad/Class/Trans.hs → io-classes/mtl/Control/Monad/Class/Trans.hs