Skip to content

Commit 44ec7c9

Browse files
committed
Release 2.0.2.1, fixing compatibility with GHC 9.10
1 parent 9a5794b commit 44ec7c9

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog for [`os-string` package](http://hackage.haskell.org/package/os-string)
22

3+
## 2.0.2.1 *Apr 2024*
4+
5+
* Fix compabitiliby with GHC 9.10
6+
37
## 2.0.2 *Dec 2023*
48

59
* Implement coercionToPlatformTypes, fixes #4

os-string.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: os-string
3-
version: 2.0.2
3+
version: 2.0.2.1
44

55
-- NOTE: Don't forget to update ./changelog.md
66
license: BSD-3-Clause
@@ -63,7 +63,7 @@ library
6363

6464
default-language: Haskell2010
6565
build-depends:
66-
, base >=4.12.0.0 && <4.20
66+
, base >=4.12.0.0 && <4.21
6767
, bytestring >=0.11.3.0
6868
, deepseq
6969
, exceptions

tests/encoding/EncodingSpec.hs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ tests =
3939
let str = [toEnum 55296, toEnum 55297]
4040
encoded = encodeWithTE utf16le str
4141
decoded = decodeWithTE utf16le =<< encoded
42-
#if __GLASGOW_HASKELL__ >= 904
42+
#if __GLASGOW_HASKELL__ >= 910
43+
in decoded === Left (EncodingError ("recoverEncode: invalid argument (cannot encode character " <> show (head str) <> ")\n") Nothing))
44+
#elif __GLASGOW_HASKELL__ >= 904
4345
in decoded === Left (EncodingError ("recoverEncode: invalid argument (cannot encode character " <> show (head str) <> ")") Nothing))
4446
#else
4547
in decoded === Left (EncodingError "recoverEncode: invalid argument (invalid character)" Nothing))
@@ -69,7 +71,9 @@ tests =
6971
let str = [toEnum 0xDFF0, toEnum 0xDFF2]
7072
encoded = encodeWithTE (mkUTF8 RoundtripFailure) str
7173
decoded = decodeWithTE (mkUTF8 RoundtripFailure) =<< encoded
72-
#if __GLASGOW_HASKELL__ >= 904
74+
#if __GLASGOW_HASKELL__ >= 910
75+
in decoded === Left (EncodingError ("recoverEncode: invalid argument (cannot encode character " <> show (head str) <> ")\n") Nothing))
76+
#elif __GLASGOW_HASKELL__ >= 904
7377
in decoded === Left (EncodingError ("recoverEncode: invalid argument (cannot encode character " <> show (head str) <> ")") Nothing))
7478
#else
7579
in decoded === Left (EncodingError "recoverEncode: invalid argument (invalid character)" Nothing))

0 commit comments

Comments
 (0)