c127a71 · elk · git.iko.soy

git.iko.soy/elk

Update to newer version of aeson-pretty dependency

Switch to using tabs in documentation JSON

commitc127a71ccbd187d2998a793431b6efeee63419c8 authorEvan Czaplicki <evancz@users.noreply.github.com> dateTue 7 Mar 2017, 14:45 (10 years ago) parent542c763

2 files changed+5−4

compare with master

unifiedsplit

elm-compiler.cabal+2−2 src/Elm/Docs.hs+3−2

elm-compiler.cabal+2−2

@@ -139,7 +139,7 @@ Library

139139

140140 Build-depends:

141141 aeson >= 0.11,

142− aeson-pretty < 0.8,

142+ aeson-pretty >= 0.8 && < 0.9,

143143 ansi-terminal >= 0.6.2.1 && < 0.7,

144144 ansi-wl-pprint >= 0.6.7 && < 0.7,

145145 base >=4.2 && <5,

@@ -185,7 +185,7 @@ Test-Suite compiler-tests

185185 HUnit >= 1.1 && < 2,

186186 QuickCheck >= 2 && < 3,

187187 aeson >= 0.11,

188− aeson-pretty < 0.8,

188+ aeson-pretty >= 0.8 && < 0.9,

189189 ansi-terminal >= 0.6.2.1 && < 0.7,

190190 ansi-wl-pprint >= 0.6.7 && < 0.7,

191191 base >=4.2 && <5,

src/Elm/Docs.hs+3−2

@@ -99,9 +99,10 @@ prettyJson value =

9999

100100config :: Json.Config

101101config =

102− Json.Config

103− { Json.confIndent = 2

102+ Json.Config

103+ { Json.confIndent = Json.Tab

104104 , Json.confCompare = Json.keyOrder keys

105+ , Json.confNumFormat = Json.Generic

105106 }

106107 where

107108 keys =