Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support GHC 9.8 #432

Merged
merged 2 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/Test/Toml/Gen.hs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
, range100
) where

import Control.Applicative (liftA2)

Check warning on line 56 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 9.6.3

The import of ‘Control.Applicative’ is redundant

Check warning on line 56 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 9.8.1

The import of ‘Control.Applicative’ is redundant

Check warning on line 56 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / macOS-latest / ghc 9.6.3

The import of ‘Control.Applicative’ is redundant

Check warning on line 56 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / macOS-latest / ghc 9.8.1

The import of ‘Control.Applicative’ is redundant

Check warning on line 56 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / windows-latest / ghc 9.6.3

The import of ‘Control.Applicative’ is redundant

Check warning on line 56 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / windows-latest / ghc 9.8.1

The import of ‘Control.Applicative’ is redundant
import Control.Monad (forM, replicateM)
import Data.ByteString (ByteString)
import Data.Fixed (Fixed (..))
Expand Down Expand Up @@ -114,7 +114,7 @@
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
Expand Down Expand Up @@ -315,7 +315,7 @@

-- | Generates some unescaped unicode string
genUnicodeChar :: Gen Text
genUnicodeChar = Gen.element

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / stack / ghc 9.2.6

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 9.6.3

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 8.10.7

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 9.0.2

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 8.6.5

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 8.4.4

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 9.2.7

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / windows-latest / ghc 9.4.4

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 9.8.1

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / macOS-latest / ghc 9.6.3

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 9.4.4

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 8.8.4

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / macOS-latest / ghc 9.8.1

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / macOS-latest / ghc 9.4.4

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / windows-latest / ghc 9.6.3

Defined but not used: ‘genUnicodeChar’

Check warning on line 318 in test/Test/Toml/Gen.hs

View workflow job for this annotation

GitHub Actions / windows-latest / ghc 9.8.1

Defined but not used: ‘genUnicodeChar’
[ "č", "ć", "š", "đ", "ž", "Ö", "ё"
, "в", "ь", "ж", "ю", "ч", "ü", "я"
]
Expand Down
12 changes: 6 additions & 6 deletions tomland.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading