From 346d03655ec3622125c895f4feeb2a439353099d Mon Sep 17 00:00:00 2001 From: Davidnbr Date: Thu, 17 Apr 2025 14:18:08 -0500 Subject: [PATCH 1/7] ci(GHC): Drop GHC version 8 and add 9.6, 9.8, 9.10, 9.12 as supported --- rollbar-client/package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollbar-client/package.yaml b/rollbar-client/package.yaml index 3069acd..d4945eb 100644 --- a/rollbar-client/package.yaml +++ b/rollbar-client/package.yaml @@ -5,7 +5,7 @@ license: MIT author: "Stack Builders Inc." maintainer: "David Mazarro " copyright: "2020-present Stack Builders Inc." -tested-with: GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7 +tested-with: GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 extra-source-files: - README.md From 76959ae088235d4fead36e1cae465d706282cedd Mon Sep 17 00:00:00 2001 From: Davidnbr Date: Thu, 17 Apr 2025 15:35:53 -0500 Subject: [PATCH 2/7] fix: hpack build --- rollbar-cli/package.yaml | 2 +- rollbar-cli/rollbar-cli.cabal | 7 +++---- rollbar-client/rollbar-client.cabal | 7 +++---- rollbar-wai/package.yaml | 5 ++--- rollbar-wai/rollbar-wai.cabal | 10 ++++------ rollbar-yesod/package.yaml | 3 +-- rollbar-yesod/rollbar-yesod.cabal | 7 +++---- 7 files changed, 17 insertions(+), 24 deletions(-) diff --git a/rollbar-cli/package.yaml b/rollbar-cli/package.yaml index aef5626..9a9ef30 100644 --- a/rollbar-cli/package.yaml +++ b/rollbar-cli/package.yaml @@ -5,7 +5,7 @@ license: MIT author: "Stack Builders Inc." maintainer: "David Mazarro " copyright: "2020-present Stack Builders Inc." -tested-with: GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7 +tested-with: GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 extra-source-files: - README.md diff --git a/rollbar-cli/rollbar-cli.cabal b/rollbar-cli/rollbar-cli.cabal index 26935a6..6f20bd3 100644 --- a/rollbar-cli/rollbar-cli.cabal +++ b/rollbar-cli/rollbar-cli.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack -- --- hash: 99c3aa74e5ef6c059b7ebeb837bca8f09c047df2a00b6856c99a919e4ad041ed +-- hash: a83fc1986401d60e95b403c89a44ae9b8e952aa3427da2ef9c890fc974903626 name: rollbar-cli version: 1.1.0 @@ -20,7 +20,7 @@ copyright: 2020-present Stack Builders Inc. license: MIT license-file: LICENSE tested-with: - GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7 + GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 build-type: Simple extra-source-files: README.md @@ -68,5 +68,4 @@ test-suite spec build-depends: base >=4.13 && <5 , rollbar-cli - , bytestring >=0.10 && <1 default-language: Haskell2010 diff --git a/rollbar-client/rollbar-client.cabal b/rollbar-client/rollbar-client.cabal index 62373e9..54adefd 100644 --- a/rollbar-client/rollbar-client.cabal +++ b/rollbar-client/rollbar-client.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack -- --- hash: 372dae78f9159532940f589cb4a58365621fc289aae679dfac95e4b6ba477ed7 +-- hash: a23531aa21650ed7c03cfe098d4d1162b8edbaa539991ff1e34b828954bb6c8d name: rollbar-client version: 1.1.0 @@ -20,7 +20,7 @@ copyright: 2020-present Stack Builders Inc. license: MIT license-file: LICENSE tested-with: - GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7 + GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 build-type: Simple extra-source-files: README.md @@ -99,5 +99,4 @@ test-suite spec , text , unordered-containers , yaml - , bytestring >=0.10 && <1 default-language: Haskell2010 diff --git a/rollbar-wai/package.yaml b/rollbar-wai/package.yaml index efaf38b..34f1211 100644 --- a/rollbar-wai/package.yaml +++ b/rollbar-wai/package.yaml @@ -5,7 +5,7 @@ license: MIT author: "Stack Builders Inc." maintainer: "David Mazarro " copyright: "2020-present Stack Builders Inc." -tested-with: GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7 +tested-with: GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 extra-source-files: - README.md @@ -15,7 +15,6 @@ synopsis: > Provides error reporting capabilities to WAI based applications through Rollbar API. category: Network - description: | Please see the README on GitHub at @@ -48,7 +47,7 @@ library: - text >= 1.2 && < 2.1 - unordered-containers >= 0.2 && < 1 - wai >= 3.2 && < 4 - - wai-extra < 3.1.17 # TODO: update breaks yesod-core, see https://github.com/yesodweb/yesod/issues/1854 + - wai-extra < 3.1.17 # TODO: update breaks yesod-core, see https://github.com/yesodweb/yesod/issues/1854 executables: wai-example: diff --git a/rollbar-wai/rollbar-wai.cabal b/rollbar-wai/rollbar-wai.cabal index ef68a64..6e647ec 100644 --- a/rollbar-wai/rollbar-wai.cabal +++ b/rollbar-wai/rollbar-wai.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack -- --- hash: ec084557ab6ac4fa78cda03d7566582d95296b617cdf5f55ec5d6a8ab9bad8c8 +-- hash: b86fed99ff701f3fcad9f738afc390815821aa0fb67532db9332583377e86282 name: rollbar-wai version: 1.1.0 @@ -21,7 +21,7 @@ copyright: 2020-present Stack Builders Inc. license: MIT license-file: LICENSE tested-with: - GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7 + GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 build-type: Simple extra-source-files: README.md @@ -54,8 +54,7 @@ library , text >=1.2 && <2.1 , unordered-containers >=0.2 && <1 , wai >=3.2 && <4 - , wai-extra >=3.0 && < 3.1.17 - -- TODO: update breaks yesod-core, see https://github.com/yesodweb/yesod/issues/1854 + , wai-extra <3.1.17 default-language: Haskell2010 executable wai-example @@ -102,5 +101,4 @@ test-suite spec , unordered-containers , wai , warp >=3.3 && <4 - , bytestring >=0.10 && <1 default-language: Haskell2010 diff --git a/rollbar-yesod/package.yaml b/rollbar-yesod/package.yaml index a965e6d..14f9876 100644 --- a/rollbar-yesod/package.yaml +++ b/rollbar-yesod/package.yaml @@ -5,7 +5,7 @@ license: MIT author: "Stack Builders Inc." maintainer: "David Mazarro " copyright: "2020-present Stack Builders Inc." -tested-with: GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7 +tested-with: GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 extra-source-files: - README.md @@ -16,7 +16,6 @@ synopsis: > Provides error reporting capabilities to Yesod applications through Rollbar API. category: Network - description: | Please see the README on GitHub at diff --git a/rollbar-yesod/rollbar-yesod.cabal b/rollbar-yesod/rollbar-yesod.cabal index 692caf5..45c6f1b 100644 --- a/rollbar-yesod/rollbar-yesod.cabal +++ b/rollbar-yesod/rollbar-yesod.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.38.1. -- -- see: https://github.com/sol/hpack -- --- hash: 73910af7b84cf6d3325d9af612c5d29651317e6e29596c3660c64a32be67da87 +-- hash: c61923a1f84423ec023148f3e9d0bc0c60770d5c5328de3a12ee3864b1b00f3a name: rollbar-yesod version: 1.1.0 @@ -21,7 +21,7 @@ copyright: 2020-present Stack Builders Inc. license: MIT license-file: LICENSE tested-with: - GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7 + GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 build-type: Simple extra-source-files: README.md @@ -91,5 +91,4 @@ test-suite spec , wai , yesod-core , yesod-test >=1.6 && <2 - , bytestring >=0.10 && <1 default-language: Haskell2010 From 3b50a2096da0198725dafb761d1e81744b2fc612 Mon Sep 17 00:00:00 2001 From: Davidnbr Date: Thu, 17 Apr 2025 15:58:55 -0500 Subject: [PATCH 3/7] fix(text): bump dependency constraint to fix compiling error --- rollbar-client/package.yaml | 2 +- rollbar-wai/package.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rollbar-client/package.yaml b/rollbar-client/package.yaml index d4945eb..ca67cf2 100644 --- a/rollbar-client/package.yaml +++ b/rollbar-client/package.yaml @@ -45,7 +45,7 @@ library: - mtl >= 2.2 && < 3 - process >= 1.6 && < 2 - req >= 2.1 && < 4 - - text >= 1.2 && < 2.1 + - text >= 1.2 && < 2.2 - unordered-containers >= 0.2 && < 1 - yaml >= 0.11 && < 1 exposed-modules: diff --git a/rollbar-wai/package.yaml b/rollbar-wai/package.yaml index 34f1211..04ceedd 100644 --- a/rollbar-wai/package.yaml +++ b/rollbar-wai/package.yaml @@ -44,7 +44,7 @@ library: - case-insensitive >= 1.2 && < 2 - http-types >= 0.12 && < 1 - rollbar-client >= 1.0 && < 2 - - text >= 1.2 && < 2.1 + - text >= 1.2 && < 2.2 - unordered-containers >= 0.2 && < 1 - wai >= 3.2 && < 4 - wai-extra < 3.1.17 # TODO: update breaks yesod-core, see https://github.com/yesodweb/yesod/issues/1854 From 17f4feb4a7f0f40954c70f14ea410fa51626f5c1 Mon Sep 17 00:00:00 2001 From: Davidnbr Date: Thu, 24 Apr 2025 14:38:44 -0500 Subject: [PATCH 4/7] bump: include only 9.6, 9.8 and 9.10 GHC versions --- rollbar-cli/package.yaml | 2 +- rollbar-cli/rollbar-cli.cabal | 4 ++-- rollbar-client/package.yaml | 2 +- rollbar-client/rollbar-client.cabal | 6 +++--- rollbar-wai/package.yaml | 2 +- rollbar-wai/rollbar-wai.cabal | 6 +++--- rollbar-yesod/package.yaml | 2 +- rollbar-yesod/rollbar-yesod.cabal | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rollbar-cli/package.yaml b/rollbar-cli/package.yaml index 9a9ef30..0f57019 100644 --- a/rollbar-cli/package.yaml +++ b/rollbar-cli/package.yaml @@ -5,7 +5,7 @@ license: MIT author: "Stack Builders Inc." maintainer: "David Mazarro " copyright: "2020-present Stack Builders Inc." -tested-with: GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 +tested-with: GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1 extra-source-files: - README.md diff --git a/rollbar-cli/rollbar-cli.cabal b/rollbar-cli/rollbar-cli.cabal index 6f20bd3..443fcd3 100644 --- a/rollbar-cli/rollbar-cli.cabal +++ b/rollbar-cli/rollbar-cli.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: a83fc1986401d60e95b403c89a44ae9b8e952aa3427da2ef9c890fc974903626 +-- hash: 8f6bd66ca2b431b7af154b0cbaabb8381a717534c43db1561c9d4ebc4486880d name: rollbar-cli version: 1.1.0 @@ -20,7 +20,7 @@ copyright: 2020-present Stack Builders Inc. license: MIT license-file: LICENSE tested-with: - GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 + GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1 build-type: Simple extra-source-files: README.md diff --git a/rollbar-client/package.yaml b/rollbar-client/package.yaml index ca67cf2..8e82ddd 100644 --- a/rollbar-client/package.yaml +++ b/rollbar-client/package.yaml @@ -5,7 +5,7 @@ license: MIT author: "Stack Builders Inc." maintainer: "David Mazarro " copyright: "2020-present Stack Builders Inc." -tested-with: GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 +tested-with: GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1 extra-source-files: - README.md diff --git a/rollbar-client/rollbar-client.cabal b/rollbar-client/rollbar-client.cabal index 54adefd..b2f7709 100644 --- a/rollbar-client/rollbar-client.cabal +++ b/rollbar-client/rollbar-client.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: a23531aa21650ed7c03cfe098d4d1162b8edbaa539991ff1e34b828954bb6c8d +-- hash: 17dd5f3cfeecb37dab18d19a89e879082cb87d450484d6442d5d29c3c07f6ac6 name: rollbar-client version: 1.1.0 @@ -20,7 +20,7 @@ copyright: 2020-present Stack Builders Inc. license: MIT license-file: LICENSE tested-with: - GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 + GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1 build-type: Simple extra-source-files: README.md @@ -57,7 +57,7 @@ library , mtl >=2.2 && <3 , process >=1.6 && <2 , req >=2.1 && <4 - , text >=1.2 && <2.1 + , text >=1.2 && <2.2 , unordered-containers >=0.2 && <1 , yaml >=0.11 && <1 default-language: Haskell2010 diff --git a/rollbar-wai/package.yaml b/rollbar-wai/package.yaml index 04ceedd..0e5ac00 100644 --- a/rollbar-wai/package.yaml +++ b/rollbar-wai/package.yaml @@ -5,7 +5,7 @@ license: MIT author: "Stack Builders Inc." maintainer: "David Mazarro " copyright: "2020-present Stack Builders Inc." -tested-with: GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 +tested-with: GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1 extra-source-files: - README.md diff --git a/rollbar-wai/rollbar-wai.cabal b/rollbar-wai/rollbar-wai.cabal index 6e647ec..a1f949d 100644 --- a/rollbar-wai/rollbar-wai.cabal +++ b/rollbar-wai/rollbar-wai.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: b86fed99ff701f3fcad9f738afc390815821aa0fb67532db9332583377e86282 +-- hash: 4419308d935ac2c2c904f04bc2c6e6d009dada286117ef9bb4cc4305f6aea11f name: rollbar-wai version: 1.1.0 @@ -21,7 +21,7 @@ copyright: 2020-present Stack Builders Inc. license: MIT license-file: LICENSE tested-with: - GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 + GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1 build-type: Simple extra-source-files: README.md @@ -51,7 +51,7 @@ library , case-insensitive >=1.2 && <2 , http-types >=0.12 && <1 , rollbar-client >=1.0 && <2 - , text >=1.2 && <2.1 + , text >=1.2 && <2.2 , unordered-containers >=0.2 && <1 , wai >=3.2 && <4 , wai-extra <3.1.17 diff --git a/rollbar-yesod/package.yaml b/rollbar-yesod/package.yaml index 14f9876..50262ce 100644 --- a/rollbar-yesod/package.yaml +++ b/rollbar-yesod/package.yaml @@ -5,7 +5,7 @@ license: MIT author: "Stack Builders Inc." maintainer: "David Mazarro " copyright: "2020-present Stack Builders Inc." -tested-with: GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 +tested-with: GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1 extra-source-files: - README.md diff --git a/rollbar-yesod/rollbar-yesod.cabal b/rollbar-yesod/rollbar-yesod.cabal index 45c6f1b..ed52baf 100644 --- a/rollbar-yesod/rollbar-yesod.cabal +++ b/rollbar-yesod/rollbar-yesod.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: c61923a1f84423ec023148f3e9d0bc0c60770d5c5328de3a12ee3864b1b00f3a +-- hash: 2b59759f80250c1aa7d3765ef87fdd788e005eae91db24bd89f4c820ed3988c2 name: rollbar-yesod version: 1.1.0 @@ -21,7 +21,7 @@ copyright: 2020-present Stack Builders Inc. license: MIT license-file: LICENSE tested-with: - GHC ==9.4.7, GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1, GHC ==9.12.2 + GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1 build-type: Simple extra-source-files: README.md From ecb7ec1f62768a6765ae55596fbf0a1d32d736e6 Mon Sep 17 00:00:00 2001 From: Davidnbr Date: Thu, 24 Apr 2025 15:09:01 -0500 Subject: [PATCH 5/7] fix: add undeclared bytestring dependency --- rollbar-client/package.yaml | 1 + rollbar-client/rollbar-client.cabal | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rollbar-client/package.yaml b/rollbar-client/package.yaml index 8e82ddd..818f3fd 100644 --- a/rollbar-client/package.yaml +++ b/rollbar-client/package.yaml @@ -73,6 +73,7 @@ tests: ghc-options: *exe-ghc-options dependencies: - aeson + - bytestring >= 0.10 && < 1 - hspec >= 2.7 && < 3 - mtl - rollbar-client diff --git a/rollbar-client/rollbar-client.cabal b/rollbar-client/rollbar-client.cabal index b2f7709..872fb79 100644 --- a/rollbar-client/rollbar-client.cabal +++ b/rollbar-client/rollbar-client.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 17dd5f3cfeecb37dab18d19a89e879082cb87d450484d6442d5d29c3c07f6ac6 +-- hash: 787806f62c45b9f62f8493c73a0fefe94c7f3f3e096d3f599c6b5e601b184ca1 name: rollbar-client version: 1.1.0 @@ -93,6 +93,7 @@ test-suite spec build-depends: aeson , base >=4.13 && <5 + , bytestring >=0.10 && <1 , hspec >=2.7 && <3 , mtl , rollbar-client From 24e6ad5d37be4e2fe9a3d7edb849499ce9210486 Mon Sep 17 00:00:00 2001 From: Davidnbr Date: Thu, 24 Apr 2025 16:21:50 -0500 Subject: [PATCH 6/7] bump: delete upper-bound constraint for wai-extra dependency --- rollbar-wai/package.yaml | 2 +- rollbar-wai/rollbar-wai.cabal | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rollbar-wai/package.yaml b/rollbar-wai/package.yaml index 0e5ac00..f356511 100644 --- a/rollbar-wai/package.yaml +++ b/rollbar-wai/package.yaml @@ -47,7 +47,7 @@ library: - text >= 1.2 && < 2.2 - unordered-containers >= 0.2 && < 1 - wai >= 3.2 && < 4 - - wai-extra < 3.1.17 # TODO: update breaks yesod-core, see https://github.com/yesodweb/yesod/issues/1854 + - wai-extra >=3.0 # TODO: update breaks yesod-core, see https://github.com/yesodweb/yesod/issues/1854 executables: wai-example: diff --git a/rollbar-wai/rollbar-wai.cabal b/rollbar-wai/rollbar-wai.cabal index a1f949d..fde47a0 100644 --- a/rollbar-wai/rollbar-wai.cabal +++ b/rollbar-wai/rollbar-wai.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 4419308d935ac2c2c904f04bc2c6e6d009dada286117ef9bb4cc4305f6aea11f +-- hash: cf2227064192dc4c6cb8aa19776ed2e3112241ef9c24c3ede8f990bea30bbc7d name: rollbar-wai version: 1.1.0 @@ -54,7 +54,7 @@ library , text >=1.2 && <2.2 , unordered-containers >=0.2 && <1 , wai >=3.2 && <4 - , wai-extra <3.1.17 + , wai-extra >=3.0 default-language: Haskell2010 executable wai-example From ee38646d45e66c51a75253621ae2c8cdff292b61 Mon Sep 17 00:00:00 2001 From: Davidnbr Date: Thu, 24 Apr 2025 16:51:31 -0500 Subject: [PATCH 7/7] fix: add upper-bound constraint for mayor version in wai-extra dependency --- rollbar-wai/package.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollbar-wai/package.yaml b/rollbar-wai/package.yaml index f356511..6388393 100644 --- a/rollbar-wai/package.yaml +++ b/rollbar-wai/package.yaml @@ -47,7 +47,7 @@ library: - text >= 1.2 && < 2.2 - unordered-containers >= 0.2 && < 1 - wai >= 3.2 && < 4 - - wai-extra >=3.0 # TODO: update breaks yesod-core, see https://github.com/yesodweb/yesod/issues/1854 + - wai-extra >=3.0 && < 4 executables: wai-example: