Merge pull request #154 from marcosh/hide-protolude-definitions

hide protolude redifined imports

Author: jml

CHANGELOG.rst

@@ -9,6 +9,7 @@ Breaking changes
 ----------------
 
 * ``Enum`` handlers are now monadic (see `#118`_)
+* restrict usage to Protolude 0.2.1 and later
 
 .. _`#118`: https://github.com/jml/graphql-api/issues/118
 

graphql-api.cabal

@@ -2,7 +2,7 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 6aa09d512e2d1e86eeb059e1273005913985418db5c8f94b7361af87744e6bae
+-- hash: 39113cf0b3911f4704bf80289a842f6a6cad623940e0146c3af99de590799257
 
 name:           graphql-api
 version:        0.2.0
@@ -36,7 +36,7 @@ library
     , containers
     , exceptions
     , ghc-prim
-    , protolude >=0.2
+    , protolude >=0.2.1
     , scientific
     , text
     , transformers
@@ -75,7 +75,7 @@ test-suite graphql-api-doctests
     , base >=4.9 && <5
     , doctest
     , exceptions
-    , protolude >=0.2
+    , protolude >=0.2.1
     , transformers
   other-modules:
       ASTTests
@@ -110,7 +110,7 @@ test-suite graphql-api-tests
     , exceptions
     , graphql-api
     , hspec
-    , protolude >=0.2
+    , protolude >=0.2.1
     , raw-strings-qq
     , tasty
     , tasty-hspec
@@ -144,7 +144,7 @@ benchmark criterion
     , criterion
     , exceptions
     , graphql-api
-    , protolude >=0.2
+    , protolude >=0.2.1
     , transformers
   other-modules:
       Validation

package.yaml

@@ -20,7 +20,7 @@ default-extensions:
 
 dependencies:
   - base >= 4.9 && < 5
-  - protolude >= 0.2
+  - protolude >= 0.2.1
   - exceptions
   - transformers
   - attoparsec

src/GraphQL/Internal/Schema.hs

@@ -40,7 +40,7 @@ module GraphQL.Internal.Schema
   , lookupType
   ) where
 
-import Protolude
+import Protolude hiding (Type)
 
 import qualified Data.Map as Map
 import GraphQL.Value (Value)

src/GraphQL/Internal/Syntax/AST.hs

@@ -46,7 +46,7 @@ module GraphQL.Internal.Syntax.AST
   , TypeExtensionDefinition(..)
   ) where
 
-import Protolude
+import Protolude hiding (Type)
 
 --import Data.String (IsString(..))
 import Test.QuickCheck (Arbitrary(..), listOf, oneof)

src/GraphQL/Internal/Validation.hs

@@ -58,7 +58,7 @@ module GraphQL.Internal.Validation
   , findDuplicates
   ) where
 
-import Protolude hiding ((<>))
+import Protolude hiding ((<>), throwE)
 
 import Data.List.NonEmpty (NonEmpty(..))
 import qualified Data.List.NonEmpty as NonEmpty

src/GraphQL/Resolver.hs

@@ -30,7 +30,7 @@ module GraphQL.Resolver
 -- - Directives (https://facebook.github.io/graphql/#sec-Type-System.Directives)
 -- - Enforce non-empty lists (might only be doable via value-level validation)
 
-import Protolude hiding (Enum, TypeError)
+import Protolude hiding (Enum, TypeError, throwE)
 
 import qualified Data.Text as Text
 import qualified Data.List.NonEmpty as NonEmpty

stack.yaml

@@ -7,4 +7,4 @@ packages:
   - "./graphql-wai"
 
 extra-deps:
-  - protolude-0.2
+  - protolude-0.2.1