diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,4 @@ -# Unreleased +# 0.10.0.0 # 0.7.1.0 diff --git a/lib/Polysemy/Log/Level.hs b/lib/Polysemy/Log/Level.hs --- a/lib/Polysemy/Log/Level.hs +++ b/lib/Polysemy/Log/Level.hs @@ -35,5 +35,5 @@ Sem r a -> Sem r a setLogLevel = - setLogLevelWith (LogMessage.severity . LogEntry.message) + setLogLevelWith @(LogEntry LogMessage) \ m -> m.message.severity {-# inline setLogLevel #-} diff --git a/polysemy-log.cabal b/polysemy-log.cabal --- a/polysemy-log.cabal +++ b/polysemy-log.cabal @@ -1,11 +1,11 @@ cabal-version: 2.2 --- This file has been generated from package.yaml by hpack version 0.35.0. +-- This file has been generated from package.yaml by hpack version 0.35.2. -- -- see: https://github.com/sol/hpack name: polysemy-log -version: 0.9.0.0 +version: 0.10.0.0 synopsis: Polysemy effects for logging description: See https://hackage.haskell.org/package/polysemy-log/docs/Polysemy-Log.html category: Logging @@ -13,13 +13,13 @@ bug-reports: https://github.com/tek/polysemy-log/issues author: Torsten Schmits maintainer: hackage@tryp.io -copyright: 2022 Torsten Schmits +copyright: 2023 Torsten Schmits license: BSD-2-Clause-Patent license-file: LICENSE build-type: Simple extra-source-files: - changelog.md readme.md + changelog.md source-repository head type: git @@ -48,73 +48,46 @@ default-extensions: AllowAmbiguousTypes ApplicativeDo - BangPatterns - BinaryLiterals BlockArguments - ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass - DeriveDataTypeable - DeriveFoldable - DeriveFunctor - DeriveGeneric - DeriveLift - DeriveTraversable DerivingStrategies DerivingVia DisambiguateRecordFields - DoAndIfThenElse DuplicateRecordFields - EmptyCase - EmptyDataDecls - ExistentialQuantification - FlexibleContexts - FlexibleInstances FunctionalDependencies GADTs - GeneralizedNewtypeDeriving - InstanceSigs - KindSignatures LambdaCase LiberalTypeSynonyms - MultiParamTypeClasses MultiWayIf - NamedFieldPuns OverloadedLabels OverloadedLists OverloadedStrings PackageImports PartialTypeSignatures - PatternGuards PatternSynonyms - PolyKinds QuantifiedConstraints QuasiQuotes - RankNTypes RecordWildCards RecursiveDo RoleAnnotations - ScopedTypeVariables - StandaloneDeriving TemplateHaskell - TupleSections - TypeApplications TypeFamilies TypeFamilyDependencies - TypeOperators - TypeSynonymInstances UndecidableInstances UnicodeSyntax ViewPatterns - ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Widentities -Wunused-packages + OverloadedRecordDot + NoFieldSelectors + ghc-options: -Wall -Widentities -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Wredundant-constraints -Wunused-type-patterns -Wunused-packages build-depends: ansi-terminal >=0.10.3 , async - , base >=4.12 && <5 - , incipit-core >=0.4 + , base ==4.* + , incipit-core >=0.4 && <0.6 , polysemy ==1.9.* - , polysemy-conc ==0.12.* + , polysemy-conc >=0.12 && <0.14 , polysemy-time ==0.6.* , stm , time @@ -122,9 +95,9 @@ base hiding (Prelude) , incipit-core (IncipitCore as Prelude) , incipit-core hiding (IncipitCore) - default-language: Haskell2010 + default-language: GHC2021 -test-suite polysemy-log-unit +test-suite polysemy-log-test type: exitcode-stdio-1.0 main-is: Main.hs other-modules: @@ -139,82 +112,55 @@ default-extensions: AllowAmbiguousTypes ApplicativeDo - BangPatterns - BinaryLiterals BlockArguments - ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass - DeriveDataTypeable - DeriveFoldable - DeriveFunctor - DeriveGeneric - DeriveLift - DeriveTraversable DerivingStrategies DerivingVia DisambiguateRecordFields - DoAndIfThenElse DuplicateRecordFields - EmptyCase - EmptyDataDecls - ExistentialQuantification - FlexibleContexts - FlexibleInstances FunctionalDependencies GADTs - GeneralizedNewtypeDeriving - InstanceSigs - KindSignatures LambdaCase LiberalTypeSynonyms - MultiParamTypeClasses MultiWayIf - NamedFieldPuns OverloadedLabels OverloadedLists OverloadedStrings PackageImports PartialTypeSignatures - PatternGuards PatternSynonyms - PolyKinds QuantifiedConstraints QuasiQuotes - RankNTypes RecordWildCards RecursiveDo RoleAnnotations - ScopedTypeVariables - StandaloneDeriving TemplateHaskell - TupleSections - TypeApplications TypeFamilies TypeFamilyDependencies - TypeOperators - TypeSynonymInstances UndecidableInstances UnicodeSyntax ViewPatterns - ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Widentities -Wunused-packages -threaded -rtsopts -with-rtsopts=-N + OverloadedRecordDot + NoFieldSelectors + ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall -Widentities -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Wredundant-constraints -Wunused-type-patterns -Wunused-packages build-depends: - base >=4.12 && <5 - , incipit-core >=0.4 - , polysemy - , polysemy-conc + base ==4.* + , incipit-core >=0.4 && <0.6 + , polysemy ==1.9.* + , polysemy-conc >=0.12 && <0.14 , polysemy-log - , polysemy-plugin - , polysemy-test >=0.6 - , polysemy-time - , tasty + , polysemy-plugin >=0.4.4 && <0.5 + , polysemy-test >=0.6 && <0.9 + , polysemy-time ==0.6.* + , tasty ==1.4.* , time mixins: base hiding (Prelude) , incipit-core (IncipitCore as Prelude) , incipit-core hiding (IncipitCore) - default-language: Haskell2010 + default-language: GHC2021 benchmark space type: exitcode-stdio-1.0 @@ -224,75 +170,48 @@ default-extensions: AllowAmbiguousTypes ApplicativeDo - BangPatterns - BinaryLiterals BlockArguments - ConstraintKinds DataKinds DefaultSignatures DeriveAnyClass - DeriveDataTypeable - DeriveFoldable - DeriveFunctor - DeriveGeneric - DeriveLift - DeriveTraversable DerivingStrategies DerivingVia DisambiguateRecordFields - DoAndIfThenElse DuplicateRecordFields - EmptyCase - EmptyDataDecls - ExistentialQuantification - FlexibleContexts - FlexibleInstances FunctionalDependencies GADTs - GeneralizedNewtypeDeriving - InstanceSigs - KindSignatures LambdaCase LiberalTypeSynonyms - MultiParamTypeClasses MultiWayIf - NamedFieldPuns OverloadedLabels OverloadedLists OverloadedStrings PackageImports PartialTypeSignatures - PatternGuards PatternSynonyms - PolyKinds QuantifiedConstraints QuasiQuotes - RankNTypes RecordWildCards RecursiveDo RoleAnnotations - ScopedTypeVariables - StandaloneDeriving TemplateHaskell - TupleSections - TypeApplications TypeFamilies TypeFamilyDependencies - TypeOperators - TypeSynonymInstances UndecidableInstances UnicodeSyntax ViewPatterns - ghc-options: -Wall -Wredundant-constraints -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Widentities -Wunused-packages -threaded -rtsopts -with-rtsopts=-N + OverloadedRecordDot + NoFieldSelectors + ghc-options: -Wall -Widentities -Wincomplete-uni-patterns -Wmissing-deriving-strategies -Wredundant-constraints -Wunused-type-patterns -Wunused-packages build-depends: - base >=4.12 && <5 - , incipit-core >=0.4 - , polysemy + base ==4.* + , incipit-core >=0.4 && <0.6 + , polysemy ==1.9.* , polysemy-conc , polysemy-log - , polysemy-plugin + , polysemy-plugin >=0.4.4 && <0.5 mixins: base hiding (Prelude) , incipit-core (IncipitCore as Prelude) , incipit-core hiding (IncipitCore) - default-language: Haskell2010 + default-language: GHC2021 diff --git a/test/Polysemy/Log/Test/LogEntryTest.hs b/test/Polysemy/Log/Test/LogEntryTest.hs --- a/test/Polysemy/Log/Test/LogEntryTest.hs +++ b/test/Polysemy/Log/Test/LogEntryTest.hs @@ -35,5 +35,5 @@ test_logEntry = runTestAuto do msgs <- interpretDataLogAtomic @(LogEntry LogMessage) (interpretLogDataLog' prog) - assertEq @_ @IO target (LogEntry.message <$> msgs) - assertEq @_ @IO sourceTarget (formatCaller . LogEntry.source <$> msgs) + assertEq @_ @IO target ((.message) <$> msgs) + assertEq @_ @IO sourceTarget (formatCaller . (.source) <$> msgs)