From e8f413ebab6315e29902243a8cc142475f091491 Mon Sep 17 00:00:00 2001
From: patrick brisbin <pbrisbin@gmail.com>
Date: Tue, 23 Jan 2018 10:57:30 -0500
Subject: [PATCH] Drop support for GHC < 7.10

---
 package.yaml                        | 2 +-
 src/Yesod/Auth/OAuth2.hs            | 5 -----
 src/Yesod/Auth/OAuth2/BattleNet.hs  | 5 -----
 src/Yesod/Auth/OAuth2/Bitbucket.hs  | 5 -----
 src/Yesod/Auth/OAuth2/EveOnline.hs  | 5 -----
 src/Yesod/Auth/OAuth2/Github.hs     | 5 -----
 src/Yesod/Auth/OAuth2/Google.hs     | 5 -----
 src/Yesod/Auth/OAuth2/Nylas.hs      | 8 +-------
 src/Yesod/Auth/OAuth2/Salesforce.hs | 8 +-------
 src/Yesod/Auth/OAuth2/Spotify.hs    | 8 +-------
 src/Yesod/Auth/OAuth2/Upcase.hs     | 5 -----
 stack.yaml                          | 2 +-
 12 files changed, 5 insertions(+), 58 deletions(-)

diff --git a/package.yaml b/package.yaml
index a1b6b73..5d20eaf 100644
--- a/package.yaml
+++ b/package.yaml
@@ -11,7 +11,7 @@ github: thoughtbot/yesod-auth-oauth2.git
 homepage: http://github.com/thoughtbot/yesod-auth-oauth2
 
 dependencies:
-  - base >=4.5 && <5
+  - base >=4.8.0.0 && <5
 
 library:
   source-dirs: src
diff --git a/src/Yesod/Auth/OAuth2.hs b/src/Yesod/Auth/OAuth2.hs
index cf29b69..0785eb4 100644
--- a/src/Yesod/Auth/OAuth2.hs
+++ b/src/Yesod/Auth/OAuth2.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE OverloadedStrings #-}
@@ -24,10 +23,6 @@ module Yesod.Auth.OAuth2
     , module URI.ByteString.Extension
     ) where
 
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative ((<$>))
-#endif
-
 import Control.Exception.Lifted
 import Control.Monad (unless)
 import Control.Monad.IO.Class
diff --git a/src/Yesod/Auth/OAuth2/BattleNet.hs b/src/Yesod/Auth/OAuth2/BattleNet.hs
index 43b9758..becea0d 100644
--- a/src/Yesod/Auth/OAuth2/BattleNet.hs
+++ b/src/Yesod/Auth/OAuth2/BattleNet.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 -- |
@@ -13,10 +12,6 @@ module Yesod.Auth.OAuth2.BattleNet
   ( oAuth2BattleNet
   ) where
 
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative ((<$>), (<*>))
-#endif
-
 import Control.Exception (throwIO)
 import Control.Monad (mzero)
 import Data.Aeson
diff --git a/src/Yesod/Auth/OAuth2/Bitbucket.hs b/src/Yesod/Auth/OAuth2/Bitbucket.hs
index eb6ca99..0064af8 100644
--- a/src/Yesod/Auth/OAuth2/Bitbucket.hs
+++ b/src/Yesod/Auth/OAuth2/Bitbucket.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 -- |
 --
@@ -14,10 +13,6 @@ module Yesod.Auth.OAuth2.Bitbucket
     , module Yesod.Auth.OAuth2
     ) where
 
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative ((<$>), (<*>))
-#endif
-
 import Control.Exception.Lifted (throwIO)
 import Control.Monad (mzero)
 import Data.Aeson (FromJSON, Value(Object), parseJSON, (.:), (.:?))
diff --git a/src/Yesod/Auth/OAuth2/EveOnline.hs b/src/Yesod/Auth/OAuth2/EveOnline.hs
index 2a5fb7c..002c430 100644
--- a/src/Yesod/Auth/OAuth2/EveOnline.hs
+++ b/src/Yesod/Auth/OAuth2/EveOnline.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes #-}
 -- |
@@ -16,10 +15,6 @@ module Yesod.Auth.OAuth2.EveOnline
     , module Yesod.Auth.OAuth2
     ) where
 
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative ((<$>), (<*>))
-#endif
-
 import Control.Exception.Lifted
 import Control.Monad (mzero)
 import Data.Aeson
diff --git a/src/Yesod/Auth/OAuth2/Github.hs b/src/Yesod/Auth/OAuth2/Github.hs
index d4b8f8f..fde58a6 100644
--- a/src/Yesod/Auth/OAuth2/Github.hs
+++ b/src/Yesod/Auth/OAuth2/Github.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 -- |
 --
@@ -14,10 +13,6 @@ module Yesod.Auth.OAuth2.Github
     , module Yesod.Auth.OAuth2
     ) where
 
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative ((<$>), (<*>))
-#endif
-
 import Control.Exception.Lifted
 import Control.Monad (mzero)
 import Data.Aeson
