Require file-embed-lzma>=0.1

haskell-servant · Jul 3, 2024 · 0a6edb6 · 0a6edb6
1 parent 1056593
commit 0a6edb6
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 17 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -32,9 +32,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.6.2
+          - compiler: ghc-9.8.2
             compilerKind: ghc
-            compilerVersion: 9.6.2
+            compilerVersion: 9.8.2
+            setup-method: ghcup
+            allow-failure: false
+          - compiler: ghc-9.6.6
+            compilerKind: ghc
+            compilerVersion: 9.6.6
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.4.5

diff --git a/cabal.haskell-ci b/cabal.haskell-ci
@@ -17,5 +17,5 @@ constraint-set servant-0.19
   constraints: servant ==0.19.*
 
 constraint-set servant-0.20
-  ghc: >= 8.10 && <9.8
+  ghc: >= 8.10 && <9.10
   constraints: servant ==0.20.*
diff --git a/servant-swagger-ui-core/servant-swagger-ui-core.cabal b/servant-swagger-ui-core/servant-swagger-ui-core.cabal
@@ -24,7 +24,8 @@ tested-with:
    || ==9.0.2
    || ==9.2.7
    || ==9.4.5
-   || ==9.6.2
+   || ==9.6.6
+   || ==9.8.2
 
 extra-source-files: Changelog.md
 

diff --git a/servant-swagger-ui-example/servant-swagger-ui-example.cabal b/servant-swagger-ui-example/servant-swagger-ui-example.cabal
@@ -19,7 +19,8 @@ tested-with:
    || ==9.0.2
    || ==9.2.7
    || ==9.4.5
-   || ==9.6.2
+   || ==9.6.6
+   || ==9.8.2
 
 source-repository head
   type:     git

diff --git a/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal b/servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal
@@ -1,6 +1,6 @@
 cabal-version:      1.12
 name:               servant-swagger-ui-jensoleg
-version:            0.3.4
+version:            0.3.5
 synopsis:           Servant swagger ui: Jens-Ole Graulund theme
 category:           Web, Servant, Swagger
 description:
@@ -23,7 +23,8 @@ tested-with:
    || ==9.0.2
    || ==9.2.7
    || ==9.4.5
-   || ==9.6.2
+   || ==9.6.6
+   || ==9.8.2
 
 extra-source-files:
   jensoleg.index.html.tmpl
@@ -88,7 +89,7 @@ library
       base             >=4.7      && <4.21
     , aeson            >=0.8.0.2  && <2.3
     , bytestring       >=0.10.4.0 && <0.13
-    , file-embed-lzma  >=0        && <0.1
+    , file-embed-lzma  >=0.1      && <0.2
     , servant          >=0.14     && <0.21
     , servant-server   >=0.14     && <0.21
     , text             >=1.2.3.0  && <2.2

diff --git a/servant-swagger-ui-jensoleg/src/Servant/Swagger/UI/JensOleG.hs b/servant-swagger-ui-jensoleg/src/Servant/Swagger/UI/JensOleG.hs
@@ -58,7 +58,7 @@ import Servant.Swagger.UI.Core
 import Data.Aeson      (ToJSON, Value)
 import Data.ByteString (ByteString)
 import Data.Text       (Text)
-import FileEmbedLzma
+import FileEmbedLzma.Untyped
 import Servant
 
 -- | Serve alternative Swagger UI.

diff --git a/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal b/servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal
@@ -1,6 +1,6 @@
 cabal-version:      1.12
 name:               servant-swagger-ui-redoc
-version:            0.3.4.1.22.3
+version:            0.3.4.1.22.4
 synopsis:           Servant swagger ui: ReDoc theme
 category:           Web, Servant, Swagger
 description:
@@ -23,7 +23,8 @@ tested-with:
    || ==9.0.2
    || ==9.2.7
    || ==9.4.5
-   || ==9.6.2
+   || ==9.6.6
+   || ==9.8.2
 
 extra-source-files:
   redoc-dist-1.22.3/redoc.min.js
@@ -42,7 +43,7 @@ library
       base             >=4.7      && <4.21
     , aeson            >=0.8.0.2  && <2.3
     , bytestring       >=0.10.4.0 && <0.13
-    , file-embed-lzma  >=0        && <0.1
+    , file-embed-lzma  >=0.1      && <0.2
     , servant          >=0.14     && <0.21
     , servant-server   >=0.14     && <0.21
     , text             >=1.2.3.0  && <2.2

diff --git a/servant-swagger-ui-redoc/src/Servant/Swagger/UI/ReDoc.hs b/servant-swagger-ui-redoc/src/Servant/Swagger/UI/ReDoc.hs
@@ -60,7 +60,7 @@ import Servant.Swagger.UI.Core
 import Data.Aeson      (ToJSON, Value)
 import Data.ByteString (ByteString)
 import Data.Text       (Text)
-import FileEmbedLzma
+import FileEmbedLzma.Untyped
 import Servant
 
 -- | Serve alternative Swagger UI.

diff --git a/servant-swagger-ui/servant-swagger-ui.cabal b/servant-swagger-ui/servant-swagger-ui.cabal
@@ -1,6 +1,6 @@
 cabal-version:      1.12
 name:               servant-swagger-ui
-version:            0.3.5.5.0.0
+version:            0.3.5.5.0.1
 synopsis:           Servant swagger ui
 category:           Web, Servant, Swagger
 description:
@@ -23,7 +23,8 @@ tested-with:
    || ==9.0.2
    || ==9.2.7
    || ==9.4.5
-   || ==9.6.2
+   || ==9.6.6
+   || ==9.8.2
 
 extra-source-files:
   CHANGELOG.md
@@ -58,7 +59,7 @@ library
       base             >=4.7      && <4.21
     , aeson            >=0.8.0.2  && <2.3
     , bytestring       >=0.10.4.0 && <0.13
-    , file-embed-lzma  >=0        && <0.1
+    , file-embed-lzma  >=0.1      && <0.2
     , servant          >=0.14     && <0.21
     , servant-server   >=0.14     && <0.21
     , text             >=1.2.3.0  && <2.2

diff --git a/servant-swagger-ui/src/Servant/Swagger/UI.hs b/servant-swagger-ui/src/Servant/Swagger/UI.hs
@@ -65,7 +65,7 @@ import Servant.Swagger.UI.Core
 import Data.Aeson      (ToJSON, Value)
 import Data.ByteString (ByteString)
 import Data.Text       (Text)
-import FileEmbedLzma
+import FileEmbedLzma.Untyped
 import Servant
 
 -- | Serve Swagger UI on @/dir@ using @api@ as a Swagger spec source.