Remove 8.0 and 8.2 support, version bumps

* Update changelogs * Replace travis badge with haskell ci badge in readme * Format some cabal files * Remove travis folder
well-typed · Sep 24, 2022 · ea55f31 · ea55f31
1 parent 00e9add
commit ea55f31
Show file tree

Hide file tree

Showing 13 changed files with 87 additions and 102 deletions.
diff --git a/.travis/dragon-bureaucrat.sh b/.travis/dragon-bureaucrat.sh
diff --git a/.travis/prep-llvm.sh b/.travis/prep-llvm.sh
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Fast binary serialisation and CBOR implementation for Haskell
 
-[![Linux Build Status](https://img.shields.io/travis/well-typed/cborg/master.svg?label=Linux%20build)](https://travis-ci.org/well-typed/cborg)
+![Haskell CI](https://github.com/well-typed/cborg/actions/workflows/haskell-ci.yml/badge.svg)
 [![Hackage cborg version](https://img.shields.io/hackage/v/cborg.svg?label=Hackage)](https://hackage.haskell.org/package/cborg)
 [![Hackage serialise version](https://img.shields.io/hackage/v/serialise.svg?label=Hackage)](https://hackage.haskell.org/package/serialise)
 [![BSD3](https://img.shields.io/badge/License-BSD-blue.svg)](https://en.wikipedia.org/wiki/BSD_License)

diff --git a/binary-serialise-cbor/ChangeLog.md b/binary-serialise-cbor/ChangeLog.md
@@ -0,0 +1,9 @@
+# Revision history for binary-serialise-cbor
+
+## 0.2.2.0  -- 2022-09-24
+
+* Support GHC 9.4
+
+* Drop GHC 8.0 and 8.2 support
+
+* Add ChangeLog
diff --git a/binary-serialise-cbor/binary-serialise-cbor.cabal b/binary-serialise-cbor/binary-serialise-cbor.cabal
@@ -1,5 +1,5 @@
 name:                binary-serialise-cbor
-version:             0.2.1.0
+version:             0.2.2.0
 synopsis:            Yet Another Binary Serialisation Library (compatibility shim)
 license:             BSD3
 license-file:        LICENSE.txt
@@ -21,6 +21,9 @@ tested-with:
   GHC == 9.2.2,
   GHC == 9.4.2
 
+extra-source-files:
+  ChangeLog.md
+
 description:
   This package is a shim around @cborg@, exposing an interface compatible with
   the previous @binary-serialise-cbor@.
@@ -48,8 +51,9 @@ library
   exposed-modules: Data.Binary.Serialise.CBOR.Read
 
   build-depends:
-    base >= 4.8 && < 4.18,
+    base       >= 4.11 && < 4.18,
     bytestring < 1.0,
+
     cborg     == 0.2.*,
     serialise == 0.2.*
 
diff --git a/cbor-tool/ChangeLog.md b/cbor-tool/ChangeLog.md
@@ -1,5 +1,13 @@
 # Revision history for cbor-tool
 
+## 0.2.3.0  -- 2022-09-24
+
+* Support GHC 9.4
+
+* Drop GHC 8.0 and 8.2 support
+
+* Support aeson 2.1
+
 ## 0.2.2.0  -- 2019-12-29
 
 * Version bumps and support for GHC 8.8

diff --git a/cbor-tool/cbor-tool.cabal b/cbor-tool/cbor-tool.cabal
@@ -1,5 +1,5 @@
 name:                cbor-tool
-version:             0.2.2.0
+version:             0.2.3.0
 synopsis:            A tool for manipulating CBOR.
 description:         A tool for dumping and converting CBOR-encoded data.
 homepage:            https://github.com/well-typed/cborg
@@ -28,15 +28,15 @@ executable cbor-tool
   other-extensions:    CPP, BangPatterns
   ghc-options:         -Wall
   build-depends:
-    base >=4.7 && <4.18,
-    filepath >=1.0 && <1.5,
-    aeson >=0.7 && <2.2,
-    aeson-pretty >=0.8 && <0.9,
-    scientific >=0.3 && <0.4,
-    bytestring >=0.10 && <0.12,
-    unordered-containers >=0.2 && <0.3,
-    text >=1.1 && <2.1,
-    vector >=0.10 && <0.13,
+    base                 >=4.11 && <4.18,
+    filepath             >=1.0  && <1.5,
+    aeson                >=0.7  && <2.2,
+    aeson-pretty         >=0.8  && <0.9,
+    scientific           >=0.3  && <0.4,
+    bytestring           >=0.10 && <0.12,
+    unordered-containers >=0.2  && <0.3,
+    text                 >=1.1  && <2.1,
+    vector               >=0.10 && <0.13,
 
     cborg      ==0.2.*,
     cborg-json ==0.2.*

diff --git a/cborg-json/ChangeLog.md b/cborg-json/ChangeLog.md
@@ -1,5 +1,13 @@
 # Revision history for cborg-json
 
+## 0.2.5.0  -- 2022-09-24
+
+* Support GHC 9.4
+
+* Drop GHC 8.0 and 8.2 support
+
+* Support aeson 2.1
+
 ## 0.2.2.0  -- 2019-12-29
 
 * Use `replicateM` to significantly speed up decoding. Now faster than Aeson!

diff --git a/cborg-json/cborg-json.cabal b/cborg-json/cborg-json.cabal
@@ -1,5 +1,5 @@
 name:                cborg-json
-version:             0.2.4.0
+version:             0.2.5.0
 synopsis:            A library for encoding JSON as CBOR
 description:         This package implements the bijection between JSON and
                      CBOR defined in the CBOR specification, RFC 7049.
@@ -29,14 +29,16 @@ library
   exposed-modules:     Codec.CBOR.JSON
   ghc-options:         -Wall
   build-depends:
-    base >=4.7 && < 4.18,
-    aeson >=0.7 && <2.2,
-    aeson-pretty >=0.8 && <0.9,
-    unordered-containers >=0.2 && <0.3,
-    scientific >=0.3 && <0.4,
-    text >=1.1 && <2.1,
-    vector >=0.10 && <0.13,
+    base                 >=4.11 && < 4.18,
+    aeson                >=0.7  && <2.2,
+    aeson-pretty         >=0.8  && <0.9,
+    unordered-containers >=0.2  && <0.3,
+    scientific           >=0.3  && <0.4,
+    text                 >=1.1  && <2.1,
+    vector               >=0.10 && <0.13,
+
     cborg ==0.2.*
+
   hs-source-dirs:      src
   default-language:    Haskell2010
 
@@ -57,13 +59,14 @@ benchmark bench
   other-modules:
 
   build-depends:
-    base                    >= 4.6     && < 4.18,
-    cborg                                      ,
-    cborg-json                                 ,
-    aeson                                      ,
-    bytestring              >= 0.10.4  && < 0.12,
-    criterion               >= 1.0     && < 1.6,
-    deepseq                 >= 1.0     && < 1.5,
+    base       >= 4.11    && < 4.18,
+    bytestring >= 0.10.4  && < 0.12,
+    criterion  >= 1.0     && < 1.6,
+    deepseq    >= 1.0     && < 1.5,
+    zlib       >= 0.5     && < 0.7,
     directory,
     process,
-    zlib                    >= 0.5     && < 0.7
+    aeson,
+
+    cborg,
+    cborg-json
diff --git a/cborg/ChangeLog.md b/cborg/ChangeLog.md
@@ -1,5 +1,16 @@
 # Revision history for cborg
 
+## 0.2.8.0  -- 2022-09-24
+
+* Support GHC 9.4
+
+* Fix compatibility with primitive 0.7.4.0
+
+* Drop GHC 8.0 and 8.2 support
+
+* Support aeson 2.1
+
+
 ## 0.2.3.1  -- 2020-05-10
 
 * Bounds updates for GHC 8.10

diff --git a/cborg/cborg.cabal b/cborg/cborg.cabal
@@ -1,5 +1,5 @@
 name:                cborg
-version:             0.2.7.0
+version:             0.2.8.0
 synopsis:            Concise Binary Object Representation (CBOR)
 license:             BSD3
 license-file:        LICENSE.txt
@@ -89,7 +89,7 @@ library
 
   build-depends:
     array                   >= 0.4     && < 0.6,
-    base                    >= 4.8     && < 4.18,
+    base                    >= 4.11    && < 4.18,
     bytestring              >= 0.10.4  && < 0.12,
     containers              >= 0.5     && < 0.7,
     deepseq                 >= 1.0     && < 1.5,
@@ -147,7 +147,7 @@ test-suite tests
 
   build-depends:
     array                   >= 0.4     && < 0.6,
-    base                    >= 4.7     && < 4.18,
+    base                    >= 4.11    && < 4.18,
     base-orphans,
     bytestring              >= 0.10.4  && < 0.12,
     text                    >= 1.1     && < 2.1,

diff --git a/serialise/ChangeLog.md b/serialise/ChangeLog.md
@@ -1,5 +1,11 @@
 # Revision history for serialise
 
+## 0.2.6.0  -- 2022-09-24
+
+* Support GHC 9.4
+
+* Drop GHC 8.0 and 8.2 support
+
 ## 0.2.4.0  -- UNRELEASED
 
 * Add instances for Data.Void, strict and these.

diff --git a/serialise/serialise.cabal b/serialise/serialise.cabal
@@ -1,5 +1,5 @@
 name:                serialise
-version:             0.2.5.0
+version:             0.2.6.0
 synopsis:            A binary serialisation library for Haskell values.
 description:
   This package (formerly @binary-serialise-cbor@) provides pure, efficient
@@ -69,8 +69,8 @@ library
     Codec.Serialise.Internal.GeneralisedUTF8
 
   build-depends:
+    base                    >= 4.11    && < 4.18,
     array                   >= 0.4     && < 0.6,
-    base                    >= 4.7     && < 4.18,
     bytestring              >= 0.10.4  && < 0.12,
     cborg                   == 0.2.*,
     containers              >= 0.5     && < 0.7,
@@ -124,7 +124,7 @@ test-suite tests
     Tests.GeneralisedUTF8
 
   build-depends:
-    base                    >= 4.7     && < 4.18,
+    base                    >= 4.11    && < 4.18,
     bytestring              >= 0.10.4  && < 0.12,
     directory               >= 1.0     && < 1.4,
     filepath                >= 1.0     && < 1.5,
@@ -161,7 +161,7 @@ benchmark instances
     Instances.Time
 
   build-depends:
-    base                    >= 4.7     && < 4.18,
+    base                    >= 4.11    && < 4.18,
     binary                  >= 0.7     && < 0.11,
     bytestring              >= 0.10.4  && < 0.12,
     vector                  >= 0.10    && < 0.13,
@@ -205,7 +205,7 @@ benchmark micro
     SimpleVersus
 
   build-depends:
-    base                    >= 4.7     && < 4.18,
+    base                    >= 4.11    && < 4.18,
     binary                  >= 0.7     && < 0.11,
     bytestring              >= 0.10.4  && < 0.12,
     ghc-prim                >= 0.3.1.0 && < 0.10,
@@ -251,8 +251,8 @@ benchmark versus
     Macro.CBOR
 
   build-depends:
+    base                    >= 4.11    && < 4.18,
     array                   >= 0.4     && < 0.6,
-    base                    >= 4.7     && < 4.18,
     binary                  >= 0.7     && < 0.11,
     bytestring              >= 0.10.4  && < 0.12,
     directory               >= 1.0     && < 1.4,