Use safe exceptions everywhere

Author: ersran9

webapi-client-reflex-dom/src/WebApi/Client/Reflex.hs

@@ -9,7 +9,7 @@
 {-# LANGUAGE PolyKinds #-}
 module WebApi.Client.Reflex where
 
-import           Control.Exception
+import           Control.Exception.Safe
 import           Control.Monad
 import           Data.Bifunctor
 import           Data.ByteString (ByteString)

webapi-client-reflex-dom/webapi-client-reflex-dom.cabal

@@ -2,7 +2,7 @@
 -- further documentation, see http://haskell.org/cabal/users-guide/
 
 name:                webapi-client-reflex-dom
-version:             0.2.0.0
+version:             0.3.0.0
 synopsis:            Type safe XHR client for webapi using reflex-dom
 -- description:
 homepage:            https://github.com/byteally/webapi
@@ -20,7 +20,7 @@ library
   exposed-modules:     WebApi.Client.Reflex
   -- other-modules:
   build-depends:       base             >= 4.9    && < 5
-                     , webapi-contract  == 0.5.*
+                     , webapi-contract  == 0.6.*
                      , reflex           >= 0.6.4 && < 0.10
                      , reflex-dom-core  >= 0.7   && < 0.9
                      , ghcjs-dom
@@ -31,6 +31,8 @@ library
                      , case-insensitive >= 1.2
                      , http-types       >= 0.8
                      , http-media       >= 0.7 && < 0.9
+                     , safe-exceptions      >= 0.1.7    && < 0.2
+                                          
   hs-source-dirs:      src
   default-language:    Haskell2010
   ghc-options:         -Wall -Werror -O2

webapi-contract/src/WebApi/Contract.hs

@@ -83,7 +83,7 @@ module WebApi.Contract
        , OpId (..)
        ) where
 
-import           Control.Exception (SomeException, Exception)
+import           Control.Exception.Safe (SomeException, Exception)
 import           Data.Aeson        (Value)
 import           Data.Proxy
 import           Data.Text (Text)

webapi-contract/webapi-contract.cabal

@@ -3,7 +3,7 @@ cabal-version:       2.4
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                webapi-contract
-version:             0.5
+version:             0.6
 synopsis:            Contracts for webapi library
 description:         Contracts for webapi library
 homepage:            http://byteally.github.io/webapi/
@@ -37,6 +37,8 @@ common lib-common
                      , unordered-containers >= 0.2.4    && < 0.3
                      , choice               >= 0.2.2
                      , uuid-types           == 1.0.*
+                     , safe-exceptions      >= 0.1.7    && < 0.2
+
 
   ghc-options:         -Wall
   default-language:  Haskell2010

webapi-reflex-dom/src/WebApi/Reflex/Dom/Router.hs

@@ -76,7 +76,7 @@ import qualified Data.ByteString.Char8 as Char8
 import Data.Typeable
 import Data.Maybe
 import GHC.Stack
-import Control.Exception (SomeException (..), Exception(..))
+import Control.Exception.Safe (SomeException (..), Exception(..))
 
 -- Compact Start
 import           GHC.Records

webapi-reflex-dom/webapi-reflex-dom.cabal

@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               webapi-reflex-dom
-version:            0.2.0.0
+version:            0.3.0.0
 
 -- A short (one-line) description of the package.
 -- synopsis:
@@ -44,6 +44,8 @@ library
                     , mtl
                     , ref-tf
                     , exception-transformers
+                    , safe-exceptions      >= 0.1.7    && < 0.2
+                    
     hs-source-dirs:   src
     default-language: Haskell2010
 

webapi/ChangeLog.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.6
+* Use `Control.Exception.Safe` everywhere instead of `Control.Exception` from `base`.
+* Lift `client` to work over `MonadUnliftIO m` instead of `IO`.
+* Added support for GHC 9.6
+
+## 0.5
+* Added support for GHC 9.2
+
 ## 0.3
 * WebApiImplementation typeclass is renamed to WebApiServer
 * Swapped the order of FromParam and ToParam class parameters.

webapi/src/WebApi/Client.hs

@@ -58,7 +58,7 @@ module WebApi.Client
        , HC.tlsManagerSettings
        ) where
 
-import           Control.Exception
+import           Control.Exception.Safe
 import           Control.Monad ( (>=>) )
 import qualified Control.Monad.Catch as C
 import           Data.Bifunctor
@@ -75,7 +75,6 @@ import qualified Data.Text as T
 import           Data.Text.Encoding (decodeUtf8)
 import qualified Data.Text.Encoding as T
 import           Data.Time.Clock ( getCurrentTime, addUTCTime, nominalDay )
-import           Data.Typeable (Typeable)
 import           Data.Word
 import           GHC.Exts
 import qualified Network.HTTP.Client as HC

webapi/src/WebApi/Internal.hs

@@ -21,8 +21,7 @@
 module WebApi.Internal where
 
 import           Data.Text.Encoding                 (encodeUtf8Builder)
-import           Control.Exception
-import           Control.Monad.Catch                (MonadCatch)
+import           Control.Exception.Safe
 import           Control.Monad.IO.Class             (MonadIO)
 import           Control.Monad.Trans.Resource       (runResourceT,
                                                      withInternalState)
@@ -36,7 +35,6 @@ import           Data.Monoid                        ((<>))
 import           Data.Maybe                         (fromMaybe)
 import           Data.Proxy
 import qualified Data.Text                          as T (pack)
-import           Data.Typeable                      (Typeable)
 import           Network.HTTP.Media                 (MediaType, mapAcceptMedia,
                                                      matchAccept, matchContent
                                                     , mapAccept)

webapi/src/WebApi/Mock.hs

@@ -22,8 +22,7 @@ module WebApi.Mock
        , mockClient 
        ) where
 
-import Control.Exception
-import Data.Typeable (Typeable)
+import Control.Exception.Safe
 import GHC.Generics (Generic)
 import Network.HTTP.Types (Status, ok200)
 import qualified Network.Wai as Wai