diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ -0.1.0.0 -------- +Changelog +========= + +v0.1.0.1 +-------- + + + +* Added support for backwards compatibility up to GHC 7.6 + +v0.1.0.0 +-------- + * Initial release! diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,6 +1,12 @@ configurator-export =================== +[![configurator-export on Stackage LTS 4](http://stackage.org/package/configurator-export/badge/lts-4)](http://stackage.org/lts-4/package/configurator-export) +[![configurator-export on Stackage LTS](http://stackage.org/package/configurator-export/badge/lts)](http://stackage.org/lts/package/configurator-export) +[![configurator-export on Stackage Nightly](http://stackage.org/package/configurator-export/badge/nightly)](http://stackage.org/nightly/package/configurator-export) + +[![Build Status](https://travis-ci.org/mstksg/configurator-export.svg?branch=master)](https://travis-ci.org/mstksg/configurator-export) + Pretty printers and exporters for 'Config's from the great *[configurator](http://hackage.haskell.org/package/configurator)* library. diff --git a/configurator-export.cabal b/configurator-export.cabal --- a/configurator-export.cabal +++ b/configurator-export.cabal @@ -1,5 +1,5 @@ name: configurator-export -version: 0.1.0.0 +version: 0.1.0.1 synopsis: Pretty printer and exporter for configurations from the "configurator" library. description: Pretty printers and exporters for 'Config's from the @@ -33,17 +33,29 @@ build-type: Simple extra-source-files: README.md CHANGELOG.md + stack.yaml cabal-version: >=1.10 library hs-source-dirs: src exposed-modules: Data.Configurator.Export - build-depends: base >= 4.7 && < 5 - , configurator - , pretty - , semigroups - , text - , unordered-containers + if impl(ghc >= 7.10) + build-depends: base >= 4.8 && < 5 + , base-compat + , configurator + , pretty + , semigroups >= 0.17 + , text + , unordered-containers + else + build-depends: base >= 4.6 && < 5 + , bifunctors + , base-compat + , configurator + , pretty + , semigroups >= 0.17 + , text + , unordered-containers ghc-options: -Wall default-language: Haskell2010 diff --git a/src/Data/Configurator/Export.hs b/src/Data/Configurator/Export.hs --- a/src/Data/Configurator/Export.hs +++ b/src/Data/Configurator/Export.hs @@ -1,6 +1,7 @@ +{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE ScopedTypeVariables #-} -- | -- Module : Data.Configurator.Export @@ -85,26 +86,28 @@ , hashMapDoc' -- :: ConfSTyle -> HashMap Name Value -> Doc ) where -import Control.Monad -import Data.Bifunctor -import Data.Bool -import Data.Configurator -import Data.Configurator.Types -import Data.Foldable -import Data.Function -import Data.HashMap.Strict (HashMap) -import Data.List -import Data.List.NonEmpty (NonEmpty(..)) -import Data.Monoid -import Data.Ord -import Data.Ratio -import Data.Text (Text) -import Numeric -import Text.PrettyPrint (Doc, (<+>), ($+$), ($$)) -import qualified Data.HashMap.Strict as HM -import qualified Data.List.NonEmpty as NE -import qualified Data.Text as T -import qualified Text.PrettyPrint as P +import Control.Monad +import Data.Bifunctor +import Data.Bool.Compat +import Data.Configurator +import Data.Configurator.Types +import Data.Foldable (toList) +import Data.Function +import Data.HashMap.Strict (HashMap) +import Data.List (sortBy) +import Data.List.NonEmpty (NonEmpty(..)) +import Data.Monoid +import Data.Ord +import Data.Ratio +import Data.Text (Text) +import Numeric.Compat +import Prelude () +import Prelude.Compat +import Text.PrettyPrint (Doc, (<+>), ($+$), ($$)) +import qualified Data.HashMap.Strict as HM +import qualified Data.List.NonEmpty as NE +import qualified Data.Text as T +import qualified Text.PrettyPrint as P data HashMapTree k v = HMT { getHashMapTree :: HashMap k (Either v (HashMapTree k v)) } @@ -132,7 +135,7 @@ -- ^ Align them to the longest key. | AlignOn Int -- ^ Align to the longest key, but make sure the - -- identation is a multiple of this number. okay. + -- identation is a multiple of this number. deriving (Show, Eq, Ord, Read) -- | Placement style of opening braces (curly brackets) for groups. @@ -148,7 +151,7 @@ -- to what you want. See 'confStyle' for more details. data ConfStyle = ConfStyle { confStyleIndent :: Int - -- ^ Number of columns to indent each tested group. + -- ^ Number of columns to indent each nested group. , confStyleAlign :: AlignStyle -- ^ Style of aligning the equals signs for keys with -- values. @@ -180,15 +183,15 @@ -- | Sensible defaults for a 'ConfStyle': -- -- @ --- confStyle :: ConfStyle --- confStyle = ConfStyle { confStyleIndent = 4 --- , confStyleAlign = AlignOn 2 --- , confStyleBraceStyle = SameLineBrace --- , confStyleBoolStyle = TrueFalse +-- confStyle :: 'ConfStyle' +-- confStyle = 'ConfStyle' { confStyleIndent = 4 +-- , confStyleAlign = 'AlignOn' 2 +-- , confStyleBraceStyle = 'SameLineBrace' +-- , confStyleBoolStyle = 'TrueFalse' -- , confStyleForceDec = False -- , confStyleShowInts = True -- -- sort by "type" of key, then sort alphabetically --- , confStyleSortBy = comparing snd <> comparing fst +-- , confStyleSortBy = 'comparing' snd '<>' comparing fst -- , confStyleGroupSep = 0 -- , confStyleValueSep = 0 -- , confStyleTopSep = 1 @@ -199,8 +202,8 @@ -- using record syntax rather than create your own from scratch: -- -- @ --- myStyle = confStyle { confStyleBraceStyle = NewLineBrace --- , confStyleBoolStyle = OnOff +-- myStyle = 'confStyle' { confStyleBraceStyle = 'NewLineBrace' +-- , confStyleBoolStyle = 'OnOff' -- } -- @ -- diff --git a/stack.yaml b/stack.yaml new file mode 100644 --- /dev/null +++ b/stack.yaml @@ -0,0 +1,32 @@ +# For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md + +# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2) +resolver: lts-5.15 + +# Local packages, usually specified by relative directory name +packages: +- '.' + +# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3) +extra-deps: [] + +# Override default flag values for local packages and extra-deps +flags: {} + +# Extra package databases containing global packages +extra-package-dbs: [] + +# Control whether we use the GHC we find on the path +# system-ghc: true + +# Require a specific version of stack, using version ranges +# require-stack-version: -any # Default +# require-stack-version: >= 0.1.4.0 + +# Override the architecture used by stack, especially useful on Windows +# arch: i386 +# arch: x86_64 + +# Extra directories used by stack for building +# extra-include-dirs: [/path/to/dir] +# extra-lib-dirs: [/path/to/dir]