[haskell-http-client] fixes for GHC 9

modules/openapi-generator/src/main/resources/haskell-http-client/Client.mustache

@@ -69,7 +69,7 @@ data MimeError =
   MimeError {
     mimeError :: String -- ^ unrender/parser error
   , mimeErrorResponse :: NH.Response BCL.ByteString -- ^ http response
-  } deriving (Eq, Show)
+  } deriving (Show)
 
 -- | send a request returning the 'MimeResult'
 dispatchMime
@@ -198,11 +198,11 @@ modifyInitRequestM (InitRequest req) f = fmap InitRequest (f req)
 -- | Run a block using the configured logger instance
 runConfigLog
   :: P.MonadIO m
-  => {{configType}} -> LogExec m
+  => {{configType}} -> LogExec m a
 runConfigLog config = configLogExecWithContext config (configLogContext config)
 
 -- | Run a block using the configured logger instance (logs exceptions)
 runConfigLogWithExceptions
   :: (E.MonadCatch m, P.MonadIO m)
-  => T.Text -> {{configType}} -> LogExec m
+  => T.Text -> {{configType}} -> LogExec m a
 runConfigLogWithExceptions src config = runConfigLog config . logExceptions src

modules/openapi-generator/src/main/resources/haskell-http-client/Core.mustache

@@ -35,6 +35,7 @@ import qualified Data.CaseInsensitive as CI
 import qualified Data.Data as P (Data, Typeable, TypeRep, typeRep)
 import qualified Data.Foldable as P
 import qualified Data.Ix as P
+import qualified Data.Kind as K (Type)
 import qualified Data.Maybe as P
 import qualified Data.Proxy as P (Proxy(..))
 import qualified Data.Text as T
@@ -46,9 +47,9 @@ import qualified Lens.Micro as L
 import qualified Network.HTTP.Client.MultipartFormData as NH
 import qualified Network.HTTP.Types as NH
 import qualified Prelude as P
+import qualified Text.Printf as T
 import qualified Web.FormUrlEncoded as WH
 import qualified Web.HttpApiData as WH
-import qualified Text.Printf as T
 
 import Control.Applicative ((<|>))
 import Control.Applicative (Alternative)
@@ -551,4 +552,4 @@ _showBinaryBase64 = T.decodeUtf8 . BL.toStrict . BL64.encode . unBinary
 -- * Lens Type Aliases
 
 type Lens_' s a = Lens_ s s a a
-type Lens_ s t a b = forall (f :: * -> *). Functor f => (a -> f b) -> s -> f t
+type Lens_ s t a b = forall (f :: K.Type -> K.Type). Functor f => (a -> f b) -> s -> f t

modules/openapi-generator/src/main/resources/haskell-http-client/LoggingKatip.mustache

@@ -25,11 +25,11 @@ import qualified Katip as LG
 -- * Type Aliases (for compatibility)
 
 -- | Runs a Katip logging block with the Log environment
-type LogExecWithContext = forall m. P.MonadIO m =>
-                                    LogContext -> LogExec m
+type LogExecWithContext = forall m a. P.MonadIO m =>
+                                      LogContext -> LogExec m a
 
 -- | A Katip logging block
-type LogExec m = forall a. LG.KatipT m a -> m a
+type LogExec m a = LG.KatipT m a -> m a
 
 -- | A Katip Log environment
 type LogContext = LG.LogEnv

modules/openapi-generator/src/main/resources/haskell-http-client/LoggingMonadLogger.mustache

@@ -15,19 +15,18 @@ import qualified Control.Monad.IO.Class as P
 import qualified Data.Text as T
 import qualified Data.Time as TI
 
-import Data.Monoid ((<>))
 import Data.Text (Text)
 
 import qualified Control.Monad.Logger as LG
 
 -- * Type Aliases (for compatibility)
 
 -- | Runs a monad-logger  block with the filter predicate
-type LogExecWithContext = forall m. P.MonadIO m =>
-                                    LogContext -> LogExec m
+type LogExecWithContext = forall m a. P.MonadIO m =>
+                                      LogContext -> LogExec m a
 
 -- | A monad-logger block
-type LogExec m = forall a. LG.LoggingT m a -> m a
+type LogExec m a = LG.LoggingT m a -> m a
 
 -- | A monad-logger filter predicate
 type LogContext = LG.LogSource -> LG.LogLevel -> Bool

modules/openapi-generator/src/main/resources/haskell-http-client/haskell-http-client.cabal.mustache

@@ -42,18 +42,18 @@ library
       aeson >=1.0 && <2.0
     , base >=4.7 && <5.0
     , base64-bytestring >1.0 && <2.0
-    , bytestring >=0.10.0 && <0.11
+    , bytestring >=0.10.0
     , case-insensitive
     , containers >=0.5.0.0 && <0.8
     , deepseq >= 1.4 && <1.6
     , exceptions >= 0.4
     , http-api-data >= 0.3.4 && <0.5
-    , http-client >=0.5 && <0.7
+    , http-client >=0.5 && <0.8
     , http-client-tls
     , http-media >= 0.4 && < 0.9
     , http-types >=0.8 && <0.13
     , iso8601-time >=0.1.3 && <0.2.0
-    , microlens >= 0.4.3 && <0.5
+    , microlens >= 0.4.3
     , mtl >=2.2.1
     , network >=2.6.2 && <3.9
     , random >=1.1
@@ -99,7 +99,7 @@ test-suite tests
     , QuickCheck
     , aeson
     , base >=4.7 && <5.0
-    , bytestring >=0.10.0 && <0.11
+    , bytestring >=0.10.0
     , containers
     , hspec >=1.8
     , iso8601-time

modules/openapi-generator/src/main/resources/haskell-http-client/stack.mustache

@@ -1,4 +1,4 @@
-resolver: lts-14.27
+resolver: lts-18.10
 build:
   haddock-arguments:
     haddock-args:

samples/client/petstore/haskell-http-client/docs/OpenAPIPetstore-API.html

@@ -1 +1 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>OpenAPIPetstore.API</title><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean" /><link rel="stylesheet" type="text/css" href="quick-jump.css" /><script src="haddock-bundle.min.js" async="async" type="text/javascript"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"></script></head><body><div id="package-header"><ul class="links" id="page-menu"><li><a href="src/OpenAPIPetstore.API.html">Source</a></li><li><a href="index.html">Contents</a></li><li><a href="doc-index.html">Index</a></li></ul><p class="caption">openapi-petstore-0.1.0.0: Auto-generated openapi-petstore API Client</p></div><div id="content"><div id="module-header"><table class="info"><tr><th>Safe Haskell</th><td>None</td></tr><tr><th>Language</th><td>Haskell2010</td></tr></table><p class="caption">OpenAPIPetstore.API</p></div><div id="description"><p class="caption">Description</p><div class="doc empty">&nbsp;</div></div><div id="interface"><h1>Documentation</h1><div class="top"><p class="src">module <a href="OpenAPIPetstore-API-AnotherFake.html">OpenAPIPetstore.API.AnotherFake</a></p></div><div class="top"><p class="src">module <a href="OpenAPIPetstore-API-Fake.html">OpenAPIPetstore.API.Fake</a></p></div><div class="top"><p class="src">module <a href="OpenAPIPetstore-API-FakeClassnameTags123.html">OpenAPIPetstore.API.FakeClassnameTags123</a></p></div><div class="top"><p class="src">module <a href="OpenAPIPetstore-API-Pet.html">OpenAPIPetstore.API.Pet</a></p></div><div class="top"><p class="src">module <a href="OpenAPIPetstore-API-Store.html">OpenAPIPetstore.API.Store</a></p></div><div class="top"><p class="src">module <a href="OpenAPIPetstore-API-User.html">OpenAPIPetstore.API.User</a></p></div></div></div><div id="footer"><p>Produced by <a href="http://www.haskell.org/haddock/">Haddock</a> version 2.22.0</p></div></body></html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><meta name="viewport" content="width=device-width, initial-scale=1" /><title>OpenAPIPetstore.API</title><link href="linuwial.css" rel="stylesheet" type="text/css" title="Linuwial" /><link rel="stylesheet" type="text/css" href="quick-jump.css" /><link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=PT+Sans:400,400i,700" /><script src="haddock-bundle.min.js" async="async" type="text/javascript"></script><script type="text/x-mathjax-config">MathJax.Hub.Config({ tex2jax: { processClass: "mathjax", ignoreClass: ".*" } });</script><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"></script></head><body><div id="package-header"><span class="caption">openapi-petstore-0.1.0.0: Auto-generated openapi-petstore API Client</span><ul class="links" id="page-menu"><li><a href="src/OpenAPIPetstore.API.html">Source</a></li><li><a href="index.html">Contents</a></li><li><a href="doc-index.html">Index</a></li></ul></div><div id="content"><div id="module-header"><table class="info"><tr><th>Safe Haskell</th><td>None</td></tr><tr><th>Language</th><td>Haskell2010</td></tr></table><p class="caption">OpenAPIPetstore.API</p></div><div id="description"><p class="caption">Description</p><div class="doc empty">&nbsp;</div></div><div id="interface"><h1>Documentation</h1><div class="top"><p class="src">module <a href="OpenAPIPetstore-API-AnotherFake.html">OpenAPIPetstore.API.AnotherFake</a></p></div><div class="top"><p class="src">module <a href="OpenAPIPetstore-API-Fake.html">OpenAPIPetstore.API.Fake</a></p></div><div class="top"><p class="src">module <a href="OpenAPIPetstore-API-FakeClassnameTags123.html">OpenAPIPetstore.API.FakeClassnameTags123</a></p></div><div class="top"><p class="src">module <a href="OpenAPIPetstore-API-Pet.html">OpenAPIPetstore.API.Pet</a></p></div><div class="top"><p class="src">module <a href="OpenAPIPetstore-API-Store.html">OpenAPIPetstore.API.Store</a></p></div><div class="top"><p class="src">module <a href="OpenAPIPetstore-API-User.html">OpenAPIPetstore.API.User</a></p></div></div></div><div id="footer"><p>Produced by <a href="http://www.haskell.org/haddock/">Haddock</a> version 2.24.2</p></div></body></html>