aboutsummaryrefslogtreecommitdiff
path: root/lib/Web
diff options
context:
space:
mode:
authorChris Martin <ch.martin@gmail.com>2019-03-26 19:03:00 -0600
committerIgor Pashev <pashev.igor@gmail.com>2019-03-27 07:53:01 +0200
commit1882add7df3ea1a77f893aaf1692e62df68e5093 (patch)
tree9b98d59e7b1c611f41806bfc84711cbf667c81f5 /lib/Web
parent647f9536798253556a50d4969dd9439f8a2239e4 (diff)
downloadopenweathermap-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).
Diffstat (limited to 'lib/Web')
-rw-r--r--lib/Web/OpenWeatherMap/API.hs3
-rw-r--r--lib/Web/OpenWeatherMap/Client.hs6
2 files changed, 3 insertions, 6 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.