From 034a2d91f43dd894b5e38251abdc12d000672162 Mon Sep 17 00:00:00 2001 From: Edsko de Vries Date: Fri, 25 Oct 2024 09:17:28 +0200 Subject: [PATCH] Move back to using `data-default` See https://github.com/commercialhaskell/stackage/issues/7545 for rationale. --- grapesy/grapesy.cabal | 2 +- grapesy/src/Network/GRPC/Client/Connection.hs | 2 +- grapesy/src/Network/GRPC/Common.hs | 2 +- grapesy/src/Network/GRPC/Common/Compression.hs | 2 +- grapesy/src/Network/GRPC/Common/HTTP2Settings.hs | 2 +- grapesy/src/Network/GRPC/Util/TLS.hs | 2 +- grpc-spec/grpc-spec.cabal | 2 +- grpc-spec/src/Network/GRPC/Spec/Call.hs | 2 +- grpc-spec/src/Network/GRPC/Spec/CustomMetadata/NoMetadata.hs | 2 +- grpc-spec/src/Network/GRPC/Spec/Headers/Common.hs | 2 +- grpc-spec/src/Network/GRPC/Spec/MessageMeta.hs | 2 +- grpc-spec/src/Network/GRPC/Spec/Serialization/TraceContext.hs | 2 +- grpc-spec/src/Network/GRPC/Spec/TraceContext.hs | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/grapesy/grapesy.cabal b/grapesy/grapesy.cabal index 8a492a53..375f6aa5 100644 --- a/grapesy/grapesy.cabal +++ b/grapesy/grapesy.cabal @@ -150,7 +150,7 @@ library , crypton-x509 >= 1.7 && < 1.8 , crypton-x509-store >= 1.6 && < 1.7 , crypton-x509-system >= 1.6 && < 1.7 - , data-default-class >= 0.1 && < 0.2 + , data-default >= 0.7 && < 0.9 , deepseq >= 1.4 && < 1.6 , exceptions >= 0.10 && < 0.11 , grpc-spec >= 0.1 && < 0.2 diff --git a/grapesy/src/Network/GRPC/Client/Connection.hs b/grapesy/src/Network/GRPC/Client/Connection.hs index f862efe2..5e7e10e0 100644 --- a/grapesy/src/Network/GRPC/Client/Connection.hs +++ b/grapesy/src/Network/GRPC/Client/Connection.hs @@ -29,7 +29,7 @@ import Control.Concurrent import Control.Concurrent.STM import Control.Monad import Control.Monad.Catch -import Data.Default.Class +import Data.Default import GHC.Stack import Network.HPACK qualified as HPACK import Network.HTTP2.Client qualified as HTTP2.Client diff --git a/grapesy/src/Network/GRPC/Common.hs b/grapesy/src/Network/GRPC/Common.hs index bf740398..4de8aa32 100644 --- a/grapesy/src/Network/GRPC/Common.hs +++ b/grapesy/src/Network/GRPC/Common.hs @@ -80,7 +80,7 @@ module Network.GRPC.Common ( , Default(..) ) where -import Data.Default.Class +import Data.Default import Data.Proxy import Network.Socket (PortNumber) diff --git a/grapesy/src/Network/GRPC/Common/Compression.hs b/grapesy/src/Network/GRPC/Common/Compression.hs index d1cfb3fe..c273374c 100644 --- a/grapesy/src/Network/GRPC/Common/Compression.hs +++ b/grapesy/src/Network/GRPC/Common/Compression.hs @@ -28,7 +28,7 @@ module Network.GRPC.Common.Compression ( , insist ) where -import Data.Default.Class +import Data.Default import Data.Foldable (toList) import Data.List.NonEmpty (NonEmpty(..)) import Data.List.NonEmpty qualified as NE diff --git a/grapesy/src/Network/GRPC/Common/HTTP2Settings.hs b/grapesy/src/Network/GRPC/Common/HTTP2Settings.hs index 8f7bf24e..83514442 100644 --- a/grapesy/src/Network/GRPC/Common/HTTP2Settings.hs +++ b/grapesy/src/Network/GRPC/Common/HTTP2Settings.hs @@ -7,7 +7,7 @@ module Network.GRPC.Common.HTTP2Settings , defaultHTTP2Settings ) where -import Data.Default.Class +import Data.Default import Data.Word -- | HTTP\/2 settings diff --git a/grapesy/src/Network/GRPC/Util/TLS.hs b/grapesy/src/Network/GRPC/Util/TLS.hs index 01cc8717..1074218a 100644 --- a/grapesy/src/Network/GRPC/Util/TLS.hs +++ b/grapesy/src/Network/GRPC/Util/TLS.hs @@ -23,7 +23,7 @@ module Network.GRPC.Util.TLS ( ) where import Control.Exception -import Data.Default.Class +import Data.Default import Data.X509 qualified as X509 import Data.X509.CertificateStore qualified as X509 import System.Environment diff --git a/grpc-spec/grpc-spec.cabal b/grpc-spec/grpc-spec.cabal index c41db5f8..d343f743 100644 --- a/grpc-spec/grpc-spec.cabal +++ b/grpc-spec/grpc-spec.cabal @@ -131,7 +131,7 @@ library , bytestring >= 0.10.12 && < 0.13 , case-insensitive >= 1.2 && < 1.3 , containers >= 0.6 && < 0.8 - , data-default-class >= 0.1 && < 0.2 + , data-default >= 0.7 && < 0.9 , deepseq >= 1.4 && < 1.6 , exceptions >= 0.10 && < 0.11 , hashable >= 1.3 && < 1.5 diff --git a/grpc-spec/src/Network/GRPC/Spec/Call.hs b/grpc-spec/src/Network/GRPC/Spec/Call.hs index 8a03c7f4..6f90eaf0 100644 --- a/grpc-spec/src/Network/GRPC/Spec/Call.hs +++ b/grpc-spec/src/Network/GRPC/Spec/Call.hs @@ -5,7 +5,7 @@ module Network.GRPC.Spec.Call ( , callRequestMetadata ) where -import Data.Default.Class +import Data.Default import Data.Functor.Const import Network.GRPC.Spec.CustomMetadata.Typed diff --git a/grpc-spec/src/Network/GRPC/Spec/CustomMetadata/NoMetadata.hs b/grpc-spec/src/Network/GRPC/Spec/CustomMetadata/NoMetadata.hs index d614defc..5dc9f509 100644 --- a/grpc-spec/src/Network/GRPC/Spec/CustomMetadata/NoMetadata.hs +++ b/grpc-spec/src/Network/GRPC/Spec/CustomMetadata/NoMetadata.hs @@ -3,7 +3,7 @@ module Network.GRPC.Spec.CustomMetadata.NoMetadata ( ) where import Control.Monad.Catch -import Data.Default.Class +import Data.Default import Network.GRPC.Spec.CustomMetadata.Typed diff --git a/grpc-spec/src/Network/GRPC/Spec/Headers/Common.hs b/grpc-spec/src/Network/GRPC/Spec/Headers/Common.hs index 33851690..a9a800fb 100644 --- a/grpc-spec/src/Network/GRPC/Spec/Headers/Common.hs +++ b/grpc-spec/src/Network/GRPC/Spec/Headers/Common.hs @@ -22,7 +22,7 @@ module Network.GRPC.Spec.Headers.Common ( ) where import Data.ByteString qualified as Strict (ByteString) -import Data.Default.Class +import Data.Default import Data.Proxy import GHC.Generics (Generic) diff --git a/grpc-spec/src/Network/GRPC/Spec/MessageMeta.hs b/grpc-spec/src/Network/GRPC/Spec/MessageMeta.hs index da19dfe9..ff106ee4 100644 --- a/grpc-spec/src/Network/GRPC/Spec/MessageMeta.hs +++ b/grpc-spec/src/Network/GRPC/Spec/MessageMeta.hs @@ -5,7 +5,7 @@ module Network.GRPC.Spec.MessageMeta ( ) where import Control.DeepSeq (NFData) -import Data.Default.Class +import Data.Default import Data.Word import GHC.Generics (Generic) diff --git a/grpc-spec/src/Network/GRPC/Spec/Serialization/TraceContext.hs b/grpc-spec/src/Network/GRPC/Spec/Serialization/TraceContext.hs index 51e3b214..c18061d0 100644 --- a/grpc-spec/src/Network/GRPC/Spec/Serialization/TraceContext.hs +++ b/grpc-spec/src/Network/GRPC/Spec/Serialization/TraceContext.hs @@ -13,7 +13,7 @@ import Data.Binary.Get qualified as Get import Data.Binary.Put qualified as Put import Data.ByteString qualified as Strict (ByteString) import Data.ByteString.Lazy qualified as BS.Lazy -import Data.Default.Class +import Data.Default import Data.Maybe (maybeToList) import Data.Word diff --git a/grpc-spec/src/Network/GRPC/Spec/TraceContext.hs b/grpc-spec/src/Network/GRPC/Spec/TraceContext.hs index 6626c73b..c82abcc3 100644 --- a/grpc-spec/src/Network/GRPC/Spec/TraceContext.hs +++ b/grpc-spec/src/Network/GRPC/Spec/TraceContext.hs @@ -12,7 +12,7 @@ module Network.GRPC.Spec.TraceContext ( import Data.ByteString qualified as Strict (ByteString) import Data.ByteString.Base16 qualified as BS.Strict.Base16 import Data.ByteString.Char8 qualified as BS.Strict.Char8 -import Data.Default.Class +import Data.Default import Data.String import GHC.Generics (Generic)