Skip to content

Commit 591c1d5

Browse files
authored
ci(GHC): Drop GHC version 8 and add 9.6, 9.8, 9.10 as supported (#89)
* (tag: v1.1.1) chore: add Paths_rollbar_client as autogen-module * fix: change test spec from notifier to 1.1.1 version * chore: generate .cabal files with 1.1.1 and GHC 12 * fix: bump minor version as PVP versioning (minor release from 1.1.0 to 1.1.1) bump: add GHC version 9.12.2 as supported * fix: convert string to text on version retrieval * feat(version): create dynamic version retrieval for rollbar-client * fix: bump version on test for itemNotifier attributes * (tag: v1.2.0) bump: rollbar packages version to 1.2.0 * bump: version of base from 4.13 to 4.18 * fix: add upper-bound constraint for mayor version in wai-extra dependency * bump: delete upper-bound constraint for wai-extra dependency * fix: add undeclared bytestring dependency * bump: include only 9.6, 9.8 and 9.10 GHC versions * fix(text): bump dependency constraint to fix compiling error * fix: hpack build
1 parent d44b8bc commit 591c1d5

File tree

10 files changed

+62
-65
lines changed

10 files changed

+62
-65
lines changed

rollbar-cli/package.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: rollbar-cli
2-
version: 1.1.0
2+
version: 1.1.1
33
github: "stackbuilders/rollbar-haskell"
44
license: MIT
55
author: "Stack Builders Inc."
66
maintainer: "David Mazarro <[email protected]>"
77
copyright: "2020-present Stack Builders Inc."
8-
tested-with: GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7
8+
tested-with: GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.2, GHC ==9.12.2
99

1010
extra-source-files:
1111
- README.md
@@ -22,7 +22,7 @@ ghc-options:
2222
- -Wall
2323

2424
dependencies:
25-
- base >= 4.13 && < 5
25+
- base >= 4.18 && < 5
2626

2727
_exe-ghc-options: &exe-ghc-options
2828
- -threaded

rollbar-cli/rollbar-cli.cabal

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.36.0.
3+
-- This file has been generated from package.yaml by hpack version 0.36.1.
44
--
55
-- see: https://github.com/sol/hpack
6-
--
7-
-- hash: 99c3aa74e5ef6c059b7ebeb837bca8f09c047df2a00b6856c99a919e4ad041ed
86

97
name: rollbar-cli
10-
version: 1.1.0
8+
version: 1.1.1
119
synopsis: Simple CLI tool to perform commons tasks such as tracking deploys.
1210
description: Please see the README on GitHub at
1311
<https://github.com/stackbuilders/rollbar-haskell/tree/master/rollbar-cli>
@@ -19,9 +17,9 @@ maintainer: David Mazarro <[email protected]>
1917
copyright: 2020-present Stack Builders Inc.
2018
license: MIT
2119
license-file: LICENSE
22-
tested-with:
23-
GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7
2420
build-type: Simple
21+
tested-with:
22+
GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.2, GHC ==9.12.2
2523
extra-source-files:
2624
README.md
2725
ChangeLog.md
@@ -39,7 +37,7 @@ library
3937
src
4038
ghc-options: -Wall
4139
build-depends:
42-
base >=4.13 && <5
40+
base >=4.18 && <5
4341
, optparse-applicative >=0.14 && <1
4442
, rollbar-client >=1.0 && <2
4543
default-language: Haskell2010
@@ -52,7 +50,7 @@ executable rollbar
5250
app
5351
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
5452
build-depends:
55-
base >=4.13 && <5
53+
base >=4.18 && <5
5654
, rollbar-cli
5755
, rollbar-client
5856
default-language: Haskell2010
@@ -66,7 +64,6 @@ test-suite spec
6664
test
6765
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
6866
build-depends:
69-
base >=4.13 && <5
67+
base >=4.18 && <5
7068
, rollbar-cli
71-
, bytestring >=0.10 && <1
7269
default-language: Haskell2010

rollbar-client/package.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: rollbar-client
2-
version: 1.1.0
2+
version: 1.1.1
33
github: "stackbuilders/rollbar-haskell"
44
license: MIT
55
author: "Stack Builders Inc."
66
maintainer: "David Mazarro <[email protected]>"
77
copyright: "2020-present Stack Builders Inc."
8-
tested-with: GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7
8+
tested-with: GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.2, GHC ==9.12.2
99

1010
extra-source-files:
1111
- README.md
@@ -22,7 +22,7 @@ ghc-options:
2222
- -Wall
2323

2424
dependencies:
25-
- base >= 4.13 && < 5
25+
- base >= 4.18 && < 5
2626

2727
flags:
2828
example:
@@ -45,11 +45,13 @@ library:
4545
- mtl >= 2.2 && < 3
4646
- process >= 1.6 && < 2
4747
- req >= 2.1 && < 4
48-
- text >= 1.2 && < 2.1
48+
- text >= 1.2 && < 2.2
4949
- unordered-containers >= 0.2 && < 1
5050
- yaml >= 0.11 && < 1
5151
exposed-modules:
5252
- Rollbar.Client
53+
generated-other-modules:
54+
- Paths_rollbar_client
5355

5456
executables:
5557
client-example:
@@ -73,6 +75,7 @@ tests:
7375
ghc-options: *exe-ghc-options
7476
dependencies:
7577
- aeson
78+
- bytestring >= 0.10 && < 1
7679
- hspec >= 2.7 && < 3
7780
- mtl
7881
- rollbar-client

rollbar-client/rollbar-client.cabal

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
cabal-version: 1.12
1+
cabal-version: 2.0
22

3-
-- This file has been generated from package.yaml by hpack version 0.36.0.
3+
-- This file has been generated from package.yaml by hpack version 0.36.1.
44
--
55
-- see: https://github.com/sol/hpack
6-
--
7-
-- hash: 372dae78f9159532940f589cb4a58365621fc289aae679dfac95e4b6ba477ed7
86

97
name: rollbar-client
10-
version: 1.1.0
8+
version: 1.1.1
119
synopsis: Core library to communicate with Rollbar API.
1210
description: Please see the README on GitHub at
1311
<https://github.com/stackbuilders/rollbar-haskell/tree/master/rollbar-client>
@@ -19,9 +17,9 @@ maintainer: David Mazarro <[email protected]>
1917
copyright: 2020-present Stack Builders Inc.
2018
license: MIT
2119
license-file: LICENSE
22-
tested-with:
23-
GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7
2420
build-type: Simple
21+
tested-with:
22+
GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.2, GHC ==9.12.2
2523
extra-source-files:
2624
README.md
2725
ChangeLog.md
@@ -45,19 +43,21 @@ library
4543
Rollbar.Client.Ping
4644
Rollbar.Client.Settings
4745
Paths_rollbar_client
46+
autogen-modules:
47+
Paths_rollbar_client
4848
hs-source-dirs:
4949
src
5050
ghc-options: -Wall
5151
build-depends:
5252
aeson >=2.0 && <3
53-
, base >=4.13 && <5
53+
, base >=4.18 && <5
5454
, bytestring >=0.10 && <1
5555
, directory >=1.3 && <2
5656
, exceptions >=0.10 && <1
5757
, mtl >=2.2 && <3
5858
, process >=1.6 && <2
5959
, req >=2.1 && <4
60-
, text >=1.2 && <2.1
60+
, text >=1.2 && <2.2
6161
, unordered-containers >=0.2 && <1
6262
, yaml >=0.11 && <1
6363
default-language: Haskell2010
@@ -66,11 +66,13 @@ executable client-example
6666
main-is: Main.hs
6767
other-modules:
6868
Paths_rollbar_client
69+
autogen-modules:
70+
Paths_rollbar_client
6971
hs-source-dirs:
7072
example
7173
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
7274
build-depends:
73-
base >=4.13 && <5
75+
base >=4.18 && <5
7476
, rollbar-client
7577
, text
7678
default-language: Haskell2010
@@ -85,19 +87,21 @@ test-suite spec
8587
other-modules:
8688
Rollbar.ClientSpec
8789
Paths_rollbar_client
90+
autogen-modules:
91+
Paths_rollbar_client
8892
hs-source-dirs:
8993
test
9094
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
9195
build-tool-depends:
9296
hspec-discover:hspec-discover >=2.7 && <3
9397
build-depends:
9498
aeson
95-
, base >=4.13 && <5
99+
, base >=4.18 && <5
100+
, bytestring >=0.10 && <1
96101
, hspec >=2.7 && <3
97102
, mtl
98103
, rollbar-client
99104
, text
100105
, unordered-containers
101106
, yaml
102-
, bytestring >=0.10 && <1
103107
default-language: Haskell2010

rollbar-client/src/Rollbar/Client/Item.hs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@ import qualified Control.Exception as E
3131
import qualified Data.Aeson.KeyMap as KM
3232
import qualified Data.Aeson.Key as K
3333
import qualified Data.Text as T
34+
import qualified Paths_rollbar_client as Paths
3435

3536
import Control.Monad.IO.Class (MonadIO(..))
3637
import Data.Aeson
3738
import Data.Maybe (catMaybes)
3839
import Data.Monoid (Endo(..))
3940
import Data.Text (Text)
41+
import Data.Version (showVersion)
4042
import Network.HTTP.Req
4143
import Rollbar.Client.Internal
4244
import Rollbar.Client.Settings
@@ -375,7 +377,7 @@ instance ToJSON Notifier where
375377
defaultNotifier :: Notifier
376378
defaultNotifier = Notifier
377379
{ notifierName = "rollbar-client"
378-
, notifierVersion = "1.1.0"
380+
, notifierVersion = T.pack (showVersion Paths.version)
379381
}
380382

381383
newtype ItemId = ItemId Text

rollbar-client/test/Rollbar/ClientSpec.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,12 @@ spec = do
161161
, title = Nothing
162162
, uuid = Just "12345"
163163
, fingerprint = Nothing
164-
, itemNotifier = Notifier "rollbar-client" "1.1.0"
164+
, itemNotifier = Notifier "rollbar-client" "1.1.1"
165165
}
166166
jsonItem = decodeUtf8 $ DBL.toStrict $ encode item
167167

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

