Skip to content

Allow semialign-1.4 #1171

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.

Sign up for GitHub

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

Merged
phadej merged 1 commit into from
May 12, 2026
Merged

Allow semialign-1.4 #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ jobs:
compilerVersion: 9.12.4
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.10.1
- compiler: ghc-9.10.3
compilerKind: ghc
compilerVersion: 9.10.1
compilerVersion: 9.10.3
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.8.4
Expand Down
6 changes: 3 additions & 3 deletions aeson.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: aeson
version: 2.2.4.1
version: 2.2.5.0
license: BSD-3-Clause
license-file: LICENSE
category: Text, Web, JSON
Expand All @@ -20,7 +20,7 @@ tested-with:
|| ==9.4.8
|| ==9.6.6
|| ==9.8.4
|| ==9.10.1
|| ==9.10.3
|| ==9.12.4
|| ==9.14.1

Expand Down Expand Up @@ -127,7 +127,7 @@ library
, primitive ^>=0.8.0.0 || ^>=0.9.0.0
, QuickCheck ^>=2.14.3 || ^>=2.15 || ^>=2.16.0.0 || ^>=2.17.1.0 || ^>=2.18.0.0
, scientific ^>=0.3.7.0
, semialign ^>=1.3
, semialign ^>=1.3 || ^>=1.4
, strict ^>=0.5
, tagged ^>=0.8.7
, text-iso8601 ^>=0.1.1
Expand Down
2 changes: 1 addition & 1 deletion attoparsec-aeson/attoparsec-aeson.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ tested-with:
|| ==9.4.8
|| ==9.6.6
|| ==9.8.4
|| ==9.10.1
|| ==9.10.3
|| ==9.12.4
|| ==9.14.1

Expand Down
2 changes: 1 addition & 1 deletion attoparsec-iso8601/attoparsec-iso8601.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ tested-with:
|| ==9.4.8
|| ==9.6.6
|| ==9.8.4
|| ==9.10.1
|| ==9.10.3
|| ==9.12.4
|| ==9.14.1

Expand Down
2 changes: 1 addition & 1 deletion benchmarks/aeson-benchmarks.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tested-with:
|| ==9.4.8
|| ==9.6.6
|| ==9.8.4
|| ==9.10.1
|| ==9.10.3
|| ==9.12.4
|| ==9.14.1

Expand Down
4 changes: 4 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
For the latest version of this document, please see [https://github.com/haskell/aeson/blob/master/changelog.md](https://github.com/haskell/aeson/blob/master/changelog.md).

### 2.2.5.0

* Support `semialign-1.4`

### 2.2.4.0

* Check for control characters in text literals everywhere
Expand Down
2 changes: 1 addition & 1 deletion examples/aeson-examples.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ tested-with:
|| ==9.4.8
|| ==9.6.6
|| ==9.8.4
|| ==9.10.1
|| ==9.10.3
|| ==9.12.4
|| ==9.14.1

Expand Down
6 changes: 6 additions & 0 deletions src/Data/Aeson/KeyMap.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,12 @@ instance WI.TraversableWithIndex Key KeyMap where
-- semialign
-------------------------------------------------------------------------------

-- |
--
-- @since 2.2.5.0
instance SA.Unzip KeyMap where
unzip = SA.unzipDefault

instance SA.Zip KeyMap where
zipWith = intersectionWith

Expand Down
2 changes: 1 addition & 1 deletion text-iso8601/text-iso8601.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ tested-with:
|| ==9.4.8
|| ==9.6.6
|| ==9.8.4
|| ==9.10.1
|| ==9.10.3
|| ==9.12.4
|| ==9.14.1

Expand Down
Loading