diff options
| author | Chris Martin <ch.martin@gmail.com> | 2019-03-26 19:03:00 -0600 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2019-03-27 07:53:01 +0200 |
| commit | 1882add7df3ea1a77f893aaf1692e62df68e5093 (patch) | |
| tree | 9b98d59e7b1c611f41806bfc84711cbf667c81f5 | |
| parent | 647f9536798253556a50d4969dd9439f8a2239e4 (diff) | |
| download | openweathermap-1882add7df3ea1a77f893aaf1692e62df68e5093.tar.gz | |
Fix build for latest version of servant-client
Various modules have been removed from servant-client, and the things
previously imported from them now need to be imported from the top-level
"Servant.Client" module.
The ClientEnv constructor now has a third parameter. Instead of using
the constructor directly, now using mkClientEnv (which was introduced in
servant-client 0.13, necessitating raising the minimum version on the
dependency).
| -rw-r--r-- | lib/Web/OpenWeatherMap/API.hs | 3 | ||||
| -rw-r--r-- | lib/Web/OpenWeatherMap/Client.hs | 6 | ||||
| -rw-r--r-- | openweathermap.cabal | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/lib/Web/OpenWeatherMap/API.hs b/lib/Web/OpenWeatherMap/API.hs index 0c1e282..757a6be 100644 --- a/lib/Web/OpenWeatherMap/API.hs +++ b/lib/Web/OpenWeatherMap/API.hs @@ -14,8 +14,7 @@ module Web.OpenWeatherMap.API ( import Data.Proxy (Proxy(..)) import Servant.API ((:>), (:<|>)(..), JSON, Get, QueryParam) -import Servant.Client (client) -import Servant.Common.Req (ClientM) +import Servant.Client (ClientM, client) import Web.OpenWeatherMap.Types.CurrentWeather (CurrentWeather) diff --git a/lib/Web/OpenWeatherMap/Client.hs b/lib/Web/OpenWeatherMap/Client.hs index 7804ef2..c3611ee 100644 --- a/lib/Web/OpenWeatherMap/Client.hs +++ b/lib/Web/OpenWeatherMap/Client.hs @@ -7,9 +7,7 @@ module Web.OpenWeatherMap.Client ( ) where import Network.HTTP.Client (newManager, defaultManagerSettings) -import Servant.Client (ClientEnv(..), runClientM, ServantError) -import Servant.Common.BaseUrl (BaseUrl(..), Scheme(..)) -import Servant.Common.Req (ClientM) +import Servant.Client (BaseUrl(BaseUrl), ClientEnv, mkClientEnv, ClientM, Scheme(Http), ServantError, runClientM) import Web.OpenWeatherMap.Types.CurrentWeather (CurrentWeather) import qualified Web.OpenWeatherMap.API as API @@ -40,7 +38,7 @@ api (Coord lat lon) = API.weatherByCoord (Just lat) (Just lon) . Just defaultEnv :: IO ClientEnv defaultEnv = do manager <- newManager defaultManagerSettings - return $ ClientEnv manager baseUrl + return $ mkClientEnv manager baseUrl -- XXX openweathermap.org does not support HTTPS, -- XXX appid is passed in clear text. Oops. diff --git a/openweathermap.cabal b/openweathermap.cabal index dca75ca..4565f71 100644 --- a/openweathermap.cabal +++ b/openweathermap.cabal @@ -30,7 +30,7 @@ library , aeson , http-client , servant - , servant-client >= 0.9 + , servant-client >= 0.13 exposed-modules: Web.OpenWeatherMap.API Web.OpenWeatherMap.Client |