diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown deleted file mode 100644 --- a/CHANGELOG.markdown +++ /dev/null @@ -1,4 +0,0 @@ -# Change log - -Witch follows the [Package Versioning Policy](https://pvp.haskell.org). You can -find release notes [on GitHub](https://github.com/tfausak/witch/releases). diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,4 @@ +# Change log + +Witch follows the [Package Versioning Policy](https://pvp.haskell.org). You can +find release notes [on GitHub](https://github.com/tfausak/witch/releases). diff --git a/LICENSE.markdown b/LICENSE.markdown deleted file mode 100644 --- a/LICENSE.markdown +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 Taylor Fausak - -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 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/LICENSE.txt b/LICENSE.txt new file mode 100644 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 Taylor Fausak + +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 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.markdown b/README.markdown deleted file mode 100644 --- a/README.markdown +++ /dev/null @@ -1,9 +0,0 @@ -# Witch - -[![Workflow](https://github.com/tfausak/witch/actions/workflows/workflow.yaml/badge.svg)](https://github.com/tfausak/witch/actions/workflows/workflow.yaml) -[![Hackage](https://img.shields.io/hackage/v/witch)](https://hackage.haskell.org/package/witch) -[![Stackage](https://www.stackage.org/package/witch/badge/nightly?label=stackage)](https://www.stackage.org/package/witch) - -:mage_woman: Convert values from one type into another. - -See the documentation on Hackage: . diff --git a/README.md b/README.md new file mode 100644 --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +# Witch + +[![CI](https://github.com/tfausak/witch/actions/workflows/ci.yml/badge.svg)](https://github.com/tfausak/witch/actions/workflows/ci.yml) +[![Hackage](https://badgen.net/hackage/v/witch)](https://hackage.haskell.org/package/witch) + +:mage_woman: Convert values from one type into another. + +See the documentation on Hackage: . diff --git a/witch.cabal b/witch.cabal --- a/witch.cabal +++ b/witch.cabal @@ -1,14 +1,15 @@ cabal-version: 2.2 - name: witch -version: 1.2.1.0 +version: 1.2.1.1 synopsis: Convert values from one type into another. description: Witch converts values from one type into another. - build-type: Simple category: Data -extra-source-files: CHANGELOG.markdown README.markdown -license-file: LICENSE.markdown +extra-doc-files: + CHANGELOG.md + README.md + +license-file: LICENSE.txt license: MIT maintainer: Taylor Fausak @@ -18,17 +19,17 @@ flag pedantic default: False - description: Enables @-Werror@, which turns warnings into errors. manual: True common library + build-depends: base ^>=4.18.0.0 || ^>=4.19.0.0 || ^>=4.20.0.0 build-depends: - , base >= 4.16.0 && < 4.20 - , bytestring >= 0.11.3 && < 0.13 - , containers >= 0.6.5 && < 0.8 - , tagged >= 0.8.6 && < 0.9 - , text >= 1.2.5 && < 1.3 || >= 2.0 && < 2.2 - , time >= 1.11.1 && < 1.13 + bytestring ^>=0.11.4.0 || ^>=0.12.0.2, + containers ^>=0.6.7 || ^>=0.7, + tagged ^>=0.8.8, + text ^>=2.0.2 || ^>=2.1, + time ^>=1.12.2 || ^>=1.14, + default-language: Haskell2010 ghc-options: -Weverything @@ -54,7 +55,6 @@ common executable import: library - build-depends: witch ghc-options: -rtsopts @@ -62,9 +62,10 @@ library import: library - build-depends: - , template-haskell >= 2.18 && < 2.22 + template-haskell ^>=2.20.0.0 || ^>=2.21.0.0 || ^>=2.22.0.0 + + -- cabal-gild: discover source/library exposed-modules: Witch Witch.Encoding @@ -74,14 +75,15 @@ Witch.TryFrom Witch.TryFromException Witch.Utility + hs-source-dirs: source/library test-suite witch-test-suite import: executable - build-depends: - , HUnit >= 1.6.1 && < 1.7 - , transformers >= 0.5.6 && < 0.7 + HUnit ^>=1.6.2.0, + transformers ^>=0.6.1.0, + hs-source-dirs: source/test-suite main-is: Main.hs type: exitcode-stdio-1.0