Merge pull request #45 from phadej/lzma

Use lzma

Author: phadej

servant-swagger-ui.cabal

@@ -99,16 +99,13 @@ library
       base              >=4.7      && <4.12
     , blaze-markup      >=0.7.0.2  && <0.9
     , bytestring        >=0.10.4.0 && <0.11
-    , directory         >=1.2.1.0  && <1.4
-    , file-embed        >=0.0.9    && <0.1
-    , filepath          >=1.3.0.2  && <1.5
+    , file-embed-lzma   >=0        && <0.1
     , http-media        >=0.6.2    && <0.8
     , servant           >=0.4.4.5  && <0.14
     , servant-blaze     >=0.4.4.5  && <0.9
     , servant-server    >=0.4.4.5  && <0.14
     , servant-swagger   >=1.0.3    && <1.2
     , swagger2          >=2.0.1    && <2.3
-    , template-haskell  >=2.9      && <2.14
     , text              >=1.2.0.6  && <1.3
     , wai-app-static    >=3.0.1.1  && <3.2
   if flag(servant-0-5)
@@ -122,7 +119,6 @@ library
       , either
   exposed-modules:
       Servant.Swagger.UI
-      Servant.Swagger.UI.Internal
   default-language: Haskell2010
 
 test-suite example

src/Servant/Swagger/UI.hs

@@ -70,13 +70,12 @@ module Servant.Swagger.UI (
     ) where
 
 import Data.ByteString                (ByteString)
-import Data.FileEmbed                 (embedStringFile)
 import Data.Swagger                   (Swagger)
+import FileEmbedLzma
 import GHC.TypeLits                   (KnownSymbol, Symbol, symbolVal)
 import Network.Wai.Application.Static (embeddedSettings, staticApp)
 import Servant
 import Servant.HTML.Blaze             (HTML)
-import Servant.Swagger.UI.Internal
 import Text.Blaze                     (ToMarkup (..))
 
 import qualified Data.Text as T
@@ -190,19 +189,19 @@ swaggerSchemaUIServerImpl indexTemplate files swagger = return swagger
         staticApp $ embeddedSettings files
 
 swaggerUiIndexTemplate :: T.Text
-swaggerUiIndexTemplate = $(embedStringFile "index.html.tmpl")
+swaggerUiIndexTemplate = $(embedText "index.html.tmpl")
 
 swaggerUiFiles :: [(FilePath, ByteString)]
-swaggerUiFiles = $(mkRecursiveEmbedded "swagger-ui-dist-3.9.1")
+swaggerUiFiles = $(embedRecursiveDir "swagger-ui-dist-3.9.1")
 
 jensolegIndexTemplate :: T.Text
-jensolegIndexTemplate = $(embedStringFile "jensoleg.index.html.tmpl")
+jensolegIndexTemplate = $(embedText "jensoleg.index.html.tmpl")
 
 jensolegFiles :: [(FilePath, ByteString)]
-jensolegFiles = $(mkRecursiveEmbedded "jensoleg-dist")
+jensolegFiles = $(embedRecursiveDir "jensoleg-dist")
 
 redocIndexTemplate :: T.Text
-redocIndexTemplate = $(embedStringFile "redoc.index.html.tmpl")
+redocIndexTemplate = $(embedText "redoc.index.html.tmpl")
 
 redocFiles :: [(FilePath, ByteString)]
-redocFiles = $(mkRecursiveEmbedded "redoc-dist")
+redocFiles = $(embedRecursiveDir "redoc-dist")