diff --git a/rollbar-cli/package.yaml b/rollbar-cli/package.yaml index aef5626..c39167d 100644 --- a/rollbar-cli/package.yaml +++ b/rollbar-cli/package.yaml @@ -1,11 +1,11 @@ name: rollbar-cli -version: 1.1.0 +version: 1.1.1 github: "stackbuilders/rollbar-haskell" 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.6.7, GHC ==9.8.4, GHC ==9.10.2, GHC ==9.12.2 extra-source-files: - README.md @@ -22,7 +22,7 @@ ghc-options: - -Wall dependencies: - - base >= 4.13 && < 5 + - base >= 4.18 && < 5 _exe-ghc-options: &exe-ghc-options - -threaded diff --git a/rollbar-cli/rollbar-cli.cabal b/rollbar-cli/rollbar-cli.cabal index 26935a6..e1d8299 100644 --- a/rollbar-cli/rollbar-cli.cabal +++ b/rollbar-cli/rollbar-cli.cabal @@ -1,13 +1,11 @@ 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.36.1. -- -- see: https://github.com/sol/hpack --- --- hash: 99c3aa74e5ef6c059b7ebeb837bca8f09c047df2a00b6856c99a919e4ad041ed name: rollbar-cli -version: 1.1.0 +version: 1.1.1 synopsis: Simple CLI tool to perform commons tasks such as tracking deploys. description: Please see the README on GitHub at @@ -19,9 +17,9 @@ maintainer: David Mazarro 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 build-type: Simple +tested-with: + GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.2, GHC ==9.12.2 extra-source-files: README.md ChangeLog.md @@ -39,7 +37,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 @@ -52,7 +50,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 @@ -66,7 +64,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 diff --git a/rollbar-client/package.yaml b/rollbar-client/package.yaml index 3069acd..cbcb077 100644 --- a/rollbar-client/package.yaml +++ b/rollbar-client/package.yaml @@ -1,11 +1,11 @@ name: rollbar-client -version: 1.1.0 +version: 1.1.1 github: "stackbuilders/rollbar-haskell" 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.6.7, GHC ==9.8.4, GHC ==9.10.2, GHC ==9.12.2 extra-source-files: - README.md @@ -22,7 +22,7 @@ ghc-options: - -Wall dependencies: - - base >= 4.13 && < 5 + - base >= 4.18 && < 5 flags: example: @@ -45,11 +45,13 @@ 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: - Rollbar.Client + generated-other-modules: + - Paths_rollbar_client executables: client-example: @@ -73,6 +75,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 62373e9..e5da9e3 100644 --- a/rollbar-client/rollbar-client.cabal +++ b/rollbar-client/rollbar-client.cabal @@ -1,13 +1,11 @@ -cabal-version: 1.12 +cabal-version: 2.0 --- 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.36.1. -- -- see: https://github.com/sol/hpack --- --- hash: 372dae78f9159532940f589cb4a58365621fc289aae679dfac95e4b6ba477ed7 name: rollbar-client -version: 1.1.0 +version: 1.1.1 synopsis: Core library to communicate with Rollbar API. description: Please see the README on GitHub at @@ -19,9 +17,9 @@ maintainer: David Mazarro 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 build-type: Simple +tested-with: + GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.2, GHC ==9.12.2 extra-source-files: README.md ChangeLog.md @@ -45,19 +43,21 @@ library Rollbar.Client.Ping Rollbar.Client.Settings Paths_rollbar_client + autogen-modules: + Paths_rollbar_client hs-source-dirs: src 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 @@ -66,11 +66,13 @@ executable client-example main-is: Main.hs other-modules: Paths_rollbar_client + autogen-modules: + Paths_rollbar_client hs-source-dirs: 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 @@ -85,6 +87,8 @@ test-suite spec other-modules: Rollbar.ClientSpec Paths_rollbar_client + autogen-modules: + Paths_rollbar_client hs-source-dirs: test ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N @@ -92,12 +96,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 diff --git a/rollbar-client/src/Rollbar/Client/Item.hs b/rollbar-client/src/Rollbar/Client/Item.hs index 120bcc4..dae6c84 100644 --- a/rollbar-client/src/Rollbar/Client/Item.hs +++ b/rollbar-client/src/Rollbar/Client/Item.hs @@ -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 @@ -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 diff --git a/rollbar-client/test/Rollbar/ClientSpec.hs b/rollbar-client/test/Rollbar/ClientSpec.hs index 577b5b0..d45b5ad 100644 --- a/rollbar-client/test/Rollbar/ClientSpec.hs +++ b/rollbar-client/test/Rollbar/ClientSpec.hs @@ -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.1.1" } 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\"" diff --git a/rollbar-wai/package.yaml b/rollbar-wai/package.yaml index efaf38b..88d8dec 100644 --- a/rollbar-wai/package.yaml +++ b/rollbar-wai/package.yaml @@ -1,11 +1,11 @@ name: rollbar-wai -version: 1.1.0 +version: 1.1.1 github: "stackbuilders/rollbar-haskell" 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.6.7, GHC ==9.8.4, GHC ==9.10.2, 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 @@ -24,7 +23,7 @@ ghc-options: - -Wall dependencies: - - base >= 4.13 && < 5 + - base >= 4.18 && < 5 flags: example: @@ -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: diff --git a/rollbar-wai/rollbar-wai.cabal b/rollbar-wai/rollbar-wai.cabal index ef68a64..3e7252a 100644 --- a/rollbar-wai/rollbar-wai.cabal +++ b/rollbar-wai/rollbar-wai.cabal @@ -1,13 +1,11 @@ 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.36.1. -- -- see: https://github.com/sol/hpack --- --- hash: ec084557ab6ac4fa78cda03d7566582d95296b617cdf5f55ec5d6a8ab9bad8c8 name: rollbar-wai -version: 1.1.0 +version: 1.1.1 synopsis: Provides error reporting capabilities to WAI based applications through Rollbar API. description: Please see the README on GitHub at @@ -20,9 +18,9 @@ maintainer: David Mazarro 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 build-type: Simple +tested-with: + GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.2, GHC ==9.12.2 extra-source-files: README.md ChangeLog.md @@ -46,16 +44,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 @@ -66,7 +63,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 @@ -90,7 +87,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 @@ -102,5 +99,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..ff17c88 100644 --- a/rollbar-yesod/package.yaml +++ b/rollbar-yesod/package.yaml @@ -1,11 +1,11 @@ name: rollbar-yesod -version: 1.1.0 +version: 1.1.1 github: "stackbuilders/rollbar-haskell" 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.6.7, GHC ==9.8.4, GHC ==9.10.2, 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 @@ -25,7 +24,7 @@ ghc-options: - -Wall dependencies: - - base >= 4.13 && < 5 + - base >= 4.18 && < 5 flags: example: diff --git a/rollbar-yesod/rollbar-yesod.cabal b/rollbar-yesod/rollbar-yesod.cabal index 692caf5..8649350 100644 --- a/rollbar-yesod/rollbar-yesod.cabal +++ b/rollbar-yesod/rollbar-yesod.cabal @@ -1,13 +1,11 @@ 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.36.1. -- -- see: https://github.com/sol/hpack --- --- hash: 73910af7b84cf6d3325d9af612c5d29651317e6e29596c3660c64a32be67da87 name: rollbar-yesod -version: 1.1.0 +version: 1.1.1 synopsis: Provides error reporting capabilities to Yesod applications through Rollbar API. description: Please see the README on GitHub at @@ -20,9 +18,9 @@ maintainer: David Mazarro 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 build-type: Simple +tested-with: + GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.2, GHC ==9.12.2 extra-source-files: README.md ChangeLog.md @@ -45,7 +43,7 @@ library src ghc-options: -Wall build-depends: - base >=4.13 && <5 + base >=4.18 && <5 , rollbar-client >=1.0 && <2 , rollbar-wai >=1.0 && <2 , unliftio >=0.2 && <1 @@ -61,7 +59,7 @@ executable yesod-example example ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N build-depends: - base >=4.13 && <5 + base >=4.18 && <5 , rollbar-client , rollbar-yesod , warp >=3.3 && <4 @@ -84,12 +82,11 @@ test-suite spec build-tool-depends: hspec-discover:hspec-discover >=2.7 && <3 build-depends: - base >=4.13 && <5 + base >=4.18 && <5 , hspec >=2.7 && <3 , rollbar-client , rollbar-yesod , wai , yesod-core , yesod-test >=1.6 && <2 - , bytestring >=0.10 && <1 default-language: Haskell2010