Merge pull request #65 from haskellari/ghc-9.4

Allow base-4.17

Author: phadej

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.13.20211116
+# version: 0.15.20220808
 #
-# REGENDATA ("0.13.20211116",["github","cabal.project"])
+# REGENDATA ("0.15.20220808",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -23,7 +23,7 @@ on:
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     timeout-minutes:
       60
     container:
@@ -37,15 +37,20 @@ jobs:
             compilerVersion: "8.4"
             setup-method: hvr-ppa
             allow-failure: false
-          - compiler: ghc-9.2.1
+          - compiler: ghc-9.4.1
             compilerKind: ghc
-            compilerVersion: 9.2.1
+            compilerVersion: 9.4.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.0.1
+          - compiler: ghc-9.2.4
             compilerKind: ghc
-            compilerVersion: 9.0.1
-            setup-method: hvr-ppa
+            compilerVersion: 9.2.4
+            setup-method: ghcup
+            allow-failure: false
+          - compiler: ghc-9.0.2
+            compilerKind: ghc
+            compilerVersion: 9.0.2
+            setup-method: ghcup
             allow-failure: false
           - compiler: ghc-8.10.4
             compilerKind: ghc
@@ -118,10 +123,10 @@ jobs:
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
           if [ "${{ matrix.setup-method }}" = ghcup ]; then
             mkdir -p "$HOME/.ghcup/bin"
-            curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
+            curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
-            "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
-            "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
+            "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+            "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           else
             apt-add-repository -y 'ppa:hvr/ghc'
             if [ $((GHCJSARITH)) -ne 0 ] ; then apt-add-repository -y 'ppa:hvr/ghcjs' ; fi
@@ -130,9 +135,9 @@ jobs:
             apt-get update
             if [ $((GHCJSARITH)) -ne 0 ] ; then apt-get install -y "$HCNAME" ghc-8.4.4 nodejs ; else apt-get install -y "$HCNAME" ; fi
             mkdir -p "$HOME/.ghcup/bin"
-            curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
+            curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
-            "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
+            "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           fi
         env:
           HCKIND: ${{ matrix.compilerKind }}
@@ -290,7 +295,7 @@ jobs:
           ${CABAL} -vnormal check
       - name: haddock
         run: |
-          if [ $((! GHCJSARITH && HCNUMVER >= 70800)) -ne 0 ] ; then $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
+          if [ $((! GHCJSARITH && HCNUMVER >= 70800)) -ne 0 ] ; then $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi
       - name: unconstrained build
         run: |
           rm -f cabal.project.local

ChangeLog.md

@@ -1,3 +1,7 @@
+## 0.2.2
+
+- Add instances for base and primitive's `ByteArray`s.
+
 ## 0.2.1.1
 
 - Support `base-4.16` (GHC-9.2)

src/Data/TreeDiff/Class.hs

@@ -106,7 +106,11 @@ import qualified Data.Strict as Strict
 import Data.These (These (..))
 
 -- primitive
--- import qualified Data.Primitive as Prim
+import qualified Data.Primitive as Prim
+
+#if MIN_VERSION_base(4,17,0)
+import Data.Array.Byte (ByteArray (..))
+#endif
 
 -- $setup
 -- >>> :set -XDeriveGeneric
@@ -593,4 +597,14 @@ instance (ToExpr a, ToExpr b) => ToExpr (These a b) where
 -- primitive
 -------------------------------------------------------------------------------
 
--- TODO: add instances
+-- | @since 0.2.2
+instance ToExpr Prim.ByteArray where
+    toExpr ba = App "Prim.byteArrayFromList" [toExpr (Prim.foldrByteArray (:) [] ba :: [Word8])]
+
+#if MIN_VERSION_base(4,17,0)
+-- | @since 0.2.2
+instance ToExpr ByteArray where
+    toExpr (ByteArray ba) = App "byteArrayFromList" [toExpr (Prim.foldrByteArray (:) [] (Prim.ByteArray ba) :: [Word8])]
+#endif
+
+-- TODO: add more instances

tree-diff.cabal

@@ -1,7 +1,6 @@
 cabal-version:      2.2
 name:               tree-diff
-version:            0.2.1.1
-x-revision:         2
+version:            0.2.2
 synopsis:           Diffing of (expression) trees.
 category:           Data, Testing
 description:
@@ -55,8 +54,9 @@ tested-with:
      || ==8.6.5
      || ==8.8.4
      || ==8.10.4
-     || ==9.0.1
-     || ==9.2.1
+     || ==9.0.2
+     || ==9.2.4
+     || ==9.4.1
   , GHCJS ==8.4
 
 extra-source-files:
@@ -85,39 +85,39 @@ library
 
   -- GHC boot libraries
   build-depends:
-    , base        >=4.5      && <4.17
+    , base        >=4.5      && <4.18
     , bytestring  ^>=0.9.2.1 || ^>=0.10.0.2 || ^>=0.11.0.0
     , containers  ^>=0.4.2.1 || ^>=0.5.0.0 || ^>=0.6.0.1
     , deepseq     ^>=1.3.0.0 || ^>=1.4.0.0
     , parsec      ^>=3.1.13.0
     , pretty      ^>=1.1.1.0
     , text        ^>=1.2.3.0 || ^>=2.0
-    , time        ^>=1.4 || ^>=1.5.0.1 || ^>=1.6.0.1 || ^>=1.8.0.2 || ^>=1.9.3 || ^>=1.10 || ^>=1.11 || ^>=1.12
+    , time        >=1.4      && <1.5 || >=1.5.0.1 && <1.6 || >=1.6.0.1 && <1.7 || >=1.8.0.2 && <1.9 || >=1.9.3 && <1.13
 
   build-depends:
     , aeson                 ^>=1.4.6.0 || ^>=1.5.6.0 || ^>=2.0.0.0 || ^>=2.1.0.0
     , ansi-terminal         >=0.10       && <0.12
     , ansi-wl-pprint        ^>=0.6.8.2
-    , base-compat           ^>=0.10.5 || ^>=0.11.0 || ^>=0.12
+    , base-compat           >=0.10.5     && <0.11 || >=0.11.0 && <0.13
     , bytestring-builder    ^>=0.10.8.2.0
     , hashable              ^>=1.2.7.0 || ^>=1.3.0.0 || ^>=1.4.0.1
     , parsers               ^>=0.12.10
     , primitive             ^>=0.7.1.0
     , QuickCheck            ^>=2.14.2
     , scientific            ^>=0.3.6.2
-    , semialign             >=1.1        && <1.3
+    , semialign             ^>=1.2.0.1
     , strict                ^>=0.4.0.1
     , tagged                ^>=0.8.6
     , these                 ^>=1.1.1.1
     , unordered-containers  ^>=0.2.8.0
     , uuid-types            ^>=1.0.3
-    , vector                ^>=0.12 || ^>=0.13
+    , vector                ^>=0.12.0.0 || ^>=0.13.0.0
 
   if impl(ghc <7.5)
     build-depends: ghc-prim
 
   if !impl(ghc >=8.0)
-    build-depends: semigroups ^>=0.19.1 || ^>=0.20
+    build-depends: semigroups >=0.19.1 && <0.21
 
   if !impl(ghc >=7.8)
     build-depends: generic-deriving >=1.13.1 && <1.15
@@ -186,5 +186,5 @@ benchmark tree-diff-bench
 
   -- extra dependencies
   build-depends:
-    , criterion  ^>=1.5.9.0
+    , criterion  ^>=1.6.0.0
     , Diff       ^>=0.4.0