Skip to content

ci(GHC): Drop GHC version 8 and add 9.6, 9.8, 9.10 as supported #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open
6 changes: 3 additions & 3 deletions rollbar-cli/package.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: rollbar-cli
version: 1.1.0
version: 1.2.0
github: "stackbuilders/rollbar-haskell"
license: MIT
author: "Stack Builders Inc."
maintainer: "David Mazarro <dmunuera@stackbuilders.com>"
copyright: "2020-present Stack Builders Inc."
tested-with: GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7
tested-with: GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1

extra-source-files:
- README.md
Expand All @@ -22,7 +22,7 @@ ghc-options:
- -Wall

dependencies:
- base >= 4.13 && < 5
- base >= 4.18 && < 5

_exe-ghc-options: &exe-ghc-options
- -threaded
Expand Down
15 changes: 7 additions & 8 deletions rollbar-cli/rollbar-cli.cabal
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
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: 06008e94a54478aab8ebf7a602178874866a988ec726e4bf4d2d6da0de509848

name: rollbar-cli
version: 1.1.0
version: 1.2.0
synopsis: Simple CLI tool to perform commons tasks such as tracking deploys.
description: Please see the README on GitHub at
<https://github.com/stackbuilders/rollbar-haskell/tree/master/rollbar-cli>
Expand All @@ -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.6.7, GHC ==9.8.4, GHC ==9.10.1
build-type: Simple
extra-source-files:
README.md
Expand All @@ -39,7 +39,7 @@ library
src
ghc-options: -Wall
build-depends:
base >=4.13 && <5
base >=4.18 && <5
, optparse-applicative >=0.14 && <1
, rollbar-client >=1.0 && <2
default-language: Haskell2010
Expand All @@ -52,7 +52,7 @@ executable rollbar
app
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
build-depends:
base >=4.13 && <5
base >=4.18 && <5
, rollbar-cli
, rollbar-client
default-language: Haskell2010
Expand All @@ -66,7 +66,6 @@ test-suite spec
test
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
build-depends:
base >=4.13 && <5
base >=4.18 && <5
, rollbar-cli
, bytestring >=0.10 && <1
default-language: Haskell2010
9 changes: 5 additions & 4 deletions rollbar-client/package.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: rollbar-client
version: 1.1.0
version: 1.2.0
github: "stackbuilders/rollbar-haskell"
license: MIT
author: "Stack Builders Inc."
maintainer: "David Mazarro <dmunuera@stackbuilders.com>"
copyright: "2020-present Stack Builders Inc."
tested-with: GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7
tested-with: GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1

extra-source-files:
- README.md
Expand All @@ -22,7 +22,7 @@ ghc-options:
- -Wall

dependencies:
- base >= 4.13 && < 5
- base >= 4.18 && < 5

flags:
example:
Expand All @@ -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:
Expand Down Expand Up @@ -73,6 +73,7 @@ tests:
ghc-options: *exe-ghc-options
dependencies:
- aeson
- bytestring >= 0.10 && < 1
- hspec >= 2.7 && < 3
- mtl
- rollbar-client
Expand Down
18 changes: 9 additions & 9 deletions rollbar-client/rollbar-client.cabal
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
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: 51800f31b3c17842ec1abffab29c5966901d356f4a6be199e4851bb70d632431

name: rollbar-client
version: 1.1.0
version: 1.2.0
synopsis: Core library to communicate with Rollbar API.
description: Please see the README on GitHub at
<https://github.com/stackbuilders/rollbar-haskell/tree/master/rollbar-client>
Expand All @@ -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.6.7, GHC ==9.8.4, GHC ==9.10.1
build-type: Simple
extra-source-files:
README.md
Expand Down Expand Up @@ -50,14 +50,14 @@ library
ghc-options: -Wall
build-depends:
aeson >=2.0 && <3
, base >=4.13 && <5
, base >=4.18 && <5
, bytestring >=0.10 && <1
, directory >=1.3 && <2
, exceptions >=0.10 && <1
, 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
Expand All @@ -70,7 +70,7 @@ executable client-example
example
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
build-depends:
base >=4.13 && <5
base >=4.18 && <5
, rollbar-client
, text
default-language: Haskell2010
Expand All @@ -92,12 +92,12 @@ test-suite spec
hspec-discover:hspec-discover >=2.7 && <3
build-depends:
aeson
, base >=4.13 && <5
, base >=4.18 && <5
, bytestring >=0.10 && <1
, hspec >=2.7 && <3
, mtl
, rollbar-client
, text
, unordered-containers
, yaml
, bytestring >=0.10 && <1
default-language: Haskell2010
4 changes: 3 additions & 1 deletion rollbar-client/src/Rollbar/Client/Item.hs
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ import qualified Control.Exception as E
import qualified Data.Aeson.KeyMap as KM
import qualified Data.Aeson.Key as K
import qualified Data.Text as T
import qualified Paths_rollbar_client as Paths

