From ea55f3146d794e1a9a328838ed4f175c6594437d Mon Sep 17 00:00:00 2001 From: Finley McIlwaine Date: Sat, 24 Sep 2022 09:46:04 -0600 Subject: [PATCH] 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 --- .travis/dragon-bureaucrat.sh | 57 ------------------- .travis/prep-llvm.sh | 7 --- README.md | 2 +- binary-serialise-cbor/ChangeLog.md | 9 +++ .../binary-serialise-cbor.cabal | 8 ++- cbor-tool/ChangeLog.md | 8 +++ cbor-tool/cbor-tool.cabal | 20 +++---- cborg-json/ChangeLog.md | 8 +++ cborg-json/cborg-json.cabal | 35 ++++++------ cborg/ChangeLog.md | 11 ++++ cborg/cborg.cabal | 6 +- serialise/ChangeLog.md | 6 ++ serialise/serialise.cabal | 12 ++-- 13 files changed, 87 insertions(+), 102 deletions(-) delete mode 100755 .travis/dragon-bureaucrat.sh delete mode 100755 .travis/prep-llvm.sh create mode 100644 binary-serialise-cbor/ChangeLog.md diff --git a/.travis/dragon-bureaucrat.sh b/.travis/dragon-bureaucrat.sh deleted file mode 100755 index 12098179..00000000 --- a/.travis/dragon-bureaucrat.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash - -# An evil script that protects our repository against unwanted -# changes. For now, it just makes sure that british spelling is -# preserved for the user-facing API. -# -# This script alone is under the Apache 2.0 license. Thanks to -# Phabricator for the sweet ASCII art. - -set e -unset CDPATH - -function onoes { - echo '+-----------------------------------------------------------------+' - echo '| * * * PATCH REJECTED BY EVIL DRAGON BUREAUCRATS * * * |' - echo '| * * * YOU MUST USE BRITISH SPELLING * * * |' - echo '+-----------------------------------------------------------------+' - echo ' \' - echo ' \ ^ /^' - echo ' \ / \ // \' - echo ' \ |\___/| / \// .\' - echo ' \ /V V \__ / // | \ \ *----*' - echo ' / / \/_/ // | \ \ \ |' - echo ' @___@` \/_ // | \ \ \/\ \' - echo ' | \/_ // | \ \ \ \' - echo ' ) | \/// | \ \ | |' - echo ' (( |__/ ( // | \ _\ | /' - echo ' \~~/)/,_ _ _/ ) ; -. | _ _\.-~ / /' - echo ' == ,-} _ *-.|.-~-. .~ ~' - echo ' \ \__/ `/\ / ~-. _ .-~ /' - echo ' \____(Oo) *. } { /' - echo ' ( (--) .----~-.\ \-` .~' - echo ' //__\\\\ \ DENIED! ///.----..< \ _ -~' - echo ' // \\\\ ///-._ _ _ _ _ _ _{^ - - - - ~' - echo '' -} - -CHECK=`git grep -i serialize | \ - grep -v "instance Serialize" | \ - grep -v "instance (Serialize" | \ - grep -v "Data.Serialize" | \ - grep -v "Data.Vector.Serialize" | \ - grep -v "Deserialized type: " | \ - grep -v "git grep"` - -if [[ ! -z "${CHECK}" ]]; then - onoes - echo 'The dragon saw you say:' - echo '' - echo " $CHECK" - echo '' - echo "and got angry. Don't do that!" - - exit 1; -else - echo "OK: the dragon bureaucrat is happy" -fi diff --git a/.travis/prep-llvm.sh b/.travis/prep-llvm.sh deleted file mode 100755 index 3632d7ed..00000000 --- a/.travis/prep-llvm.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -if [[ "x$1" != "x" ]]; then - echo "Enabling LLVM $1 build for cborg" - echo "package cborg" > cabal.project.local - echo " ghc-options: -fllvm -pgmlo opt-$1 -pgmlc llc-$1" >> cabal.project.local -fi diff --git a/README.md b/README.md index 3c244cf7..38f4c3de 100644 --- 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 new file mode 100644 index 00000000..0e78a729 --- /dev/null +++ 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 index 8a176586..26b783ac 100644 --- 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 index f22b05c6..cf8770b8 100644 --- 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 index 15439ad6..61a15f10 100644 --- 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 index 286616ba..54a8c6fd 100644 --- 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 index b6ee5dbc..5e5924e4 100644 --- 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 index 03ef276e..5b7963e5 100644 --- 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 index 8a869b5e..a31eaa09 100644 --- 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 index 882a0712..dd834cce 100644 --- 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 index aef895cd..5f13059b 100644 --- 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,