Skip to content

Commit

Permalink
[#95] Support GHC-9.2 (#96)
Browse files Browse the repository at this point in the history
* [#95] Support GHC-9.2

Resolves #95

* Update src/Colourista/Short.hs
  • Loading branch information
vrom911 authored Oct 5, 2022
1 parent f0cb1eb commit c7b0681
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @chshersh @vrom911
* @vrom911
16 changes: 11 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@ jobs:
- "8.6.5"
- "8.8.4"
- "8.10.4"
- "9.0.1"
- "9.0.2"
- "9.2.4"
- "9.4.2"
exclude:
- os: macOS-latest
ghc: 9.0.2
- os: macOS-latest
ghc: 8.10.4
- os: macOS-latest
Expand All @@ -36,6 +40,8 @@ jobs:
- os: macOS-latest
ghc: 8.2.2

- os: windows-latest
ghc: 9.0.2
- os: windows-latest
ghc: 8.10.4
- os: windows-latest
Expand All @@ -49,7 +55,7 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: haskell/actions/setup@v1.2.9
- uses: haskell/actions/setup@v2
id: setup-haskell-cabal
name: Setup Haskell
with:
Expand All @@ -64,7 +70,7 @@ jobs:
run: |
cabal freeze
- uses: actions/cache@v3.0.10
- uses: actions/cache@v3
name: Cache ~/.cabal/store
with:
path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
Expand Down Expand Up @@ -97,13 +103,13 @@ jobs:
steps:
- uses: actions/checkout@v3

- uses: haskell/actions/setup@v1.2.9
- uses: haskell/actions/setup@v2
name: Setup Haskell Stack
with:
ghc-version: ${{ matrix.ghc }}
stack-version: ${{ matrix.stack }}

- uses: actions/cache@v3.0.10
- uses: actions/cache@v3
name: Cache ~/.stack
with:
path: ~/.stack
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
`colourista` uses [PVP Versioning][1].
The changelog is available [on GitHub][2].

## 0.1.0.2 – Oct 5, 2022

* [#95](https://github.com/kowainik/colourista/issues/95):
Support GHC-9.2.
* Support GHC-9.4.
* Upgrade `text` to version `2.0`.
* Upgrade `hspec` version.

## 🐰🥚 0.1.0.1 — Apr 5, 2021

* [#55](https://github.com/kowainik/colourista/issues/55):
Expand Down
15 changes: 8 additions & 7 deletions colourista.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: colourista
version: 0.1.0.1
version: 0.1.0.2
synopsis: Convenient interface for printing colourful messages
description: Convenient interface for printing colourful messages based on the @ansi-terminal@ library.
homepage: https://github.com/kowainik/colourista
Expand All @@ -9,7 +9,7 @@ license: MPL-2.0
license-file: LICENSE
author: Veronika Romashkina, Dmitrii Kovanikov
maintainer: Kowainik <xrom.xkov@gmail.com>
copyright: 2020-2021 Kowainik
copyright: 2020-2022 Kowainik
category: Terminal, ANSI
build-type: Simple
extra-doc-files: README.md
Expand All @@ -19,14 +19,16 @@ tested-with: GHC == 8.2.2
GHC == 8.6.5
GHC == 8.8.4
GHC == 8.10.4
GHC == 9.0.1
GHC == 9.0.2
GHC == 9.2.4
GHC == 9.4.2

source-repository head
type: git
location: https://github.com/kowainik/colourista.git

common common-options
build-depends: base >= 4.10.1.0 && < 4.16
build-depends: base >= 4.10.1.0 && < 4.18

ghc-options: -Wall
-Wcompat
Expand Down Expand Up @@ -73,8 +75,7 @@ library

build-depends: ansi-terminal >= 0.10 && < 0.12
, bytestring >= 0.10 && < 0.12
, ghc-prim >= 0.5 && < 0.8
, text ^>= 1.2.3.0
, text >= 1.2.3.0 && < 2.1

test-suite colourista-test
import: common-options
Expand All @@ -85,7 +86,7 @@ test-suite colourista-test

build-depends: colourista
, bytestring
, hspec >= 2.7.1 && < 2.9
, hspec >= 2.7.1 && < 2.11
, text

ghc-options: -threaded
Expand Down
2 changes: 1 addition & 1 deletion src/Colourista.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{- |
Copyright: (c) 2020-2021 Kowainik
Copyright: (c) 2020-2022 Kowainik
SPDX-License-Identifier: MPL-2.0
Maintainer: Kowainik <xrom.xkov@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion src/Colourista/IO.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# LANGUAGE CPP #-}

{- |
Copyright: (c) 2020-2021 Kowainik
Copyright: (c) 2020-2022 Kowainik
SPDX-License-Identifier: MPL-2.0
Maintainer: Kowainik <xrom.xkov@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion src/Colourista/Pure.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{- |
Copyright: (c) 2020-2021 Kowainik
Copyright: (c) 2020-2022 Kowainik
SPDX-License-Identifier: MPL-2.0
Maintainer: Kowainik <xrom.xkov@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion src/Colourista/Short.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# LANGUAGE CPP #-}

{- |
Copyright: (c) 2020-2021 Kowainik
Copyright: (c) 2020-2022 Kowainik
SPDX-License-Identifier: MPL-2.0
Maintainer: Kowainik <xrom.xkov@gmail.com>
Expand Down

0 comments on commit c7b0681

Please sign in to comment.