Merge pull request #56 from serokell/vrom911/45-remove-aeson-options

[#45] Remove Aeson.Options module, use aeson-options
serokell · Feb 23, 2018 · 9580a06 · 9580a06
2 parents 1ca2340 + 0811fae
commit 9580a06
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 65 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,9 @@
+0.9.0
+=====
+
+* [#45](https://github.com/serokell/serokell-util/issues/45):
+  Move `Aeson.Options` to separate package [`aeson-options`][1].
+
 0.8.0
 =====
 
@@ -46,3 +52,6 @@
 =====
 
 * Added `colorizeDull`.
+
+
+[1]: https://github.com/serokell/aeson-options
diff --git a/serokell-util.cabal b/serokell-util.cabal
@@ -1,5 +1,5 @@
 name:                serokell-util
-version:             0.8.0
+version:             0.9.0
 synopsis:            General-purpose functions by Serokell
 homepage:            https://github.com/serokell/serokell-util
 license:             MIT
@@ -20,7 +20,6 @@ cabal-version:       >=2.0
 library
   hs-source-dirs:      src
   exposed-modules:     Serokell.Arbitrary
-                       Serokell.Aeson.Options
                        Serokell.Data.Memory.Units
                        Serokell.Data.Variant
 
@@ -53,6 +52,7 @@ library
 
   build-depends:       base >= 4.9 && < 5
                      , aeson >= 1.0 && < 1.4
+                     , aeson-options
                      , ansi-terminal
                      , base16-bytestring
                      , base64-bytestring

diff --git a/src/Serokell/Aeson/Options.hs b/src/Serokell/Aeson/Options.hs
diff --git a/src/Serokell/Util/I18N.hs b/src/Serokell/Util/I18N.hs
@@ -16,7 +16,7 @@ import Universum
 import Data.Yaml (decodeEither)
 import Formatting (build, sformat, (%))
 import GHC.Generics (Generic, Rep)
-import Serokell.Aeson.Options (defaultOptions)
+import Data.Aeson.Options (defaultOptions)
 
 import qualified Data.Aeson as AT
 import qualified Data.Map.Strict as M

diff --git a/stack-8.0.2.yaml b/stack-8.0.2.yaml
@@ -5,6 +5,7 @@ nix:
 
 extra-deps:
 - aeson-extra-0.4.0.0
+- aeson-options-0.0.0
 - containers-0.5.10.2
 - fmt-0.5.0.0
 - log-warper-1.8.9

diff --git a/stack.yaml b/stack.yaml
@@ -4,6 +4,7 @@ nix:
     packages: [openssh,git]
 
 extra-deps:
+- aeson-options-0.0.0
 - log-warper-1.8.9
 - universum-1.1.0
 - o-clock-0.1.0