import Control.Monad.IO.Class (MonadIO(..))
import Data.Aeson
import Data.Maybe (catMaybes)
import Data.Monoid (Endo(..))
import Data.Text (Text)
import Data.Version (showVersion)
import Network.HTTP.Req
import Rollbar.Client.Internal
import Rollbar.Client.Settings
Expand Down Expand Up @@ -375,7 +377,7 @@ instance ToJSON Notifier where
defaultNotifier :: Notifier
defaultNotifier = Notifier
{ notifierName = "rollbar-client"
, notifierVersion = "1.1.0"
, notifierVersion = T.pack (showVersion Paths.version)
}

newtype ItemId = ItemId Text
Expand Down
4 changes: 2 additions & 2 deletions rollbar-client/test/Rollbar/ClientSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,12 @@ spec = do
, title = Nothing
, uuid = Just "12345"
, fingerprint = Nothing
, itemNotifier = Notifier "rollbar-client" "1.1.0"
, itemNotifier = Notifier "rollbar-client" "1.2.0"
}
jsonItem = decodeUtf8 $ DBL.toStrict $ encode item

it "omits fields if they are Nothing values" $
T.unpack jsonItem `shouldNotContain` "\"server\""

it "includes fields if they are Just values" $
it "includes fields if they are Just values" $
T.unpack jsonItem `shouldContain` "\"platform\":\"haskell\""
11 changes: 5 additions & 6 deletions rollbar-wai/package.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: rollbar-wai
version: 1.1.0
version: 1.2.0
github: "stackbuilders/rollbar-haskell"
license: MIT
author: "Stack Builders Inc."
maintainer: "David Mazarro <dmunuera@stackbuilders.com>"
copyright: "2020-present Stack Builders Inc."
tested-with: GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7
tested-with: GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1

extra-source-files:
- README.md
Expand All @@ -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
<https://github.com/stackbuilders/rollbar-haskell/tree/master/rollbar-wai>
Expand All @@ -24,7 +23,7 @@ ghc-options:
- -Wall

dependencies:
- base >= 4.13 && < 5
- base >= 4.18 && < 5

flags:
example:
Expand All @@ -45,10 +44,10 @@ 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
- wai-extra >=3.0 && < 4

executables:
wai-example:
Expand Down
20 changes: 9 additions & 11 deletions rollbar-wai/rollbar-wai.cabal
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
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: 9c8edccb3292a596219436cab59ec7dc0b0ed6ca8932667de57a87824d4311a8

name: rollbar-wai
version: 1.1.0
version: 1.2.0
synopsis: Provides error reporting capabilities to WAI based applications through Rollbar API.

description: Please see the README on GitHub at
Expand All @@ -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.6.7, GHC ==9.8.4, GHC ==9.10.1
build-type: Simple
extra-source-files:
README.md
Expand All @@ -46,16 +46,15 @@ library
ghc-options: -Wall
build-depends:
aeson >=2.0 && <3
, base >=4.13 && <5
, base >=4.18 && <5
, bytestring >=0.10 && <1
, 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.0 && < 3.1.17
-- TODO: update breaks yesod-core, see https://github.com/yesodweb/yesod/issues/1854
, wai-extra >=3.0 && <4
default-language: Haskell2010

executable wai-example
Expand All @@ -66,7 +65,7 @@ executable wai-example
example
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
build-depends:
base >=4.13 && <5
base >=4.18 && <5
, rollbar-client
, rollbar-wai
, wai
Expand All @@ -90,7 +89,7 @@ test-suite spec
hspec-discover:hspec-discover >=2.7 && <3
build-depends:
aeson
, base >=4.13 && <5
, base >=4.18 && <5
, hspec >=2.7 && <3
, http-types
, mtl >=2.2 && <3
Expand All @@ -102,5 +101,4 @@ test-suite spec
, unordered-containers
, wai
, warp >=3.3 && <4
, bytestring >=0.10 && <1
default-language: Haskell2010
7 changes: 3 additions & 4 deletions rollbar-yesod/package.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: rollbar-yesod
version: 1.1.0
version: 1.2.0
github: "stackbuilders/rollbar-haskell"
license: MIT
author: "Stack Builders Inc."
maintainer: "David Mazarro <dmunuera@stackbuilders.com>"
copyright: "2020-present Stack Builders Inc."
tested-with: GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7
tested-with: GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.1

extra-source-files:
- README.md
Expand All @@ -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
<https://github.com/stackbuilders/rollbar-haskell/tree/master/rollbar-yesod>
Expand All @@ -25,7 +24,7 @@ ghc-options:
- -Wall

dependencies:
- base >= 4.13 && < 5
- base >= 4.18 && < 5

flags:
example:
Expand Down
Loading