diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### 3.9.4 [2022.12.30] +* Allow building with `aeson-2.1.*`. + ### 3.9.3 [2022.12.28] * Add `TextShow` instances for `Value` and `Key` from `aeson`. * Drop support for GHC 7.8 and 7.10. diff --git a/src/TextShow/Control/Applicative/Trans.hs b/src/TextShow/Control/Applicative/Trans.hs --- a/src/TextShow/Control/Applicative/Trans.hs +++ b/src/TextShow/Control/Applicative/Trans.hs @@ -1,5 +1,5 @@ {-# LANGUAGE OverloadedStrings #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.Control.Applicative.Trans Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/Control/Monad/Trans.hs b/src/TextShow/Control/Monad/Trans.hs --- a/src/TextShow/Control/Monad/Trans.hs +++ b/src/TextShow/Control/Monad/Trans.hs @@ -1,5 +1,5 @@ {-# LANGUAGE OverloadedStrings #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.Control.Monad.Trans Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/Data/Aeson.hs b/src/TextShow/Data/Aeson.hs --- a/src/TextShow/Data/Aeson.hs +++ b/src/TextShow/Data/Aeson.hs @@ -1,5 +1,5 @@ {-# LANGUAGE OverloadedStrings #-} -{-# OPTIONS -fno-warn-orphans #-} +{-# OPTIONS -Wno-orphans #-} module TextShow.Data.Aeson where import Data.Aeson (Value(..)) diff --git a/src/TextShow/Data/Bifunctor.hs b/src/TextShow/Data/Bifunctor.hs --- a/src/TextShow/Data/Bifunctor.hs +++ b/src/TextShow/Data/Bifunctor.hs @@ -3,7 +3,7 @@ {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE UndecidableInstances #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.Data.Bifunctor diff --git a/src/TextShow/Data/Binary.hs b/src/TextShow/Data/Binary.hs --- a/src/TextShow/Data/Binary.hs +++ b/src/TextShow/Data/Binary.hs @@ -1,6 +1,6 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} #if __GLASGOW_HASKELL__ == 800 -- See Note [Increased simpl-tick-factor on old GHCs] {-# OPTIONS_GHC -fsimpl-tick-factor=200 #-} diff --git a/src/TextShow/Data/Containers.hs b/src/TextShow/Data/Containers.hs --- a/src/TextShow/Data/Containers.hs +++ b/src/TextShow/Data/Containers.hs @@ -1,5 +1,5 @@ {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS -fno-warn-orphans #-} +{-# OPTIONS -Wno-orphans #-} {-| Module: TextShow.Data.Containers Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/Data/Functor/Trans.hs b/src/TextShow/Data/Functor/Trans.hs --- a/src/TextShow/Data/Functor/Trans.hs +++ b/src/TextShow/Data/Functor/Trans.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE PolyKinds #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.Data.Functor.Trans Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/Data/Scientific.hs b/src/TextShow/Data/Scientific.hs --- a/src/TextShow/Data/Scientific.hs +++ b/src/TextShow/Data/Scientific.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fno-warn-orphans #-} +{-# OPTIONS -Wno-orphans #-} module TextShow.Data.Scientific () where import Data.Scientific import Data.Text.Lazy.Builder.Scientific ( scientificBuilder ) diff --git a/src/TextShow/Data/ShortText.hs b/src/TextShow/Data/ShortText.hs --- a/src/TextShow/Data/ShortText.hs +++ b/src/TextShow/Data/ShortText.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.Data.ShortText Copyright: (C) 2014-2018 Ryan Scott diff --git a/src/TextShow/Data/Tagged.hs b/src/TextShow/Data/Tagged.hs --- a/src/TextShow/Data/Tagged.hs +++ b/src/TextShow/Data/Tagged.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE PolyKinds #-} -{-# OPTIONS -fno-warn-orphans #-} +{-# OPTIONS -Wno-orphans #-} {-| Module: TextShow.Data.Tagged Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/Data/Time.hs b/src/TextShow/Data/Time.hs --- a/src/TextShow/Data/Time.hs +++ b/src/TextShow/Data/Time.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.Data.Time Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/Data/UUID.hs b/src/TextShow/Data/UUID.hs --- a/src/TextShow/Data/UUID.hs +++ b/src/TextShow/Data/UUID.hs @@ -1,4 +1,4 @@ -{-# OPTIONS -fno-warn-orphans #-} +{-# OPTIONS -Wno-orphans #-} module TextShow.Data.UUID where import qualified Data.UUID.Types as U diff --git a/src/TextShow/Data/UnorderedContainers.hs b/src/TextShow/Data/UnorderedContainers.hs --- a/src/TextShow/Data/UnorderedContainers.hs +++ b/src/TextShow/Data/UnorderedContainers.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.Data.UnorderedContainers Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/Data/Vector.hs b/src/TextShow/Data/Vector.hs --- a/src/TextShow/Data/Vector.hs +++ b/src/TextShow/Data/Vector.hs @@ -1,5 +1,5 @@ {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.Data.Vector Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/GHC/ForeignSrcLang/Type.hs b/src/TextShow/GHC/ForeignSrcLang/Type.hs --- a/src/TextShow/GHC/ForeignSrcLang/Type.hs +++ b/src/TextShow/GHC/ForeignSrcLang/Type.hs @@ -2,7 +2,7 @@ #if MIN_VERSION_ghc_boot_th(8,2,0) {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} #endif {-| diff --git a/src/TextShow/GHC/LanguageExtensions/Type.hs b/src/TextShow/GHC/LanguageExtensions/Type.hs --- a/src/TextShow/GHC/LanguageExtensions/Type.hs +++ b/src/TextShow/GHC/LanguageExtensions/Type.hs @@ -1,5 +1,5 @@ {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.GHC.LanguageExtensions.Type diff --git a/src/TextShow/Language/Haskell/TH.hs b/src/TextShow/Language/Haskell/TH.hs --- a/src/TextShow/Language/Haskell/TH.hs +++ b/src/TextShow/Language/Haskell/TH.hs @@ -3,7 +3,7 @@ {-# LANGUAGE MagicHash #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeSynonymInstances #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.Language.Haskell.TH Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/System/Console/Haskeline.hs b/src/TextShow/System/Console/Haskeline.hs --- a/src/TextShow/System/Console/Haskeline.hs +++ b/src/TextShow/System/Console/Haskeline.hs @@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.System.Console.Haskeline Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/System/Console/Terminfo.hs b/src/TextShow/System/Console/Terminfo.hs --- a/src/TextShow/System/Console/Terminfo.hs +++ b/src/TextShow/System/Console/Terminfo.hs @@ -2,7 +2,7 @@ #if !defined(mingw32_HOST_OS) {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} #endif {-| diff --git a/src/TextShow/System/Directory.hs b/src/TextShow/System/Directory.hs --- a/src/TextShow/System/Directory.hs +++ b/src/TextShow/System/Directory.hs @@ -1,5 +1,5 @@ {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.System.Directory Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/System/Locale.hs b/src/TextShow/System/Locale.hs --- a/src/TextShow/System/Locale.hs +++ b/src/TextShow/System/Locale.hs @@ -1,5 +1,5 @@ {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.System.Locale Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/System/Posix.hs b/src/TextShow/System/Posix.hs --- a/src/TextShow/System/Posix.hs +++ b/src/TextShow/System/Posix.hs @@ -2,7 +2,7 @@ #if !defined(mingw32_HOST_OS) {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} #endif {-| diff --git a/src/TextShow/System/Random.hs b/src/TextShow/System/Random.hs --- a/src/TextShow/System/Random.hs +++ b/src/TextShow/System/Random.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.System.Random Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/System/Time.hs b/src/TextShow/System/Time.hs --- a/src/TextShow/System/Time.hs +++ b/src/TextShow/System/Time.hs @@ -1,5 +1,5 @@ {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.System.Time Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/System/Win32.hs b/src/TextShow/System/Win32.hs --- a/src/TextShow/System/Win32.hs +++ b/src/TextShow/System/Win32.hs @@ -3,7 +3,7 @@ #if defined(mingw32_HOST_OS) {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} #endif {-| diff --git a/src/TextShow/Text/PrettyPrint.hs b/src/TextShow/Text/PrettyPrint.hs --- a/src/TextShow/Text/PrettyPrint.hs +++ b/src/TextShow/Text/PrettyPrint.hs @@ -1,5 +1,5 @@ {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.Text.PrettyPrint Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/Text/XHtml.hs b/src/TextShow/Text/XHtml.hs --- a/src/TextShow/Text/XHtml.hs +++ b/src/TextShow/Text/XHtml.hs @@ -1,5 +1,5 @@ {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.Text.XHtml Copyright: (C) 2014-2017 Ryan Scott diff --git a/src/TextShow/Trace/Hpc.hs b/src/TextShow/Trace/Hpc.hs --- a/src/TextShow/Trace/Hpc.hs +++ b/src/TextShow/Trace/Hpc.hs @@ -1,5 +1,5 @@ {-# LANGUAGE TemplateHaskell #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: TextShow.Trace.Hpc Copyright: (C) 2014-2017 Ryan Scott diff --git a/tests/Instances/Control/Monad/Trans.hs b/tests/Instances/Control/Monad/Trans.hs --- a/tests/Instances/Control/Monad/Trans.hs +++ b/tests/Instances/Control/Monad/Trans.hs @@ -2,7 +2,7 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE UndecidableInstances #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.Control.Monad.Trans Copyright: (C) 2014-2017 Ryan Scott diff --git a/tests/Instances/Data/Bifunctor.hs b/tests/Instances/Data/Bifunctor.hs --- a/tests/Instances/Data/Bifunctor.hs +++ b/tests/Instances/Data/Bifunctor.hs @@ -2,7 +2,7 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE UndecidableInstances #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.Data.Bifunctor diff --git a/tests/Instances/Data/Binary.hs b/tests/Instances/Data/Binary.hs --- a/tests/Instances/Data/Binary.hs +++ b/tests/Instances/Data/Binary.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.Data.Binary Copyright: (C) 2014-2017 Ryan Scott diff --git a/tests/Instances/Data/Containers.hs b/tests/Instances/Data/Containers.hs --- a/tests/Instances/Data/Containers.hs +++ b/tests/Instances/Data/Containers.hs @@ -3,7 +3,7 @@ {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.Data.Containers Copyright: (C) 2014-2017 Ryan Scott diff --git a/tests/Instances/Data/Time.hs b/tests/Instances/Data/Time.hs --- a/tests/Instances/Data/Time.hs +++ b/tests/Instances/Data/Time.hs @@ -3,7 +3,7 @@ #if MIN_VERSION_time(1,8,0) {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} #endif {-| diff --git a/tests/Instances/Data/Vector.hs b/tests/Instances/Data/Vector.hs --- a/tests/Instances/Data/Vector.hs +++ b/tests/Instances/Data/Vector.hs @@ -1,6 +1,6 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.Data.Vector Copyright: (C) 2014-2017 Ryan Scott diff --git a/tests/Instances/GHC/ForeignSrcLang/Type.hs b/tests/Instances/GHC/ForeignSrcLang/Type.hs --- a/tests/Instances/GHC/ForeignSrcLang/Type.hs +++ b/tests/Instances/GHC/ForeignSrcLang/Type.hs @@ -2,7 +2,7 @@ #if MIN_VERSION_ghc_boot_th(8,2,0) {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} #endif {-| diff --git a/tests/Instances/GHC/LanguageExtensions/Type.hs b/tests/Instances/GHC/LanguageExtensions/Type.hs --- a/tests/Instances/GHC/LanguageExtensions/Type.hs +++ b/tests/Instances/GHC/LanguageExtensions/Type.hs @@ -1,5 +1,5 @@ {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.GHC.LanguageExtensions.Type diff --git a/tests/Instances/Language/Haskell/TH.hs b/tests/Instances/Language/Haskell/TH.hs --- a/tests/Instances/Language/Haskell/TH.hs +++ b/tests/Instances/Language/Haskell/TH.hs @@ -1,7 +1,7 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.Language.Haskell.TH Copyright: (C) 2014-2017 Ryan Scott diff --git a/tests/Instances/Miscellaneous.hs b/tests/Instances/Miscellaneous.hs --- a/tests/Instances/Miscellaneous.hs +++ b/tests/Instances/Miscellaneous.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.Miscellaneous Copyright: (C) 2014-2017 Ryan Scott diff --git a/tests/Instances/System/Console/Haskeline.hs b/tests/Instances/System/Console/Haskeline.hs --- a/tests/Instances/System/Console/Haskeline.hs +++ b/tests/Instances/System/Console/Haskeline.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.System.Console.Haskeline Copyright: (C) 2014-2017 Ryan Scott diff --git a/tests/Instances/System/Console/Terminfo.hs b/tests/Instances/System/Console/Terminfo.hs --- a/tests/Instances/System/Console/Terminfo.hs +++ b/tests/Instances/System/Console/Terminfo.hs @@ -4,7 +4,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} #endif {-| diff --git a/tests/Instances/System/Directory.hs b/tests/Instances/System/Directory.hs --- a/tests/Instances/System/Directory.hs +++ b/tests/Instances/System/Directory.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.System.Directory Copyright: (C) 2014-2017 Ryan Scott diff --git a/tests/Instances/System/Locale.hs b/tests/Instances/System/Locale.hs --- a/tests/Instances/System/Locale.hs +++ b/tests/Instances/System/Locale.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.System.Locale Copyright: (C) 2014-2017 Ryan Scott diff --git a/tests/Instances/System/Posix.hs b/tests/Instances/System/Posix.hs --- a/tests/Instances/System/Posix.hs +++ b/tests/Instances/System/Posix.hs @@ -3,7 +3,7 @@ #if !defined(mingw32_HOST_OS) {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} #endif {-| diff --git a/tests/Instances/System/Random.hs b/tests/Instances/System/Random.hs --- a/tests/Instances/System/Random.hs +++ b/tests/Instances/System/Random.hs @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.System.Random Copyright: (C) 2014-2017 Ryan Scott diff --git a/tests/Instances/System/Win32.hs b/tests/Instances/System/Win32.hs --- a/tests/Instances/System/Win32.hs +++ b/tests/Instances/System/Win32.hs @@ -4,7 +4,7 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} #endif {-| diff --git a/tests/Instances/Text/PrettyPrint.hs b/tests/Instances/Text/PrettyPrint.hs --- a/tests/Instances/Text/PrettyPrint.hs +++ b/tests/Instances/Text/PrettyPrint.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.Text.PrettyPrint Copyright: (C) 2014-2017 Ryan Scott diff --git a/tests/Instances/Text/XHtml.hs b/tests/Instances/Text/XHtml.hs --- a/tests/Instances/Text/XHtml.hs +++ b/tests/Instances/Text/XHtml.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE StandaloneDeriving #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.Text.XHtml Copyright: (C) 2014-2017 Ryan Scott diff --git a/tests/Instances/Trace/Hpc.hs b/tests/Instances/Trace/Hpc.hs --- a/tests/Instances/Trace/Hpc.hs +++ b/tests/Instances/Trace/Hpc.hs @@ -2,7 +2,7 @@ {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeFamilies #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-| Module: Instances.Trace.Hpc Copyright: (C) 2014-2017 Ryan Scott diff --git a/text-show-instances.cabal b/text-show-instances.cabal --- a/text-show-instances.cabal +++ b/text-show-instances.cabal @@ -1,5 +1,5 @@ name: text-show-instances -version: 3.9.3 +version: 3.9.4 synopsis: Additional instances for text-show description: @text-show-instances@ is a supplemental library to @text-show@ that provides additional @Show@ instances for data types in @@ -124,7 +124,7 @@ TextShow.System.Console.Terminfo TextShow.System.Posix other-modules: TextShow.Utils - build-depends: aeson >= 2.0.3 && < 2.1 + build-depends: aeson >= 2.0.3 && < 2.2 , base >= 4.9 && < 4.18 , base-compat >= 0.10 && < 1 , bifunctors >= 5.2 && < 6 @@ -232,7 +232,7 @@ -- Only defines tests if not using Windows Spec.System.Console.TerminfoSpec Spec.System.PosixSpec - build-depends: aeson >= 2.0.3 && < 2.1 + build-depends: aeson >= 2.0.3 && < 2.2 , base >= 4.9 && < 4.18 , base-compat >= 0.10 && < 1 , bifunctors >= 5.5.5 && < 6