Skip to content

Commit

Permalink
[chore] support ghc 9.4 (#4)
Browse files Browse the repository at this point in the history
deps: bump bounds to support ghc 9.4
  • Loading branch information
worm2fed authored Oct 2, 2023
1 parent f2859d3 commit 17a1221
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:

env:
GHC_VERSION: 9.2.8
STACK_LTS: "0" # actual value will be set in later steps

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -90,5 +91,4 @@ jobs:
- name: Build & Test
run: |
stack build -j2 --fast --test --pedantic \
--flag servant-prometheus:warning-as-error \
--ghc-options="-j -O0"
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Unreleased
==========

1.1.0
=======

- Support GHC 9.4

1.0.0
=======

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# servant-prometheus

[![Build status](https://github.com/worm2fed/servant-prometheus/actions/workflows/ci.yml/badge.svg)](https://github.com/worm2fed/servant-prometheus/actions/workflows/ci.yml)
[![Hackage](https://img.shields.io/hackage/v/servant-prometheus.svg?logo=haskell)](https://hackage.haskell.org/package/servant-prometheus)

# Servant Performance Counters

Expand Down
25 changes: 8 additions & 17 deletions package.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: servant-prometheus
version: 1.0.0
version: 1.1.0
github: worm2fed/servant-prometheus
synopsis: Helpers for using prometheus with servant
description: Please see the README on GitHub at <https://github.com/worm2fed/servant-prometheus#readme>
Expand All @@ -16,12 +16,13 @@ extra-source-files:
extra-doc-files:
- CHANGELOG.md

tested-with: GHC ==9.2.8
tested-with:
- GHC == 9.2.8
- GHC == 9.4.7

verbatim:
cabal-version: 2.4

# We enable all extensions that we consider harmless by default
default-extensions:
- BangPatterns
- DataKinds
Expand All @@ -38,16 +39,6 @@ default-extensions:
- TypeOperators
- UndecidableInstances

flags:
warning-as-error:
description: Assume every warning as error
manual: true
default: false

when:
- condition: flag(warning-as-error)
ghc-options: -Werror

ghc-options:
# For details on warnings:
# https://downloads.haskell.org/~ghc/master/users-guide/using-warnings.html
Expand Down Expand Up @@ -83,18 +74,18 @@ ghc-options:
- -Wno-implicit-prelude

dependencies:
- base >=4.10 && < 4.17
- base >=4.10 && < 4.18

library:
source-dirs: lib
dependencies:
- clock >= 0.8.3 && < 0.9
- ghc-prim >= 0.8.0 && < 0.9
- ghc-prim >= 0.8.0 && < 0.10
- hashable >= 1.4.2 && < 1.5
- http-types >= 0.12.3 && < 0.13
- prometheus-client >= 1.1.0 && < 1.2
- servant >= 0.14 && < 0.20
- text >= 1.2.5 && < 1.3
- text >= 1.2.5 && < 2.1
- wai >= 3.2.3 && < 3.3

tests:
Expand All @@ -109,7 +100,7 @@ tests:
dependencies:
- servant-prometheus

- aeson >= 2.0 && < 2.1
- aeson >= 2.0 && < 2.2
- containers >= 0.6.5 && < 0.7
- hspec >= 2 && < 3
- hspec-expectations-pretty-diff >= 0.7.2.2 && < 0.8
Expand Down
30 changes: 10 additions & 20 deletions servant-prometheus.cabal
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cabal-version: 2.4

-- This file has been generated from package.yaml by hpack version 0.35.2.
-- This file has been generated from package.yaml by hpack version 0.36.0.
--
-- see: https://github.com/sol/hpack

name: servant-prometheus
version: 1.0.0
version: 1.1.0
synopsis: Helpers for using prometheus with servant
description: Please see the README on GitHub at <https://github.com/worm2fed/servant-prometheus#readme>
category: Servant, Web, System
Expand All @@ -17,7 +17,8 @@ license: BSD-3-Clause
license-file: LICENSE
build-type: Simple
tested-with:
GHC ==9.2.8
GHC == 9.2.8
, GHC == 9.4.7
extra-source-files:
README.md
LICENSE
Expand All @@ -28,11 +29,6 @@ source-repository head
type: git
location: https://github.com/worm2fed/servant-prometheus

flag warning-as-error
description: Assume every warning as error
manual: True
default: False

library
exposed-modules:
Prometheus.Servant
Expand Down Expand Up @@ -60,18 +56,16 @@ library
UndecidableInstances
ghc-options: -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-inferred-safe-imports -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-missing-kind-signatures -Wno-implicit-prelude
build-depends:
base >=4.10 && <4.17
base >=4.10 && <4.18
, clock >=0.8.3 && <0.9
, ghc-prim >=0.8.0 && <0.9
, ghc-prim >=0.8.0 && <0.10
, hashable >=1.4.2 && <1.5
, http-types >=0.12.3 && <0.13
, prometheus-client >=1.1.0 && <1.2
, servant >=0.14 && <0.20
, text >=1.2.5 && <1.3
, text >=1.2.5 && <2.1
, wai >=3.2.3 && <3.3
default-language: Haskell2010
if flag(warning-as-error)
ghc-options: -Werror

test-suite spec
type: exitcode-stdio-1.0
Expand Down Expand Up @@ -102,8 +96,8 @@ test-suite spec
build-tool-depends:
hspec-discover:hspec-discover
build-depends:
aeson ==2.0.*
, base >=4.10 && <4.17
aeson >=2.0 && <2.2
, base >=4.10 && <4.18
, containers >=0.6.5 && <0.7
, hspec ==2.*
, hspec-expectations-pretty-diff >=0.7.2.2 && <0.8
Expand All @@ -117,8 +111,6 @@ test-suite spec
, wai
, warp >=3.2.4 && <3.4
default-language: Haskell2010
if flag(warning-as-error)
ghc-options: -Werror

benchmark bench
type: exitcode-stdio-1.0
Expand Down Expand Up @@ -146,13 +138,11 @@ benchmark bench
UndecidableInstances
ghc-options: -Weverything -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missed-specialisations -Wno-all-missed-specialisations -Wno-unsafe -Wno-safe -Wno-inferred-safe-imports -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-missing-kind-signatures -Wno-implicit-prelude -threaded "-with-rtsopts=-N -A64m -AL256m"
build-depends:
base >=4.10 && <4.17
base >=4.10 && <4.18
, process >=1.6.16 && <1.7
, servant-prometheus
, servant-server
, text
, wai
, warp
default-language: Haskell2010
if flag(warning-as-error)
ghc-options: -Werror
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-20.26
resolver: lts-21.14

ghc-options:
# locally install Haddocs for "everything": deps and the project
Expand Down
8 changes: 4 additions & 4 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
packages: []
snapshots:
- completed:
sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2
size: 650475
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml
original: lts-20.26
sha256: 60e54c1ba3c1e7163acf6dafa9d56b2d3b23f88a31ad53a1c9d888f32561f8da
size: 639819
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/14.yaml
original: lts-21.14

0 comments on commit 17a1221

Please sign in to comment.