diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## Inflections 0.4.0.7 +* Bump bounds for `text` in order to support ghc-9.6.1 + ## Inflections 0.4.0.6 * Support `megaparsec` == 9.0 diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,22 +1,21 @@ -Copyright (c) 2014-2016 Justin Leitgeb - MIT License -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Copyright (c) 2022 Stack Builders Inc. -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Hackage](https://img.shields.io/hackage/v/inflections.svg)](http://hackage.haskell.org/package/inflections) [![Stackage Nightly](http://stackage.org/package/inflections/badge/nightly)](http://stackage.org/nightly/package/inflections) [![Stackage LTS](http://stackage.org/package/inflections/badge/lts)](http://stackage.org/lts/package/inflections) -[![Build Status](https://travis-ci.org/stackbuilders/inflections-hs.svg?branch=master)](https://travis-ci.org/stackbuilders/inflections-hs) +[![Build](https://github.com/stackbuilders/inflections-hs/actions/workflows/build.yml/badge.svg)](https://github.com/stackbuilders/inflections-hs/actions/workflows/build.yml) This library is a partial port of the [String Inflector](http://api.rubyonrails.org/classes/ActiveSupport/Inflector.html) @@ -49,11 +49,10 @@ the `transliterate` function, you should instead call the `transliterateCustom` function which accepts a String for replacements and a Map for substitution. -## TODO +## Future work -I'd like this library to implement other functions found in the Rails -inflections library. If you need one of those functions, please submit a pull -request! +Ideally, we want to implement other functions found in the Rails +inflections library. If you need one of those functions, please submit a pull request! ## Further documentation @@ -64,10 +63,14 @@ Justin Leitgeb -## Contributing +## License -You may submit pull requests to this repository on GitHub. Tests are appreciated with your contribution. +MIT, see [the LICENSE file](LICENSE). -## License +## Contributing -MIT - see [the LICENSE file](LICENSE). +Do you want to contribute to this project? Please take a look at our [contributing guideline](/docs/CONTRIBUTING.md) to know how you can help us build it. + +--- +Stack Builders +[Check out our libraries](https://github.com/stackbuilders/) | [Join our team](https://www.stackbuilders.com/join-us/) diff --git a/Text/Inflections/Ordinal.hs b/Text/Inflections/Ordinal.hs --- a/Text/Inflections/Ordinal.hs +++ b/Text/Inflections/Ordinal.hs @@ -9,6 +9,7 @@ -- -- Conversion to spelled ordinal numbers. +{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} module Text.Inflections.Ordinal @@ -16,7 +17,9 @@ , ordinal ) where +#if !MIN_VERSION_base(4,11,0) import Data.Monoid ((<>)) +#endif import Data.Text (Text) import qualified Data.Text as T diff --git a/inflections.cabal b/inflections.cabal --- a/inflections.cabal +++ b/inflections.cabal @@ -1,5 +1,6 @@ +cabal-version: 2.0 name: inflections -version: 0.4.0.6 +version: 0.4.0.7 synopsis: Inflections library for Haskell description: Inflections provides methods for singularization, pluralization, @@ -14,7 +15,6 @@ copyright: 2014–2016 Justin Leitgeb category: Text build-type: Simple -cabal-version: >=1.10 extra-source-files: CHANGELOG.md , README.md @@ -47,10 +47,10 @@ ghc-options: -Wall -Werror else ghc-options: -O2 -Wall - build-depends: base >= 4.6 && < 5.0 + build-depends: base >= 4.11 && < 5.0 , exceptions >= 0.6 && < 0.11 , megaparsec >= 7.0.1 && < 10.0 - , text >= 0.2 && < 1.3 + , text >= 0.2 && < 2.1 , unordered-containers >= 0.2.7 && < 0.3 if !impl(ghc >= 7.10) build-depends: void == 0.7.* @@ -61,14 +61,15 @@ type: exitcode-stdio-1.0 hs-source-dirs: test main-is: Spec.hs + build-tool-depends: hspec-discover:hspec-discover build-depends: inflections , QuickCheck >= 2.7.6 && < 3.0 - , base >= 4.6 && < 5.0 + , base >= 4.11 && < 5.0 , containers >= 0.5 && < 0.7 , hspec >= 2.0 && < 3.0 , hspec-megaparsec >= 2.0 && < 3.0 , megaparsec - , text >= 0.2 && < 1.3 + , text >= 0.2 && < 2.1 if !impl(ghc >= 7.10) build-depends: void == 0.7.*