Update bounds, add WithResource instance

CHANGELOG.md

@@ -1,6 +1,7 @@
 Unreleased
 ==========
 
+- Add an `HasEndpoint` instance for `WithResource`
 
 1.2.0
 =======

lib/Prometheus/Servant/Internal.hs

@@ -109,6 +109,13 @@ instance HasEndpoint (sub :: Type) => HasEndpoint (Fragment a :> sub) where
   enumerateEndpoints _ = enumerateEndpoints (Proxy :: Proxy sub)
 #endif
 
+#if MIN_VERSION_servant(0,20,0)
+instance HasEndpoint (sub :: Type) => HasEndpoint (WithResource a :> sub) where
+  getEndpoint _ = getEndpoint (Proxy :: Proxy sub)
+
+  enumerateEndpoints _ = enumerateEndpoints (Proxy :: Proxy sub)
+#endif
+
 instance
   HasEndpoint (sub :: Type)
   => HasEndpoint (QueryParam' mods (h :: Symbol) a :> sub)

package.yaml

@@ -20,6 +20,7 @@ tested-with:
   - GHC == 9.2.8
   - GHC == 9.4.7
   - GHC == 9.4.8
+  - GHC == 9.6.5
 
 verbatim:
   cabal-version: 2.4
@@ -71,17 +72,17 @@ ghc-options:
   - -Wno-implicit-prelude
 
 dependencies:
-  - base >=4.10 && < 4.18
+  - base >=4.10 && < 4.21
 
 library:
   source-dirs: lib
   dependencies:
     - clock >= 0.8.3 && < 0.9
-    - ghc-prim >= 0.8.0 && < 0.10
+    - ghc-prim >= 0.8.0 && < 0.12
     - 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
+    - servant >= 0.14 && < 0.21
     - text >= 1.2.5 && < 2.1
     - wai >= 3.2.3 && < 3.3
 
@@ -104,8 +105,8 @@ tests:
       - http-client >= 0.7.13 && < 0.8
       - prometheus-client
       - servant
-      - servant-client >= 0.14 && < 0.20
-      - servant-server >= 0.14 && < 0.20
+      - servant-client >= 0.14 && < 0.21
+      - servant-server >= 0.14 && < 0.21
       - text
       - wai
       - warp >= 3.2.4 && < 3.4

servant-prometheus.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.4
 
--- 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
 
@@ -20,6 +20,7 @@ tested-with:
     GHC == 9.2.8
   , GHC == 9.4.7
   , GHC == 9.4.8
+  , GHC == 9.6.5
 extra-source-files:
     README.md
     LICENSE
@@ -49,13 +50,13 @@ 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.18
+      base >=4.10 && <4.21
     , clock >=0.8.3 && <0.9
-    , ghc-prim >=0.8.0 && <0.10
+    , ghc-prim >=0.8.0 && <0.12
     , 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
+    , servant >=0.14 && <0.21
     , text >=1.2.5 && <2.1
     , wai >=3.2.3 && <3.3
   default-language: GHC2021
@@ -82,16 +83,16 @@ test-suite spec
       hspec-discover:hspec-discover
   build-depends:
       aeson >=2.0 && <2.2
-    , base >=4.10 && <4.18
+    , base >=4.10 && <4.21
     , containers >=0.6.5 && <0.7
     , hspec ==2.*
     , hspec-expectations-pretty-diff >=0.7.2.2 && <0.8
     , http-client >=0.7.13 && <0.8
     , prometheus-client
     , servant
-    , servant-client >=0.14 && <0.20
+    , servant-client >=0.14 && <0.21
     , servant-prometheus
-    , servant-server >=0.14 && <0.20
+    , servant-server >=0.14 && <0.21
     , text
     , wai
     , warp >=3.2.4 && <3.4
@@ -115,7 +116,7 @@ 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.18
+      base >=4.10 && <4.21
     , process >=1.6.16 && <1.7
     , servant-prometheus
     , servant-server