diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### 3.6.4 [2018.04.07] +* Use `base-compat-batteries`. + ### 3.6.3 [2018.03.15] * GHC 8.4 fixes diff --git a/src/TextShow/Compiler/Hoopl.hs b/src/TextShow/Compiler/Hoopl.hs --- a/src/TextShow/Compiler/Hoopl.hs +++ b/src/TextShow/Compiler/Hoopl.hs @@ -27,7 +27,8 @@ #endif import Compiler.Hoopl.Passes.Dominator (DominatorNode(..), DominatorTree(..), DPath(..)) -import Data.Monoid.Compat +import Prelude () +import Prelude.Compat import TextShow (TextShow(..), TextShow1(..), TextShow2(..), Builder, singleton, showbPrec1) 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 @@ -16,7 +16,9 @@ module TextShow.Data.Binary () where import Data.Binary.Get.Internal (Decoder(..)) -import Data.Monoid.Compat + +import Prelude () +import Prelude.Compat import TextShow (TextShow(..), TextShow1(..), Builder, fromString, showbPrec1) 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 @@ -19,7 +19,6 @@ module TextShow.Data.Time () where import Data.Fixed (Pico) -import Data.Monoid.Compat import Data.Semigroup (mtimesDefault) import Data.Time.Calendar (Day, toGregorian) import Data.Time.Clock (DiffTime, UTCTime, NominalDiffTime, UniversalTime) @@ -27,6 +26,9 @@ import Data.Time.Format (NumericPadOption) import Data.Time.LocalTime (TimeZone(..), TimeOfDay(..), LocalTime(..), ZonedTime(..), ut1ToLocalTime, utc, utcToLocalTime, utcToZonedTime) + +import Prelude () +import Prelude.Compat import TextShow (TextShow(..), Builder, FromStringShow(..), fromString, lengthB, showbSpace, singleton) 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 @@ -20,9 +20,11 @@ import Data.Char (isAlpha) import Data.Maybe (fromJust) -import Data.Monoid.Compat import qualified Data.Text.Lazy as TL (Text, dropWhile, null, tail) import Data.Text.Lazy (uncons) + +import Prelude () +import Prelude.Compat #if !(MIN_VERSION_template_haskell(2,10,0)) import GHC.Exts (Int(I#)) 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 @@ -27,7 +27,8 @@ import System.Win32.Info (ProcessorArchitecture, SYSTEM_INFO) import System.Win32.Time (FILETIME, SYSTEMTIME, TIME_ZONE_INFORMATION, TimeZoneId) # if MIN_VERSION_Win32(2,5,0) -import Data.Monoid.Compat ((<>)) +import Prelude () +import Prelude.Compat import Graphics.Win32.GDI.AlphaBlend (BLENDFUNCTION) import System.Win32.Automation.Input (HARDWAREINPUT, INPUT) 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 @@ -22,7 +22,8 @@ #endif ) where -import Data.Monoid.Compat +import Prelude () +import Prelude.Compat import Text.PrettyPrint.HughesPJ (Doc, Mode, Style(..), TextDetails(..), fullRender, style) 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 @@ -14,7 +14,8 @@ -} module TextShow.Text.XHtml () where -import Data.Monoid.Compat +import Prelude () +import Prelude.Compat import Text.XHtml.Frameset (Html, HtmlAttr, HotLink, htmlAttrPair, renderHtmlFragment) 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 @@ -14,7 +14,8 @@ -} module TextShow.Trace.Hpc () where -import Data.Monoid.Compat +import Prelude () +import Prelude.Compat import TextShow (TextShow(..), FromStringShow(..), singleton) import TextShow.Data.Time () 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.6.3 +version: 3.6.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 @@ -136,28 +136,28 @@ TextShow.System.Console.Terminfo TextShow.System.Posix other-modules: TextShow.Utils - build-depends: base-compat >= 0.8.1 && < 1 - , bifunctors >= 5.2 && < 6 - , binary >= 0.6 && < 0.9 - , bytestring  >= 0.9 && < 0.11 - , containers >= 0.1 && < 0.6 - , directory >= 1 && < 1.4 - , haskeline >= 0.7 && < 0.8 - , hoopl >= 3.8.7 && < 3.11 - , hpc >= 0.5 && < 0.7 - , old-locale >= 1 && < 1.1 - , old-time >= 1 && < 1.2 - , pretty >= 1 && < 1.2 - , process >= 1 && < 1.7 - , random >= 1.0.1 && < 1.2 - , semigroups >= 0.16.2 && < 1 - , tagged >= 0.4.4 && < 1 - , text >= 0.11.1 && < 1.3 - , text-show >= 3.4 && < 4 - , time >= 0.1 && < 1.9 - , unordered-containers >= 0.2 && < 0.3 - , vector >= 0.9 && < 0.13 - , xhtml >= 3000.2 && < 3000.3 + build-depends: base-compat-batteries >= 0.10 && < 1 + , bifunctors >= 5.2 && < 6 + , binary >= 0.6 && < 0.9 + , bytestring  >= 0.9 && < 0.11 + , containers >= 0.1 && < 0.6 + , directory >= 1 && < 1.4 + , haskeline >= 0.7 && < 0.8 + , hoopl >= 3.8.7 && < 3.11 + , hpc >= 0.5 && < 0.7 + , old-locale >= 1 && < 1.1 + , old-time >= 1 && < 1.2 + , pretty >= 1 && < 1.2 + , process >= 1 && < 1.7 + , random >= 1.0.1 && < 1.2 + , semigroups >= 0.16.2 && < 1 + , tagged >= 0.4.4 && < 1 + , text >= 0.11.1 && < 1.3 + , text-show >= 3.4 && < 4 + , time >= 0.1 && < 1.9 + , unordered-containers >= 0.2 && < 0.3 + , vector >= 0.9 && < 0.13 + , xhtml >= 3000.2 && < 3000.3 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall @@ -260,34 +260,34 @@ -- Only defines tests if not using Windows Spec.System.Console.TerminfoSpec Spec.System.PosixSpec - build-depends: base-compat >= 0.8.1 && < 1 - , bifunctors >= 5.2 && < 6 - , binary >= 0.6 && < 0.9 - , bytestring  >= 0.9 && < 0.11 - , containers >= 0.1 && < 0.6 - , directory >= 1 && < 1.4 - , generic-deriving >= 1.9 && < 2 + build-depends: base-compat-batteries >= 0.10 && < 1 + , bifunctors >= 5.2 && < 6 + , binary >= 0.6 && < 0.9 + , bytestring  >= 0.9 && < 0.11 + , containers >= 0.1 && < 0.6 + , directory >= 1 && < 1.4 + , generic-deriving >= 1.9 && < 2 , ghc-prim - , haskeline >= 0.7 && < 0.8 - , hoopl >= 3.8.7 && < 3.11 - , hpc >= 0.5 && < 0.7 - , hspec >= 2 && < 3 - , old-locale >= 1 && < 1.1 - , old-time >= 1 && < 1.2 - , pretty >= 1 && < 1.2 - , process >= 1 && < 1.7 - , QuickCheck >= 2.10 && < 2.12 - , quickcheck-instances >= 0.3.16 && < 0.4 - , random >= 1.0.1 && < 1.2 - , semigroups >= 0.17 && < 1 - , tagged >= 0.4.4 && < 1 - , text >= 0.11.1 && < 1.3 - , text-show >= 3.4 && < 4 - , th-orphans >= 0.13.3 && < 1 - , time >= 0.1 && < 1.9 - , unordered-containers >= 0.2 && < 0.3 - , vector >= 0.9 && < 0.13 - , xhtml >= 3000.2 && < 3000.3 + , haskeline >= 0.7 && < 0.8 + , hoopl >= 3.8.7 && < 3.11 + , hpc >= 0.5 && < 0.7 + , hspec >= 2 && < 3 + , old-locale >= 1 && < 1.1 + , old-time >= 1 && < 1.2 + , pretty >= 1 && < 1.2 + , process >= 1 && < 1.7 + , QuickCheck >= 2.10 && < 2.12 + , quickcheck-instances >= 0.3.16 && < 0.4 + , random >= 1.0.1 && < 1.2 + , semigroups >= 0.17 && < 1 + , tagged >= 0.4.4 && < 1 + , text >= 0.11.1 && < 1.3 + , text-show >= 3.4 && < 4 + , th-orphans >= 0.13.3 && < 1 + , time >= 0.1 && < 1.9 + , unordered-containers >= 0.2 && < 0.3 + , vector >= 0.9 && < 0.13 + , xhtml >= 3000.2 && < 3000.3 build-tool-depends: hspec-discover:hspec-discover if flag(base-4-9)