Merge pull request #1171 from haskell/semialign-1.4

phadej · web-flow · commit 10c23ba00bd9 · 2026-05-12T18:08:02.000+03:00
Allow semialign-1.4
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -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
diff --git a/aeson.cabal b/aeson.cabal
@@ -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
@@ -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
 
@@ -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
diff --git a/attoparsec-aeson/attoparsec-aeson.cabal b/attoparsec-aeson/attoparsec-aeson.cabal
@@ -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
 
diff --git a/attoparsec-iso8601/attoparsec-iso8601.cabal b/attoparsec-iso8601/attoparsec-iso8601.cabal
@@ -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
 
diff --git a/benchmarks/aeson-benchmarks.cabal b/benchmarks/aeson-benchmarks.cabal
@@ -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
 
diff --git a/changelog.md b/changelog.md
@@ -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
diff --git a/examples/aeson-examples.cabal b/examples/aeson-examples.cabal
@@ -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
 
diff --git a/src/Data/Aeson/KeyMap.hs b/src/Data/Aeson/KeyMap.hs
@@ -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
 
diff --git a/text-iso8601/text-iso8601.cabal b/text-iso8601/text-iso8601.cabal
@@ -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
 
