diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,30 +1,30 @@ -Copyright Mike Pilgrem (c) 2017 - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - * Neither the name of Mike Pilgrem nor the names of other - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +Copyright Mike Pilgrem (c) 2017 + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Mike Pilgrem nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple -main = defaultMain +import Distribution.Simple +main = defaultMain diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,10 @@ +# 0.5.0.2 + +* Update dependencies for GHC 8.4.3 + # 0.5.0.1 -* Update dependencies for GHC 8.2.1 and relax lower bounds. +* Update dependencies for GHC 8.2.1 and relax lower bounds # 0.5.0.0 diff --git a/google-static-maps.cabal b/google-static-maps.cabal --- a/google-static-maps.cabal +++ b/google-static-maps.cabal @@ -1,5 +1,5 @@ name: google-static-maps -version: 0.5.0.1 +version: 0.5.0.2 synopsis: Bindings to the Google Static Maps API description: The returns a map as an image via an HTTP request. This library @@ -26,19 +26,19 @@ hs-source-dirs: src exposed-modules: Web.Google.Static.Maps , Web.Google.Maps.Common - build-depends: base >= 4.7 && < 4.11 + build-depends: base >= 4.7 && < 4.12 , base64-bytestring >= 0.1.1 && < 1.1 , bytestring >= 0.10 && < 0.11 - , aeson >= 0.7 && < 1.3 + , aeson >= 0.7 && < 1.5 , bytedump >= 0.9 && < 1.1 - , cryptonite >= 0.1 && < 0.25 + , cryptonite >= 0.1 && < 0.26 , double-conversion >= 0.2 && < 2.1 , http-client >= 0.1 && < 0.6 , JuicyPixels >= 1.0 && < 3.3 , memory >= 0.1 && < 0.15 , network-uri >= 2.6 && < 2.7 - , servant >= 0.11 && < 0.12 - , servant-client >= 0.11 && < 0.12 + , servant >= 0.11 && < 0.15 + , servant-client >= 0.11 && < 0.15 , servant-JuicyPixels >= 0.3 && < 0.4 , text >= 0.1 && < 1.3 , utf8-string >= 0.3 && < 1.1 diff --git a/src/Web/Google/Static/Maps.hs b/src/Web/Google/Static/Maps.hs --- a/src/Web/Google/Static/Maps.hs +++ b/src/Web/Google/Static/Maps.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} @@ -7,7 +8,7 @@ -- | -- Module : Web.Google.Static.Maps -- Description : Bindings to the Google Static Maps API --- Copyright : (c) Mike Pilgrem 2017 +-- Copyright : (c) Mike Pilgrem 2017, 2018 -- Maintainer : public@pilgrem.com -- Stability : experimental -- @@ -637,12 +638,22 @@ visibleOpt = case secretOpt of Nothing -> runClientM (eval staticmap' Nothing) +-- CookieJar supported from servant-client-0.13 +#if MIN_VERSION_servant_client(0,13,0) + (ClientEnv mgr googleMapsApis Nothing) +#else (ClientEnv mgr googleMapsApis) +#endif Just secret -> do let url = linkURI $ eval (safeLink api api) Nothing signatureOpt = sign secret googleMapsApis url runClientM (eval staticmap' signatureOpt) +-- CookieJar supported from servant-client-0.13 +#if MIN_VERSION_servant_client(0,13,0) + (ClientEnv mgr googleMapsApis Nothing) +#else (ClientEnv mgr googleMapsApis) +#endif where linkURI = linkURI' LinkArrayElementPlain eval f = f (Just key) centerOpt zoomOpt (Just size) scaleOpt formatOpt