diff --git a/polysemy-log-co.cabal b/polysemy-log-co.cabal --- a/polysemy-log-co.cabal +++ b/polysemy-log-co.cabal @@ -1,25 +1,25 @@ 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.36.1. -- -- see: https://github.com/sol/hpack name: polysemy-log-co -version: 0.9.0.0 -synopsis: Colog adapters for Polysemy.Log -description: See https://hackage.haskell.org/package/polysemy-log-co/docs/Polysemy-Log-Colog.html +version: 0.11.1.0 +synopsis: Colog adapters for polysemy-log +description: See https://hackage.haskell.org/package/polysemy-log-co/docs/Polysemy-Log-Co.html category: Logging homepage: https://github.com/tek/polysemy-log#readme bug-reports: https://github.com/tek/polysemy-log/issues author: Torsten Schmits maintainer: hackage@tryp.io -copyright: 2022 Torsten Schmits +copyright: 2025 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 @@ -36,84 +36,58 @@ 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 + MonadComprehensions 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: - base >=4.12 && <5 - , co-log ==0.5.* - , co-log-concurrent ==0.5.* + base >=4.17.2.1 && <4.21 + , co-log >=0.6.0.0 && <0.7 + , co-log-concurrent >=0.5.1.0 && <0.6 , co-log-polysemy >=0.0.1.3 && <0.1 - , incipit-core >=0.4 - , polysemy - , polysemy-conc ==0.12.* - , polysemy-log - , polysemy-time ==0.6.* - , stm + , incipit-core >=0.4.1.0 && <0.7 + , polysemy >=1.7.0.0 && <1.10 + , polysemy-conc >=0.11.1.0 && <0.15 + , polysemy-log >=0.11.1.0 && <0.12 + , polysemy-time >=0.6.0.0 && <0.8 + , stm >=2.5.1.0 && <2.6 mixins: base hiding (Prelude) , incipit-core (IncipitCore as Prelude) , incipit-core hiding (IncipitCore) - default-language: Haskell2010 + default-language: GHC2021 -test-suite polysemy-log-co-unit +test-suite polysemy-log-co-test type: exitcode-stdio-1.0 main-is: Main.hs other-modules: @@ -125,81 +99,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 + MonadComprehensions 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 - , co-log - , co-log-concurrent - , co-log-polysemy - , incipit-core >=0.4 - , polysemy + base >=4.17.2.1 && <4.21 + , co-log >=0.6.0.0 && <0.7 + , co-log-concurrent >=0.5.1.0 && <0.6 + , co-log-polysemy >=0.0.1.3 && <0.1 + , incipit-core >=0.4.1.0 && <0.7 + , polysemy >=1.7.0.0 && <1.10 , polysemy-log , polysemy-log-co - , polysemy-test >=0.6 - , polysemy-time - , stm - , tasty + , polysemy-test >=0.6.0.0 && <0.11 + , polysemy-time >=0.6.0.0 && <0.8 + , stm >=2.5.1.0 && <2.6 + , tasty >=1.4.2 && <1.6 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/Colog/Test/ConcTest.hs b/test/Polysemy/Log/Colog/Test/ConcTest.hs --- a/test/Polysemy/Log/Colog/Test/ConcTest.hs +++ b/test/Polysemy/Log/Colog/Test/ConcTest.hs @@ -7,8 +7,7 @@ import Polysemy.Log.Colog.Colog (interpretLogColog') import Polysemy.Log.Colog.Conc (interpretCologConcNativeWith) -import qualified Polysemy.Log.Data.LogEntry as LogEntry -import Polysemy.Log.Data.LogEntry (LogEntry) +import Polysemy.Log.Data.LogEntry (LogEntry (..)) import Polysemy.Log.Data.LogMessage (LogMessage (LogMessage)) import qualified Polysemy.Log.Data.Severity as Severity import qualified Polysemy.Log.Effect.Log as Log @@ -32,4 +31,4 @@ let action msg = atomically (modifyTVar' tv (msg :)) interpretCologConcNativeWith @(LogEntry LogMessage) defCapacity (LogAction action) unit (interpretLogColog' prog) msgs <- embed (readTVarIO tv) - assertEq @_ @IO target (LogEntry.message <$> msgs) + assertEq @_ @IO target ((.message) <$> msgs) diff --git a/test/Polysemy/Log/Colog/Test/ExampleTest.hs b/test/Polysemy/Log/Colog/Test/ExampleTest.hs --- a/test/Polysemy/Log/Colog/Test/ExampleTest.hs +++ b/test/Polysemy/Log/Colog/Test/ExampleTest.hs @@ -35,4 +35,4 @@ main = runM do interpretLogStdout progSimple - runLogAction @IO (contramap message logTextStdout) $ interpretDataLogColog @Message progData + runLogAction @IO @Message (contramap (.message) logTextStdout) $ interpretDataLogColog @Message progData diff --git a/test/Polysemy/Log/Colog/Test/SimpleTest.hs b/test/Polysemy/Log/Colog/Test/SimpleTest.hs --- a/test/Polysemy/Log/Colog/Test/SimpleTest.hs +++ b/test/Polysemy/Log/Colog/Test/SimpleTest.hs @@ -5,12 +5,11 @@ import Polysemy.Log.Colog.Atomic (interpretCologAtomic) import Polysemy.Log.Colog.Colog (interpretLogColog) +import Polysemy.Log.Data.LogEntry (LogEntry (..)) +import Polysemy.Log.Data.LogMessage (LogMessage (LogMessage)) +import qualified Polysemy.Log.Data.Severity as Severity import qualified Polysemy.Log.Effect.Log as Log import Polysemy.Log.Effect.Log (Log) -import qualified Polysemy.Log.Data.LogEntry as LogEntry (LogEntry(..)) -import Polysemy.Log.Data.LogEntry (LogEntry) -import Polysemy.Log.Data.LogMessage (LogMessage(LogMessage)) -import qualified Polysemy.Log.Data.Severity as Severity prog :: Members [Log, AtomicState [LogEntry LogMessage]] r => @@ -28,4 +27,4 @@ test_simpleColog = runTestAuto do msgs <- interpretCologAtomic @(LogEntry LogMessage) (interpretTimeGhc (interpretLogColog prog)) - assertEq @_ @IO target (LogEntry.message <$> msgs) + assertEq @_ @IO target ((.message) <$> msgs)