diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 78570c6..88c7815 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @chshersh @vrom911 \ No newline at end of file +* @vrom911 \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d92ebb..d5ea629 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,19 +15,20 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - cabal: ["3.4"] + cabal: ["3.8"] ghc: - "8.2.2" - "8.4.4" - "8.6.5" - "8.8.4" - - "8.10.4" - - "9.0.1" + - "8.10.7" + - "9.0.2" + - "9.2.4" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - - uses: haskell/actions/setup@v1 + - uses: haskell/actions/setup@v2 id: setup-haskell-cabal name: Setup Haskell with: @@ -42,7 +43,7 @@ jobs: run: | cabal freeze - - uses: actions/cache@v2.1.3 + - uses: actions/cache@v3 name: Cache ~/.cabal/store with: path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 8c9f5d4..0000000 --- a/.travis.yml +++ /dev/null @@ -1,30 +0,0 @@ -sudo: true -language: generic - -git: - depth: 5 - -cache: - directories: - - "$HOME/.stack" - -matrix: - include: - - os: linux - env: GHC="8.8.3" - - os: osx - env: GHC="8.8.3" - -install: - # HLint check - - curl -sSL https://raw.github.com/ndmitchell/neil/master/misc/travis.sh | sh -s -- hlint . - - - curl -sSL https://get.haskellstack.org/ | sh - - stack --version - - stack build --test --no-run-tests --bench --no-run-benchmarks - -script: - - stack test --no-terminal - -notifications: - email: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 358805e..47f5e3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ `slist` uses [PVP Versioning][1]. The changelog is available [on GitHub][2]. +## 0.2.0.1 – Oct 7, 2022 + +* [#53](https://github.com/kowainik/slist/issues/53): + Support GHC-9.2. +* Upgrade `hedgehog` dependency. + ## 0.2.0.0 — Mar 18, 2021 * [#45](https://github.com/kowainik/slist/issues/45): diff --git a/README.md b/README.md index 2d333a6..958a2a1 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,7 @@ # slist [![GitHub CI](https://github.com/kowainik/slist/workflows/CI/badge.svg)](https://github.com/kowainik/slist/actions) -[![Build status](https://img.shields.io/travis/kowainik/slist.svg?logo=travis)](https://travis-ci.org/kowainik/slist) [![Hackage](https://img.shields.io/hackage/v/slist.svg?logo=haskell)](https://hackage.haskell.org/package/slist) -[![Stackage LTS](http://stackage.org/package/slist/badge/lts)](http://stackage.org/lts/package/slist) -[![Stackage Nightly](http://stackage.org/package/slist/badge/nightly)](http://stackage.org/nightly/package/slist) [![MPL-2.0 license](https://img.shields.io/badge/license-MPL--2.0-blue.svg)](LICENSE) > ⚠️ Caution: this is a very opinionated library. There is no intention to replace the standard list data type. diff --git a/slist.cabal b/slist.cabal index 0335cca..24d0493 100644 --- a/slist.cabal +++ b/slist.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: slist -version: 0.2.0.0 +version: 0.2.0.1 synopsis: Sized list description: This package implements @Slist@ data structure that stores the size of the list along with the list itself. @@ -11,7 +11,7 @@ license-file: LICENSE author: Veronika Romashkina maintainer: Kowainik copyright: 2019-2020 Veronika Romashkina - 2020-2021 Kowainik + 2020-2022 Kowainik category: Data Structures, List build-type: Simple extra-doc-files: README.md @@ -20,15 +20,16 @@ tested-with: GHC == 8.2.2 , GHC == 8.4.4 , GHC == 8.6.5 , GHC == 8.8.4 - , GHC == 8.10.4 - , GHC == 9.0.1 + , GHC == 8.10.7 + , GHC == 9.0.2 + , GHC == 9.2.4 source-repository head type: git location: https://github.com/kowainik/slist.git common common-options - build-depends: base >= 4.10.1.0 && < 4.16 + build-depends: base >= 4.10.1.0 && < 4.17 ghc-options: -Wall -Wincomplete-uni-patterns @@ -86,7 +87,7 @@ test-suite slist-test main-is: Spec.hs other-modules: Test.Slist.Size build-depends: slist - , hedgehog ^>= 1.0 + , hedgehog >= 1.0 && < 1.3 , hspec , hspec-hedgehog ^>= 0.0.1 ghc-options: -threaded diff --git a/src/Slist.hs b/src/Slist.hs index d3007e5..f5fd6b8 100644 --- a/src/Slist.hs +++ b/src/Slist.hs @@ -7,7 +7,7 @@ {- | Copyright: (c) 2019-2020 Veronika Romashkina - (c) 2020-2021 Kowainik + (c) 2020-2022 Kowainik SPDX-License-Identifier: MPL-2.0 Maintainer: Kowainik Stability: Stable diff --git a/src/Slist/Containers.hs b/src/Slist/Containers.hs index 4e07f7c..f3a7bfb 100644 --- a/src/Slist/Containers.hs +++ b/src/Slist/Containers.hs @@ -1,5 +1,5 @@ {- | -Copyright: (c) 2021 Kowainik +Copyright: (c) 2021-2022 Kowainik SPDX-License-Identifier: MPL-2.0 Maintainer: Kowainik Stability: Stable diff --git a/src/Slist/Maybe.hs b/src/Slist/Maybe.hs index 4029ed3..9a09b23 100644 --- a/src/Slist/Maybe.hs +++ b/src/Slist/Maybe.hs @@ -1,7 +1,7 @@ {-# LANGUAGE BangPatterns #-} {- | -Copyright: (c) 2021 Kowainik +Copyright: (c) 2021-2022 Kowainik SPDX-License-Identifier: MPL-2.0 Maintainer: Kowainik Stability: Stable diff --git a/src/Slist/Size.hs b/src/Slist/Size.hs index b9ae6bb..c2c800b 100644 --- a/src/Slist/Size.hs +++ b/src/Slist/Size.hs @@ -1,6 +1,6 @@ {- | Copyright: (c) 2019-2020 Veronika Romashkina - (c) 2020-2021 Kowainik + (c) 2020-2022 Kowainik SPDX-License-Identifier: MPL-2.0 Maintainer: Kowainik Stability: Stable @@ -64,8 +64,8 @@ instance Num Size where {-# INLINE (+) #-} (-) :: Size -> Size -> Size - Infinity - _ = Infinity - _ - Infinity = Infinity + Infinity - _ = Infinity + _ - Infinity = Infinity (Size x) - (Size y) = Size (x - y) {-# INLINE (-) #-} diff --git a/src/Slist/Type.hs b/src/Slist/Type.hs index f55932d..4ee428e 100644 --- a/src/Slist/Type.hs +++ b/src/Slist/Type.hs @@ -3,7 +3,7 @@ {-# LANGUAGE TypeFamilies #-} {- | -Copyright: (c) 2021 Kowainik +Copyright: (c) 2021-2022 Kowainik SPDX-License-Identifier: MPL-2.0 Maintainer: Kowainik Stability: Stable diff --git a/stack.yaml b/stack.yaml deleted file mode 100644 index 1d7cc25..0000000 --- a/stack.yaml +++ /dev/null @@ -1 +0,0 @@ -resolver: nightly-2020-05-01