From 0ac34276fddbd2d45722540fe2b5f2f20d3b290b Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Thu, 2 Nov 2023 15:45:03 +0000 Subject: [PATCH 1/2] Disambiguate string type --- test/Test/Toml/Gen.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Test/Toml/Gen.hs b/test/Test/Toml/Gen.hs index 2fda370..c7a6664 100644 --- a/test/Test/Toml/Gen.hs +++ b/test/Test/Toml/Gen.hs @@ -114,7 +114,7 @@ genPiece = Piece <$> Gen.choice [bare, quoted] bare = liftA2 Text.cons Gen.alpha $ Gen.text (Range.constant 1 10) alphadashes alphadashes :: Gen Char - alphadashes = Gen.choice [Gen.alphaNum, Gen.element "_-"] + alphadashes = Gen.choice [Gen.alphaNum, Gen.element ("_-" :: [Char])] quoted :: Gen Text quoted = genNotEscape $ Gen.choice From f58163f7e1178e71a5f5a594fd4be6b5ec1135c5 Mon Sep 17 00:00:00 2001 From: Tom Ellis Date: Sat, 1 Oct 2022 08:58:06 +0100 Subject: [PATCH 2/2] Support 9.8 --- .github/workflows/ci.yml | 2 ++ tomland.cabal | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d43faa3..28b625b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,8 @@ jobs: - "9.0.2" - "9.2.7" - "9.4.4" + - "9.6.3" + - "9.8.1" exclude: - os: macOS-latest ghc: 9.2.7 diff --git a/tomland.cabal b/tomland.cabal index 7987aa6..318352b 100644 --- a/tomland.cabal +++ b/tomland.cabal @@ -57,7 +57,7 @@ flag build-play-tomland manual: True common common-options - build-depends: base >= 4.11 && < 4.18 + build-depends: base >= 4.11 && < 4.20 ghc-options: -Wall -Wcompat @@ -133,12 +133,12 @@ library build-depends: bytestring >= 0.10 && < 0.12 , containers >= 0.5.7 && < 0.7 - , deepseq ^>= 1.4 + , deepseq >= 1.4 && < 1.6 , hashable >= 1.3.1.0 && < 1.5 - , megaparsec >= 7.0.5 && < 9.4 + , megaparsec >= 7.0.5 && < 9.7 , mtl >= 2.2 && < 2.4 , parser-combinators >= 1.1.0 && < 1.4 - , text >= 1.2 && < 2.1 + , text >= 1.2 && < 2.2 , time >= 1.8 && < 1.14 , unordered-containers ^>= 0.2.7 , validation-selective >= 0.1.0 && < 0.3 @@ -226,8 +226,8 @@ test-suite tomland-test build-depends: bytestring , containers >= 0.5.7 && < 0.7 , hashable - , hedgehog >= 1.0.1 && < 1.3 - , hspec >= 2.7.1 && < 2.11 + , hedgehog >= 1.0.1 && < 1.5 + , hspec >= 2.7.1 && < 2.12 , hspec-hedgehog ^>= 0.0.1 , hspec-megaparsec >= 2.0.0 && < 2.3.0 , megaparsec