diff --git a/src/Yesod/Auth/OAuth2/Google.hs b/src/Yesod/Auth/OAuth2/Google.hs
index edbc5c4..906c935 100644
--- a/src/Yesod/Auth/OAuth2/Google.hs
+++ b/src/Yesod/Auth/OAuth2/Google.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 -- |
 --
@@ -21,10 +20,6 @@ module Yesod.Auth.OAuth2.Google
     , module Yesod.Auth.OAuth2
     ) where
 
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative ((<$>), (<*>))
-#endif
-
 import Control.Exception.Lifted
 import Control.Monad (mzero)
 import Data.Aeson
diff --git a/src/Yesod/Auth/OAuth2/Nylas.hs b/src/Yesod/Auth/OAuth2/Nylas.hs
index 1b1f9c3..209b50e 100644
--- a/src/Yesod/Auth/OAuth2/Nylas.hs
+++ b/src/Yesod/Auth/OAuth2/Nylas.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Yesod.Auth.OAuth2.Nylas
@@ -6,10 +5,6 @@ module Yesod.Auth.OAuth2.Nylas
     , module Yesod.Auth.OAuth2
     ) where
 
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative ((<$>), (<*>))
-#endif
-
 import Control.Exception.Lifted (throwIO)
 import Control.Monad (mzero)
 import Data.Aeson (FromJSON, Value(..), decode, parseJSON, (.:))
@@ -18,11 +13,10 @@ import Data.Text.Encoding (encodeUtf8)
 import Network.HTTP.Client
     (applyBasicAuth, httpLbs, parseRequest, responseBody, responseStatus)
 import Network.HTTP.Conduit (Manager)
+import qualified Network.HTTP.Types as HT
 import Yesod.Auth (AuthPlugin, Creds(..), YesodAuth)
 import Yesod.Auth.OAuth2
 
-import qualified Network.HTTP.Types as HT
-
 data NylasAccount = NylasAccount
     { nylasAccountId :: Text
     , nylasAccountEmailAddress :: Text
diff --git a/src/Yesod/Auth/OAuth2/Salesforce.hs b/src/Yesod/Auth/OAuth2/Salesforce.hs
index dd5102f..aa75209 100644
--- a/src/Yesod/Auth/OAuth2/Salesforce.hs
+++ b/src/Yesod/Auth/OAuth2/Salesforce.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 -- |
@@ -17,20 +16,15 @@ module Yesod.Auth.OAuth2.Salesforce
     , module Yesod.Auth.OAuth2
     ) where
 
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative ((<$>), (<*>))
-#endif
-
 import Control.Exception.Lifted
 import Control.Monad (mzero)
 import Data.Aeson
 import Data.Text (Text)
+import qualified Data.Text as T
 import Network.HTTP.Conduit (Manager)
 import Yesod.Auth
 import Yesod.Auth.OAuth2
 
-import qualified Data.Text as T
-
 oauth2Salesforce :: YesodAuth m
                  => Text -- ^ Client ID
                  -> Text -- ^ Client Secret
diff --git a/src/Yesod/Auth/OAuth2/Spotify.hs b/src/Yesod/Auth/OAuth2/Spotify.hs
index 7bb328e..e72a1b2 100644
--- a/src/Yesod/Auth/OAuth2/Spotify.hs
+++ b/src/Yesod/Auth/OAuth2/Spotify.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 -- |
 --
@@ -9,20 +8,15 @@ module Yesod.Auth.OAuth2.Spotify
     , module Yesod.Auth.OAuth2
     ) where
 
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative (pure, (<$>), (<*>))
-#endif
-
 import Control.Monad (mzero)
 import Data.Aeson
 import Data.Maybe
 import Data.Text (Text)
+import qualified Data.Text as T
 import Data.Text.Encoding (encodeUtf8)
 import Yesod.Auth
 import Yesod.Auth.OAuth2
 
-import qualified Data.Text as T
-
 data SpotifyUserImage = SpotifyUserImage
     { spotifyUserImageHeight :: Maybe Int
     , spotifyUserImageWidth :: Maybe Int
diff --git a/src/Yesod/Auth/OAuth2/Upcase.hs b/src/Yesod/Auth/OAuth2/Upcase.hs
index 4acd935..5202b99 100644
--- a/src/Yesod/Auth/OAuth2/Upcase.hs
+++ b/src/Yesod/Auth/OAuth2/Upcase.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 -- |
 --
@@ -13,10 +12,6 @@ module Yesod.Auth.OAuth2.Upcase
     , module Yesod.Auth.OAuth2
     ) where
 
-#if __GLASGOW_HASKELL__ < 710
-import Control.Applicative ((<$>), (<*>))
-#endif
-
 import Control.Monad (mzero)
 import Data.Aeson
 import Data.Text (Text)
diff --git a/stack.yaml b/stack.yaml
index cffde61..0ea2300 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
 ---
-resolver: lts-10.1
+resolver: lts-10.3
 packages:
   - .