171-
it "includes fields if they are Just values" $
171+
it "includes fields if they are Just values" $
172172
T.unpack jsonItem `shouldContain` "\"platform\":\"haskell\""

rollbar-wai/package.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: rollbar-wai
2-
version: 1.1.0
2+
version: 1.1.1
33
github: "stackbuilders/rollbar-haskell"
44
license: MIT
55
author: "Stack Builders Inc."
66
maintainer: "David Mazarro <[email protected]>"
77
copyright: "2020-present Stack Builders Inc."
8-
tested-with: GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7
8+
tested-with: GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.2, GHC ==9.12.2
99

1010
extra-source-files:
1111
- README.md
@@ -15,7 +15,6 @@ synopsis: >
1515
Provides error reporting capabilities to WAI based applications through
1616
Rollbar API.
1717
category: Network
18-
1918
description: |
2019
Please see the README on GitHub at
2120
<https://github.com/stackbuilders/rollbar-haskell/tree/master/rollbar-wai>
@@ -24,7 +23,7 @@ ghc-options:
2423
- -Wall
2524

2625
dependencies:
27-
- base >= 4.13 && < 5
26+
- base >= 4.18 && < 5
2827

2928
flags:
3029
example:
@@ -45,10 +44,10 @@ library:
4544
- case-insensitive >= 1.2 && < 2
4645
- http-types >= 0.12 && < 1
4746
- rollbar-client >= 1.0 && < 2
48-
- text >= 1.2 && < 2.1
47+
- text >= 1.2 && < 2.2
4948
- unordered-containers >= 0.2 && < 1
5049
- wai >= 3.2 && < 4
51-
- wai-extra < 3.1.17 # TODO: update breaks yesod-core, see https://github.com/yesodweb/yesod/issues/1854
50+
- wai-extra >=3.0 && < 4
5251

