diff --git a/cabal/ci.project.local b/cabal/ci.project.local index d0c17a6345b..1edc522c066 100644 --- a/cabal/ci.project.local +++ b/cabal/ci.project.local @@ -28,6 +28,40 @@ package graphql-engine tests: true benchmarks: true +-- Set common options to internal libraries +package aeson-ordered + ghc-options: -j -Werror + +package api-tests + ghc-options: -j -Werror + +package dc-api + ghc-options: -j -Werror + +package graphql-parser + ghc-options: -j -Werror + +package hasura-error-message + ghc-options: -j -Werror + +package hasura-incremental + ghc-options: -j -Werror + +package hasura-prelude + ghc-options: -j -Werror + +package hasura-schema-parsers + ghc-options: -j -Werror + +package pg-client + ghc-options: -j -Werror + +package resource-pool + ghc-options: -j -Werror + +package test-harness + ghc-options: -j -Werror + -- %%%-BEGIN-PRO-ONLY-CONTENT-%%% -- NOTE: diff --git a/cabal/dev-sh.project.local b/cabal/dev-sh.project.local index d95df71e0bb..f0988d68e0d 100644 --- a/cabal/dev-sh.project.local +++ b/cabal/dev-sh.project.local @@ -56,6 +56,7 @@ package Spock package hasql-pool library-vanilla: False +-- Set common options to internal libraries package aeson-ordered ghc-options: -j -Werror @@ -65,28 +66,30 @@ package api-tests package dc-api ghc-options: -j -Werror -package error-message +package graphql-parser ghc-options: -j -Werror -package graphql-parser-hs +package hasura-error-message + ghc-options: -j -Werror + +package hasura-incremental ghc-options: -j -Werror package hasura-prelude ghc-options: -j -Werror -package pg-client-hs +package hasura-schema-parsers ghc-options: -j -Werror -package pool +package pg-client ghc-options: -j -Werror -package schema-parsers +package resource-pool ghc-options: -j -Werror package test-harness ghc-options: -j -Werror - package mysql extra-include-dirs: /opt/homebrew/opt/openssl/include diff --git a/server/lib/aeson-ordered/src/Data/Aeson/Ordered.hs b/server/lib/aeson-ordered/src/Data/Aeson/Ordered.hs index 1d4d7fdd5a0..6bf6ccebce8 100644 --- a/server/lib/aeson-ordered/src/Data/Aeson/Ordered.hs +++ b/server/lib/aeson-ordered/src/Data/Aeson/Ordered.hs @@ -44,7 +44,7 @@ import Data.Attoparsec.ByteString.Char8 qualified as A8 import Data.Bifunctor (bimap, second) import Data.ByteString (ByteString) import Data.ByteString.Lazy qualified as L -import Data.Data (Data, Typeable) +import Data.Data (Data) import Data.Functor (($>)) import Data.HashMap.Strict.InsOrd (InsOrdHashMap) import Data.HashMap.Strict.InsOrd qualified as OMap @@ -83,7 +83,7 @@ import GHC.Generics (Generic) -- | A JSON \"object\" (key\/value map). This is where this type -- differs to the aeson package. newtype Object = Object_ {unObject_ :: InsOrdHashMap Text Value} - deriving stock (Data, Eq, Generic, Read, Show, Typeable) + deriving stock (Data, Eq, Generic, Read, Show) deriving newtype (Hashable) -- | Union the keys, ordered, in two maps, erroring on duplicates. @@ -152,7 +152,7 @@ data Value | Number !Scientific | Bool !Bool | Null - deriving stock (Data, Eq, Generic, Read, Show, Typeable) + deriving stock (Data, Eq, Generic, Read, Show) instance Hashable Value where -- Lifted from Aeson's implementation for 'Value'. diff --git a/server/lib/hasura-incremental/hasura-incremental.cabal b/server/lib/hasura-incremental/hasura-incremental.cabal index 7158f92d039..bdeaf1ddd1e 100644 --- a/server/lib/hasura-incremental/hasura-incremental.cabal +++ b/server/lib/hasura-incremental/hasura-incremental.cabal @@ -95,3 +95,4 @@ test-suite hasura-incremental-tests default-extensions: BlockArguments + NoImplicitPrelude diff --git a/server/lib/hasura-incremental/src/Hasura/Incremental/Internal/Dependency.hs b/server/lib/hasura-incremental/src/Hasura/Incremental/Internal/Dependency.hs index 4a0f8a78a92..4fe33c507e1 100644 --- a/server/lib/hasura-incremental/src/Hasura/Incremental/Internal/Dependency.hs +++ b/server/lib/hasura-incremental/src/Hasura/Incremental/Internal/Dependency.hs @@ -17,7 +17,6 @@ module Hasura.Incremental.Internal.Dependency where import Data.Dependent.Map qualified as DM -import "dependent-sum" Data.GADT.Compare import Data.Reflection import Hasura.Incremental.Select import Hasura.Prelude diff --git a/server/lib/hasura-prelude/src/Hasura/Prelude.hs b/server/lib/hasura-prelude/src/Hasura/Prelude.hs index 5dd9792d987..23229c2e8b9 100644 --- a/server/lib/hasura-prelude/src/Hasura/Prelude.hs +++ b/server/lib/hasura-prelude/src/Hasura/Prelude.hs @@ -102,7 +102,6 @@ import Data.HashMap.Strict qualified as Map import Data.HashMap.Strict.InsOrd as M (InsOrdHashMap) import Data.HashMap.Strict.InsOrd qualified as OMap import Data.HashSet as M (HashSet) -import Data.HashSet qualified as HSet import Data.Hashable as M (Hashable) import Data.List as M ( find, @@ -239,10 +238,10 @@ findWithIndex p l = do pure (v, i) -- TODO (from main): Move to Data.HashMap.Strict.Extended; rename to fromListWith? -mapFromL :: (Eq k, Hashable k) => (a -> k) -> [a] -> Map.HashMap k a +mapFromL :: (Hashable k) => (a -> k) -> [a] -> Map.HashMap k a mapFromL f = Map.fromList . map (\v -> (f v, v)) -oMapFromL :: (Eq k, Hashable k) => (a -> k) -> [a] -> InsOrdHashMap k a +oMapFromL :: (Hashable k) => (a -> k) -> [a] -> InsOrdHashMap k a oMapFromL f = OMap.fromList . map (\v -> (f v, v)) -- | Time an IO action, returning the time with microsecond precision. The