allow async 2.2, ghc 8.4 compatibility

joelburget · Mar 25, 2018 · 6c20c18 · 6c20c18
1 parent 4acfad5
commit 6c20c18
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/easytest.cabal b/easytest.cabal
@@ -83,7 +83,7 @@ library
 
   -- these bounds could probably be made looser
   build-depends:
-    async                     >= 2.1      && <= 2.2,
+    async                     >= 2.1      && <= 2.3,
     base                      >= 4.5      && <= 5,
     mtl                       >= 2.0.1    && < 2.3,
     containers                >= 0.4.0    && < 0.6,

diff --git a/src/EasyTest/Internal.hs b/src/EasyTest/Internal.hs
@@ -29,7 +29,9 @@ import Control.Monad
 import Control.Monad.IO.Class
 import Control.Monad.Reader
 import Data.List (isPrefixOf)
+#if !(MIN_VERSION_base(4,11,0))
 import Data.Semigroup
+#endif
 import Data.String (IsString(..))
 import Data.Text (Text)
 import qualified Data.Text as T

diff --git a/src/EasyTest/Porcelain.hs b/src/EasyTest/Porcelain.hs
@@ -34,7 +34,9 @@ import Control.Exception
 import Control.Monad
 import Control.Monad.IO.Class
 import Control.Monad.Reader
+#if !(MIN_VERSION_base(4,11,0))
 import Data.Semigroup
+#endif
 import Data.Text (Text)
 import qualified Data.Text as T
 import qualified Data.Text.IO as T