Skip to content

Commit cb4d156

Browse files
authored
Allow file-embed-lzma-0.1 (#126)
1 parent 6126063 commit cb4d156

File tree

7 files changed

+15
-10
lines changed

7 files changed

+15
-10
lines changed

cabal.project

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,3 @@ packages:
44
servant-swagger-ui-example/
55
servant-swagger-ui-jensoleg/
66
servant-swagger-ui-redoc/
7-
8-
if impl(ghc >= 9.8) && impl(ghc < 9.10)
9-
-- https://github.com/GetShopTV/swagger2/pull/255
10-
allow-newer: swagger2:Cabal
11-
allow-newer: swagger2:base-compat-batteries
12-
allow-newer: swagger2:lens
13-
allow-newer: swagger2:network

servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ library
8888
base >=4.7 && <4.21
8989
, aeson >=0.8.0.2 && <2.3
9090
, bytestring >=0.10.4.0 && <0.13
91-
, file-embed-lzma >=0 && <0.1
91+
, file-embed-lzma >=0 && <0.2
9292
, servant >=0.14 && <0.21
9393
, servant-server >=0.14 && <0.21
9494
, text >=1.2.3.0 && <2.2

servant-swagger-ui-jensoleg/src/Servant/Swagger/UI/JensOleG.hs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ import Servant.Swagger.UI.Core
5858
import Data.Aeson (ToJSON, Value)
5959
import Data.ByteString (ByteString)
6060
import Data.Text (Text)
61+
#if MIN_VERSION_file_embed_lzma(0,1,0)
62+
import FileEmbedLzma.Untyped
63+
#else
6164
import FileEmbedLzma
65+
#endif
6266
import Servant
6367

6468
-- | Serve alternative Swagger UI.

servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ library
4242
base >=4.7 && <4.21
4343
, aeson >=0.8.0.2 && <2.3
4444
, bytestring >=0.10.4.0 && <0.13
45-
, file-embed-lzma >=0 && <0.1
45+
, file-embed-lzma >=0 && <0.2
4646
, servant >=0.14 && <0.21
4747
, servant-server >=0.14 && <0.21
4848
, text >=1.2.3.0 && <2.2

servant-swagger-ui-redoc/src/Servant/Swagger/UI/ReDoc.hs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@ import Servant.Swagger.UI.Core
6060
import Data.Aeson (ToJSON, Value)
6161
import Data.ByteString (ByteString)
6262
import Data.Text (Text)
63+
#if MIN_VERSION_file_embed_lzma(0,1,0)
64+
import FileEmbedLzma.Untyped
65+
#else
6366
import FileEmbedLzma
67+
#endif
6468
import Servant
6569

6670
-- | Serve alternative Swagger UI.

servant-swagger-ui/servant-swagger-ui.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ library
5858
base >=4.7 && <4.21
5959
, aeson >=0.8.0.2 && <2.3
6060
, bytestring >=0.10.4.0 && <0.13
61-
, file-embed-lzma >=0 && <0.1
61+
, file-embed-lzma >=0 && <0.2
6262
, servant >=0.14 && <0.21
6363
, servant-server >=0.14 && <0.21
6464
, text >=1.2.3.0 && <2.2

servant-swagger-ui/src/Servant/Swagger/UI.hs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,11 @@ import Servant.Swagger.UI.Core
6565
import Data.Aeson (ToJSON, Value)
6666
import Data.ByteString (ByteString)
6767
import Data.Text (Text)
68+
#if MIN_VERSION_file_embed_lzma(0,1,0)
69+
import FileEmbedLzma.Untyped
70+
#else
6871
import FileEmbedLzma
72+
#endif
6973
import Servant
7074

7175
-- | Serve Swagger UI on @/dir@ using @api@ as a Swagger spec source.

0 commit comments

Comments
 (0)