a80f8b4 · haskell-servant/servant-elm

git.iko.soy/haskell-servant/servant-elm

Fix for elm-bridge-0.6.0

commita80f8b41d37d11778d2c27e6b38e881a71e85343 authorKostiantyn Rybnikov <k-bx@k-bx.com> dateWed 15 Apr 2020, 15:59 (6 years ago) parentbbc8380

3 files changed+15−5

compare with master

unifiedsplit

servant-elm.cabal+1−1 src/Servant/Elm/Internal/Generate.hs+11−2 stack.yaml+3−2

servant-elm.cabal+1−1

@@ -34,7 +34,7 @@ library

3434 build-depends: base >= 4.7 && < 5

3535 , aeson >= 0.9

3636 , directory

37− , elm-bridge >= 0.4

37+ , elm-bridge >= 0.5.2

3838 , lens

3939 , servant >= 0.8

4040 , servant-foreign >= 0.8

src/Servant/Elm/Internal/Generate.hs+11−2

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

12{-# LANGUAGE RecordWildCards #-}

23{-# LANGUAGE FlexibleContexts #-}

34{-# LANGUAGE MultiParamTypeClasses #-}

@@ -19,8 +20,11 @@ import Elm.Json (jsonParserForType, jsonSerForType)

1920import qualified Elm.Module as Elm

2021import Elm.TyRep (ETCon(..), EType(..), ETypeDef(..), toElmType)

2122import Elm.TyRender (renderElm)

23+#if MIN_VERSION_elm_bridge(0,6,0)

24+import Elm.Versions (ElmVersion(Elm0p19))

25+#else

2226import Elm.Versions (ElmVersion(Elm0p18))

23−

27+#endif

2428import Servant.Elm.Internal.Foreign (LangElm, getEndpoints)

2529import qualified Servant.Foreign as F

2630import System.Directory (createDirectoryIfMissing)

@@ -149,7 +153,12 @@ generateElmModuleWith ::

149153generateElmModuleWith options namespace imports rootDir typeDefs api = do

150154 let out =

151155 T.unlines $

152− [ T.pack $ Elm.moduleHeader Elm0p18 moduleName

156+ [

157+#if MIN_VERSION_elm_bridge(0,6,0)

158+ T.pack $ Elm.moduleHeader Elm0p19 moduleName

159+#else

160+ T.pack $ Elm.moduleHeader Elm0p18 moduleName

161+#endif

153162 , ""

154163 , imports

155164 , T.pack $ Elm.makeModuleContentWithAlterations (elmAlterations options) typeDefs

stack.yaml+3−2

@@ -1,7 +1,8 @@

1−resolver: lts-14.6

1+resolver: lts-15.8

22packages:

33- '.'

44extra-deps:

5−- elm-bridge-0.5.2

5+# - elm-bridge-0.5.2

6+- ../elm-bridge

67flags: {}

78extra-package-dbs: []