From bfedcbbabc0655080a57dbd6ff044c9c36c14ddc Mon Sep 17 00:00:00 2001
From: Brian McKeon <135748266+brianjosephmckeon@users.noreply.github.com>
Date: Tue, 6 Feb 2024 19:15:26 -0500
Subject: [PATCH] Prepare release 0.3.16.2.

Use new .github workflows.
Restore import statement for liftA2 to fix build for GHC 9.4.
---
 .github/workflows/build.yaml   | 5 ++---
 .github/workflows/release.yaml | 4 +---
 CHANGELOG.md                   | 4 ++++
 bytebuild.cabal                | 4 ++--
 test/Main.hs                   | 2 ++
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 085bbaf..f3f5be4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -6,7 +6,6 @@ on:
 
 jobs:
   call-workflow:
-    uses: byteverse/.github/.github/workflows/build.yaml@main
-    secrets: inherit
+    uses: byteverse/.github/.github/workflows/build-matrix.yaml@main
     with:
-      release: false
+      cabal-file: bytebuild.cabal
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index bd0bbd5..9411962 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -6,7 +6,5 @@ on:
 
 jobs:
   call-workflow:
-    uses: byteverse/.github/.github/workflows/build.yaml@main
+    uses: byteverse/.github/.github/workflows/release.yaml@main
     secrets: inherit
-    with:
-      release: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc385a4..4f03773 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ Note: Prior to version 0.3.4.0, this library was named
 `small-bytearray-builder` is now just a compatibility shim
 to ease the migration process.
 
+## 0.3.16.2 -- 2024-02-06
+
+* Restore import statement for `liftA2` to fix build for GHC 9.4.
+
 ## 0.3.16.1 -- 2024-02-02
 
 * Remove all CPP
diff --git a/bytebuild.cabal b/bytebuild.cabal
index 46918ab..024ca31 100644
--- a/bytebuild.cabal
+++ b/bytebuild.cabal
@@ -1,6 +1,6 @@
 cabal-version:   2.2
 name:            bytebuild
-version:         0.3.16.1
+version:         0.3.16.2
 synopsis:        Build byte arrays
 description:
   This is similar to the builder facilities provided by
@@ -28,6 +28,7 @@ maintainer:      amartin@layer3com.com
 copyright:       2019 Andrew Martin
 category:        Data
 extra-doc-files: CHANGELOG.md
+tested-with:     GHC ==9.4.8 || ==9.6.3 || ==9.8.1
 
 common build-settings
   default-language: Haskell2010
@@ -94,7 +95,6 @@ test-suite test
   type:           exitcode-stdio-1.0
   hs-source-dirs: test common
   main-is:        Main.hs
-  ghc-options:    -O2
   other-modules:
     HexWord64
     Word16Tree
diff --git a/test/Main.hs b/test/Main.hs
index e5d3be2..5d1655f 100644
--- a/test/Main.hs
+++ b/test/Main.hs
@@ -8,6 +8,8 @@
 
 import Prelude hiding (replicate)
 
+-- liftA2 is needed by GHC 9.4
+import Control.Applicative (liftA2)
 import Control.Monad.ST (runST)
 import Data.Bytes.Builder
 import Data.Bytes.Builder.Template (bldr)