summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2019-07-14 15:27:02 +0100
committerSean Whitton <spwhitton@spwhitton.name>2019-07-14 15:27:02 +0100
commite37627f51e09b6fa01c71cba4858daf759e6f25a (patch)
tree7bd861080dd382ce78cc5dd25f0cbb42eec001e3
parentc9351097bbc38315c31c43318cec7fcc1189bad8 (diff)
parentf253f37362be840bafe2c82a8d7fb284046fda48 (diff)
downloadstylish-haskell-e37627f51e09b6fa01c71cba4858daf759e6f25a.tar.gz
Merge tag 'v0.9.2.2'
v0.9.2.2
-rw-r--r--CHANGELOG4
-rw-r--r--data/stylish-haskell.yaml4
-rw-r--r--stack.yaml6
-rw-r--r--stylish-haskell.cabal10
4 files changed, 15 insertions, 9 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d86dd23..0bf78c4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
# CHANGELOG
+- 0.9.2.2 (2019-06-12)
+ * Bump `semigroups` to 0.19
+ * Bump `haskell-src-exts` to 1.21
+
- 0.9.2.1 (2019-01-02)
* Bump `aeson` to 1.4
* Bump `yaml` to 0.11
diff --git a/data/stylish-haskell.yaml b/data/stylish-haskell.yaml
index c1d822d..6d43499 100644
--- a/data/stylish-haskell.yaml
+++ b/data/stylish-haskell.yaml
@@ -17,7 +17,7 @@ steps:
# Align the right hand side of some elements. This is quite conservative
# and only applies to statements where each element occupies a single
- # line.
+ # line. All default to true.
- simple_align:
cases: true
top_level_patterns: true
@@ -126,6 +126,8 @@ steps:
#
# - module_name: align under start of module name.
# Useful for 'file' and 'group' align settings.
+ #
+ # Default: 4
list_padding: 4
# Separate lists option affects formatting of import list for type
diff --git a/stack.yaml b/stack.yaml
index e30ff6b..7a5f68c 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-flags: {}
+resolver: lts-13.19
+
packages:
-- '.'
-resolver: lts-13.0
+ - '.'
diff --git a/stylish-haskell.cabal b/stylish-haskell.cabal
index a72698d..1890a4b 100644
--- a/stylish-haskell.cabal
+++ b/stylish-haskell.cabal
@@ -1,5 +1,5 @@
Name: stylish-haskell
-Version: 0.9.2.1
+Version: 0.9.2.2
Synopsis: Haskell code prettifier
Homepage: https://github.com/jaspervdj/stylish-haskell
License: BSD3
@@ -56,9 +56,9 @@ Library
directory >= 1.2.3 && < 1.4,
filepath >= 1.1 && < 1.5,
file-embed >= 0.0.10 && < 0.1,
- haskell-src-exts >= 1.18 && < 1.21,
+ haskell-src-exts >= 1.18 && < 1.22,
mtl >= 2.0 && < 2.3,
- semigroups >= 0.18 && < 0.19,
+ semigroups >= 0.18 && < 0.20,
syb >= 0.3 && < 0.8,
yaml >= 0.8.11 && < 0.12
@@ -79,7 +79,7 @@ Executable stylish-haskell
directory >= 1.2.3 && < 1.4,
filepath >= 1.1 && < 1.5,
file-embed >= 0.0.10 && < 0.1,
- haskell-src-exts >= 1.18 && < 1.21,
+ haskell-src-exts >= 1.18 && < 1.22,
mtl >= 2.0 && < 2.3,
syb >= 0.3 && < 0.8,
yaml >= 0.8.11 && < 0.12
@@ -128,7 +128,7 @@ Test-suite stylish-haskell-tests
directory >= 1.2.3 && < 1.4,
filepath >= 1.1 && < 1.5,
file-embed >= 0.0.10 && < 0.1,
- haskell-src-exts >= 1.18 && < 1.21,
+ haskell-src-exts >= 1.18 && < 1.22,
mtl >= 2.0 && < 2.3,
syb >= 0.3 && < 0.8,
yaml >= 0.8.11 && < 0.12