diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ `tomland` uses [PVP Versioning][1]. The changelog is available [on GitHub][2]. +## 1.3.3.2 – Oct 5, 2022 + +* [#395](https://github.com/kowainik/tomland/issues/395): + Support GHC-9.2.4. +* Upgrade `text` to version `2`. +* Upgrade `hedgehog` and `hspec`. + ## 🍁 1.3.3.1 — Nov 8, 2021 * Disable building executables by default diff --git a/src/Toml.hs b/src/Toml.hs --- a/src/Toml.hs +++ b/src/Toml.hs @@ -1,6 +1,6 @@ {- | Module : Toml -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec.hs b/src/Toml/Codec.hs --- a/src/Toml/Codec.hs +++ b/src/Toml/Codec.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Codec -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/BiMap.hs b/src/Toml/Codec/BiMap.hs --- a/src/Toml/Codec/BiMap.hs +++ b/src/Toml/Codec/BiMap.hs @@ -7,7 +7,7 @@ {- | Module : Toml.Codec.BiMap -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/BiMap/Conversion.hs b/src/Toml/Codec/BiMap/Conversion.hs --- a/src/Toml/Codec/BiMap/Conversion.hs +++ b/src/Toml/Codec/BiMap/Conversion.hs @@ -2,7 +2,7 @@ {- | Module : Toml.Codec.BiMap.Conversion -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Code.hs b/src/Toml/Codec/Code.hs --- a/src/Toml/Codec/Code.hs +++ b/src/Toml/Codec/Code.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Codec.Code -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Combinator.hs b/src/Toml/Codec/Combinator.hs --- a/src/Toml/Codec/Combinator.hs +++ b/src/Toml/Codec/Combinator.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Codec.Combinator -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Combinator/Common.hs b/src/Toml/Codec/Combinator/Common.hs --- a/src/Toml/Codec/Combinator/Common.hs +++ b/src/Toml/Codec/Combinator/Common.hs @@ -2,7 +2,7 @@ {- | Module : Toml.Codec.Combinator.Common -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Combinator/Custom.hs b/src/Toml/Codec/Combinator/Custom.hs --- a/src/Toml/Codec/Combinator/Custom.hs +++ b/src/Toml/Codec/Combinator/Custom.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Codec.Combinator.Custom -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Combinator/List.hs b/src/Toml/Codec/Combinator/List.hs --- a/src/Toml/Codec/Combinator/List.hs +++ b/src/Toml/Codec/Combinator/List.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Codec.Combinator.List -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Combinator/Map.hs b/src/Toml/Codec/Combinator/Map.hs --- a/src/Toml/Codec/Combinator/Map.hs +++ b/src/Toml/Codec/Combinator/Map.hs @@ -4,7 +4,7 @@ {- | Module : Toml.Codec.Combinator.Map -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Combinator/Monoid.hs b/src/Toml/Codec/Combinator/Monoid.hs --- a/src/Toml/Codec/Combinator/Monoid.hs +++ b/src/Toml/Codec/Combinator/Monoid.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Codec.Combinator.Monoid -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Combinator/Primitive.hs b/src/Toml/Codec/Combinator/Primitive.hs --- a/src/Toml/Codec/Combinator/Primitive.hs +++ b/src/Toml/Codec/Combinator/Primitive.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Codec.Combinator.Primitive -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Combinator/Set.hs b/src/Toml/Codec/Combinator/Set.hs --- a/src/Toml/Codec/Combinator/Set.hs +++ b/src/Toml/Codec/Combinator/Set.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Codec.Combinator.Set -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Combinator/Table.hs b/src/Toml/Codec/Combinator/Table.hs --- a/src/Toml/Codec/Combinator/Table.hs +++ b/src/Toml/Codec/Combinator/Table.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Codec.Combinator.Table -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Combinator/Time.hs b/src/Toml/Codec/Combinator/Time.hs --- a/src/Toml/Codec/Combinator/Time.hs +++ b/src/Toml/Codec/Combinator/Time.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Codec.Combinator.Time -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Combinator/Tuple.hs b/src/Toml/Codec/Combinator/Tuple.hs --- a/src/Toml/Codec/Combinator/Tuple.hs +++ b/src/Toml/Codec/Combinator/Tuple.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Codec.Combinator.Tuple -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Di.hs b/src/Toml/Codec/Di.hs --- a/src/Toml/Codec/Di.hs +++ b/src/Toml/Codec/Di.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Codec.Di -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Error.hs b/src/Toml/Codec/Error.hs --- a/src/Toml/Codec/Error.hs +++ b/src/Toml/Codec/Error.hs @@ -2,7 +2,7 @@ {- | Module : Toml.Codec.Error -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Generic.hs b/src/Toml/Codec/Generic.hs --- a/src/Toml/Codec/Generic.hs +++ b/src/Toml/Codec/Generic.hs @@ -11,7 +11,7 @@ {- | Module : Toml.Codec.Generic -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Codec/Types.hs b/src/Toml/Codec/Types.hs --- a/src/Toml/Codec/Types.hs +++ b/src/Toml/Codec/Types.hs @@ -6,7 +6,7 @@ {- | Module : Toml.Codec.Types -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Parser.hs b/src/Toml/Parser.hs --- a/src/Toml/Parser.hs +++ b/src/Toml/Parser.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Parser -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Parser/Core.hs b/src/Toml/Parser/Core.hs --- a/src/Toml/Parser/Core.hs +++ b/src/Toml/Parser/Core.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Parser.Core -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Parser/Item.hs b/src/Toml/Parser/Item.hs --- a/src/Toml/Parser/Item.hs +++ b/src/Toml/Parser/Item.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Parser.Item -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Parser/Key.hs b/src/Toml/Parser/Key.hs --- a/src/Toml/Parser/Key.hs +++ b/src/Toml/Parser/Key.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Parser.Key -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Parser/String.hs b/src/Toml/Parser/String.hs --- a/src/Toml/Parser/String.hs +++ b/src/Toml/Parser/String.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Parser.String -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Parser/Validate.hs b/src/Toml/Parser/Validate.hs --- a/src/Toml/Parser/Validate.hs +++ b/src/Toml/Parser/Validate.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Parser.Validate -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Parser/Value.hs b/src/Toml/Parser/Value.hs --- a/src/Toml/Parser/Value.hs +++ b/src/Toml/Parser/Value.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Parser.Value -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Type.hs b/src/Toml/Type.hs --- a/src/Toml/Type.hs +++ b/src/Toml/Type.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Type -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Type/AnyValue.hs b/src/Toml/Type/AnyValue.hs --- a/src/Toml/Type/AnyValue.hs +++ b/src/Toml/Type/AnyValue.hs @@ -7,7 +7,7 @@ {- | Module : Toml.Type.AnyValue -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Type/Edsl.hs b/src/Toml/Type/Edsl.hs --- a/src/Toml/Type/Edsl.hs +++ b/src/Toml/Type/Edsl.hs @@ -1,6 +1,6 @@ {- | Module : Toml.Type.Edsl -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Type/Key.hs b/src/Toml/Type/Key.hs --- a/src/Toml/Type/Key.hs +++ b/src/Toml/Type/Key.hs @@ -2,7 +2,7 @@ {- | Module : Toml.Type.Key -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Type/PrefixTree.hs b/src/Toml/Type/PrefixTree.hs --- a/src/Toml/Type/PrefixTree.hs +++ b/src/Toml/Type/PrefixTree.hs @@ -3,7 +3,7 @@ {- | Module : Toml.Type.PrefixTree -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Type/Printer.hs b/src/Toml/Type/Printer.hs --- a/src/Toml/Type/Printer.hs +++ b/src/Toml/Type/Printer.hs @@ -2,7 +2,7 @@ {- | Module : Toml.Type.Printer -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Type/TOML.hs b/src/Toml/Type/TOML.hs --- a/src/Toml/Type/TOML.hs +++ b/src/Toml/Type/TOML.hs @@ -2,7 +2,7 @@ {- | Module : Toml.Type.TOML -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Type/UValue.hs b/src/Toml/Type/UValue.hs --- a/src/Toml/Type/UValue.hs +++ b/src/Toml/Type/UValue.hs @@ -2,7 +2,7 @@ {- | Module : Toml.Type.UValue -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/src/Toml/Type/Value.hs b/src/Toml/Type/Value.hs --- a/src/Toml/Type/Value.hs +++ b/src/Toml/Type/Value.hs @@ -8,7 +8,7 @@ {- | Module : Toml.Type.Value -Copyright : (c) 2018-2021 Kowainik +Copyright : (c) 2018-2022 Kowainik SPDX-License-Identifier : MPL-2.0 Maintainer : Kowainik Stability : Stable diff --git a/tomland.cabal b/tomland.cabal --- a/tomland.cabal +++ b/tomland.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: tomland -version: 1.3.3.1 +version: 1.3.3.2 synopsis: Bidirectional TOML serialization description: Implementation of bidirectional TOML serialization. Simple codecs look like this: @@ -27,7 +27,7 @@ license-file: LICENSE author: Dmitrii Kovanikov, Veronika Romashkina maintainer: Kowainik -copyright: 2018-2021 Kowainik +copyright: 2018-2022 Kowainik category: TOML, Text, Configuration build-type: Simple extra-doc-files: README.md @@ -38,7 +38,8 @@ GHC == 8.6.5 GHC == 8.8.4 GHC == 8.10.7 - GHC == 9.0.1 + GHC == 9.0.2 + GHC == 9.2.4 source-repository head type: git @@ -55,7 +56,7 @@ manual: True common common-options - build-depends: base >= 4.11 && < 4.16 + build-depends: base >= 4.11 && < 4.17 ghc-options: -Wall -Wcompat @@ -73,6 +74,9 @@ -Werror=missing-deriving-strategies if impl(ghc >= 8.10) ghc-options: -Wunused-packages + if impl(ghc >= 9.2) + ghc-options: + -Wredundant-bang-patterns default-language: Haskell2010 default-extensions: DeriveGeneric @@ -133,7 +137,7 @@ , megaparsec >= 7.0.5 && < 9.3 , mtl ^>= 2.2 , parser-combinators >= 1.1.0 && < 1.4 - , text ^>= 1.2 + , text >= 1.2 && < 2.1 , time >= 1.8 && < 1.14 , transformers >= 0.5 && < 0.7 , unordered-containers ^>= 0.2.7 @@ -222,8 +226,8 @@ build-depends: bytestring , containers >= 0.5.7 && < 0.7 , hashable - , hedgehog ^>= 1.0.1 - , hspec >= 2.7.1 && < 2.9 + , hedgehog >= 1.0.1 && < 1.3 + , hspec >= 2.7.1 && < 2.11 , hspec-hedgehog ^>= 0.0.1 , hspec-megaparsec >= 2.0.0 && < 2.3.0 , megaparsec