From 075fd869a2b0bd3b1e0ca9b8343445d55f8a3c6e Mon Sep 17 00:00:00 2001 From: Brian McKeon Date: Wed, 7 Feb 2024 10:13:36 -0500 Subject: [PATCH] Use new .github workflows. Fix build with GHC 9.8. Bumped upper bound on transformers to <0.7. Bumped upper bound on text to <2.2. --- .github/workflows/build.yaml | 5 ++- .github/workflows/release.yaml | 4 +-- CHANGELOG.md | 6 ++++ Setup.hs | 3 -- json-syntax.cabal | 59 ++++++++++++++++++---------------- 5 files changed, 40 insertions(+), 37 deletions(-) delete mode 100644 Setup.hs diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 085bbaf..5e05032 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: json-syntax.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 5d4b288..2a9cf92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Revision history for json-syntax +## 0.2.7.2 -- 2024-02-07 + +* Fix build with GHC 9.8. +* Bumped upper bound on `transformers` to <0.7. +* Bumped upper bound on `text` to <2.2. + ## 0.2.7.1 -- 2024-01-29 * Update package metadata. diff --git a/Setup.hs b/Setup.hs deleted file mode 100644 index e8ef27d..0000000 --- a/Setup.hs +++ /dev/null @@ -1,3 +0,0 @@ -import Distribution.Simple - -main = defaultMain diff --git a/json-syntax.cabal b/json-syntax.cabal index 2cbdc52..9eeeb9b 100644 --- a/json-syntax.cabal +++ b/json-syntax.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: json-syntax -version: 0.2.7.1 +version: 0.2.7.2 synopsis: High-performance JSON parser and encoder description: This library parses JSON into a @Value@ type that is consistent with the @@ -24,9 +24,18 @@ maintainer: amartin@layer3com.com copyright: 2019 Andrew Martin category: Data build-type: Simple -extra-doc-files: CHANGELOG.md +extra-doc-files: + CHANGELOG.md + README.md + +tested-with: GHC ==9.4.8 || ==9.6.3 || ==9.8.1 + +common build-settings + default-language: Haskell2010 + ghc-options: -Wall -Wunused-packages library + import: build-settings exposed-modules: Json Json.Flatten @@ -45,50 +54,46 @@ library , primitive >=0.7 && <0.10 , run-st >=0.1.1 && <0.2 , scientific-notation >=0.1.6 && <0.2 - , text >=2.0.2 && <2.1 + , text >=2.0.2 && <2.2 , text-short >=0.1.3 && <0.2 - , transformers >=0.5.6 && <0.6 + , transformers >=0.5.6 && <0.7 , word-compat >=0.0.6 && <0.1 , zigzag >=0.0.1 && <0.1 - hs-source-dirs: src - default-language: Haskell2010 - ghc-options: -Wall -O2 + hs-source-dirs: src + ghc-options: -O2 test-suite test - default-language: Haskell2010 - type: exitcode-stdio-1.0 - hs-source-dirs: test common - main-is: Main.hs + import: build-settings + type: exitcode-stdio-1.0 + hs-source-dirs: test common + main-is: Main.hs other-modules: Person Twitter100 - ghc-options: -Wall -O2 build-depends: , aeson >=2.0.2 - , array-chunks , base >=4.12.0.0 && <5 , bytebuild , byteslice >=0.1.3 , bytestring - , containers , json-syntax , neat-interpolation >=0.3.2 , primitive , QuickCheck >=2.14.2 , scientific , scientific-notation >=0.1.1 - , tasty >=1.2.3 && <1.3 - , tasty-golden >=2.0 && <2.4 - , tasty-hunit >=0.10.0.2 && <0.11 - , tasty-quickcheck >=0.10.1.2 && <0.11 - , text >=2.0.2 && <2.1 + , tasty >=1.2.3 + , tasty-golden >=2.0 + , tasty-hunit >=0.10.0.2 + , tasty-quickcheck >=0.10.1.2 + , text >=2.0.2 , text-short - , vector benchmark bench - type: exitcode-stdio-1.0 + import: build-settings + type: exitcode-stdio-1.0 build-depends: , aeson , base @@ -97,15 +102,13 @@ benchmark bench , bytestring , gauge , json-syntax - , neat-interpolation >=0.3.2 + , neat-interpolation >=0.3.2 , primitive - , scientific-notation >=0.1.1 - , text >=2.0.2 && <2.1 + , text >=2.0.2 - ghc-options: -Wall -O2 - default-language: Haskell2010 - hs-source-dirs: bench common - main-is: Main.hs + ghc-options: -O2 + hs-source-dirs: bench common + main-is: Main.hs other-modules: Metrics1024 Twitter100