5352
executables:
5453
wai-example:

rollbar-wai/rollbar-wai.cabal

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
cabal-version: 1.12
22

3-
-- This file has been generated from package.yaml by hpack version 0.36.0.
3+
-- This file has been generated from package.yaml by hpack version 0.36.1.
44
--
55
-- see: https://github.com/sol/hpack
6-
--
7-
-- hash: ec084557ab6ac4fa78cda03d7566582d95296b617cdf5f55ec5d6a8ab9bad8c8
86

97
name: rollbar-wai
10-
version: 1.1.0
8+
version: 1.1.1
119
synopsis: Provides error reporting capabilities to WAI based applications through Rollbar API.
1210

1311
description: Please see the README on GitHub at
@@ -20,9 +18,9 @@ maintainer: David Mazarro <[email protected]>
2018
copyright: 2020-present Stack Builders Inc.
2119
license: MIT
2220
license-file: LICENSE
23-
tested-with:
24-
GHC ==8.8.4, GHC ==8.10.7, GHC ==9.4.7
2521
build-type: Simple
22+
tested-with:
23+
GHC ==9.6.7, GHC ==9.8.4, GHC ==9.10.2, GHC ==9.12.2
2624
extra-source-files:
2725
README.md
2826
ChangeLog.md
@@ -46,16 +44,15 @@ library
4644
ghc-options: -Wall
4745
build-depends:
4846
aeson >=2.0 && <3
49-
, base >=4.13 && <5
47+
, base >=4.18 && <5
5048
, bytestring >=0.10 && <1
5149
, case-insensitive >=1.2 && <2
5250
, http-types >=0.12 && <1
5351
, rollbar-client >=1.0 && <2
54-
, text >=1.2 && <2.1
52+
, text >=1.2 && <2.2
5553
, unordered-containers >=0.2 && <1
5654
, wai >=3.2 && <4
57-
, wai-extra >=3.0 && < 3.1.17
58-
-- TODO: update breaks yesod-core, see https://github.com/yesodweb/yesod/issues/1854
55+
, wai-extra >=3.0 && <4
5956
default-language: Haskell2010
6057

6158
executable wai-example
@@ -66,7 +63,7 @@ executable wai-example
6663
example
6764
ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
6865
build-depends:
69-
base >=4.13 && <5
66+
base >=4.18 && <5
7067
, rollbar-client
7168
, rollbar-wai
7269
, wai
@@ -90,7 +87,7 @@ test-suite spec
9087
hspec-discover:hspec-discover >=2.7 && <3
9188
build-depends:
9289
aeson
93-
, base >=4.13 && <5
90+
, base >=4.18 && <5
9491
, hspec >=2.7 && <3
9592
, http-types
9693
, mtl >=2.2 && <3
@@ -102,5 +99,4 @@ test-suite spec
10299
, unordered-containers
103100
, wai
104101
, warp >=3.3 && <4
105-
, bytestring >=0.10 && <1
106102
default-language: Haskell2010

0 commit comments

Comments
 (0)