diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -## [_Unreleased_](https://github.com/frontrowed/faktory_worker_haskell/compare/v1.1.3.0...main) +## [_Unreleased_](https://github.com/frontrowed/faktory_worker_haskell/compare/v1.1.3.1...main) + +## [v1.1.3.1](https://github.com/frontrowed/faktory_worker_haskell/compare/v1.1.3.0...v1.1.3.1) + +- Replace `cryptonite` with `crypton` ## [v1.1.3.0](https://github.com/frontrowed/faktory_worker_haskell/compare/v1.1.2.7...v1.1.3.0) diff --git a/faktory.cabal b/faktory.cabal --- a/faktory.cabal +++ b/faktory.cabal @@ -1,13 +1,13 @@ cabal-version: 1.18 name: faktory -version: 1.1.3.0 +version: 1.1.3.1 license: MIT license-file: LICENSE copyright: 2018 Freckle Education maintainer: engineering@freckle.com author: Freckle Engineering -homepage: https://github.com/frontrowed/faktory_worker_haskell#readme -bug-reports: https://github.com/frontrowed/faktory_worker_haskell/issues +homepage: https://github.com/freckle/faktory_worker_haskell#readme +bug-reports: https://github.com/freckle/faktory_worker_haskell/issues synopsis: Faktory Worker for Haskell description: Haskell client and worker process for the Faktory background job server. @@ -47,7 +47,7 @@ source-repository head type: git - location: https://github.com/frontrowed/faktory_worker_haskell + location: https://github.com/freckle/faktory_worker_haskell library exposed-modules: @@ -90,28 +90,29 @@ -Wno-monomorphism-restriction -Wno-missing-import-lists build-depends: - aeson >=1.4.7.1, + aeson >=2.2.3.0, aeson-casing >=0.2.0.0, base >=4 && <5, - bytestring >=0.10.10.1, - crypton-connection >=0.3.1, - cryptonite >=0.26, + bytestring >=0.12.1.0, + crypton >=1.0.1, + crypton-connection >=0.4.3, + data-default >=0.7.1.3, errors >=2.3.0, - megaparsec >=8.0.0, - memory >=0.15.0, - microlens >=0.4.11.2, - mtl >=2.2.2, - network >=3.1.1.1, - random >=1.1, - resource-pool >=0.2.3.2, - safe-exceptions >=0.1.7.1, + megaparsec >=9.6.1, + memory >=0.18.0, + microlens >=0.4.13.1, + mtl >=2.3.1, + network >=3.2.7.0, + random >=1.2.1.3, + resource-pool >=0.4.0.0, + safe-exceptions >=0.1.7.4, scanner >=0.3.1, semigroups >=0.19.1, - text >=1.2.4.0, - time >=1.9.3, - unix >=2.7.2.2, - unliftio >=0.2.13.1, - unordered-containers >=0.2.10.0 + text >=2.1.1, + time >=1.12.2, + unix >=2.8.6.0, + unliftio >=0.2.25.0, + unordered-containers >=0.2.20 if impl(ghc >=8.10) ghc-options: @@ -144,10 +145,10 @@ -Wno-monomorphism-restriction -Wno-missing-import-lists build-depends: - aeson >=1.4.7.1, + aeson >=2.2.3.0, base >=4 && <5, faktory, - safe-exceptions >=0.1.7.1 + safe-exceptions >=0.1.7.4 if impl(ghc >=8.10) ghc-options: @@ -180,10 +181,10 @@ -Wno-monomorphism-restriction -Wno-missing-import-lists build-depends: - aeson >=1.4.7.1, + aeson >=2.2.3.0, base >=4 && <5, faktory, - safe-exceptions >=0.1.7.1 + safe-exceptions >=0.1.7.4 if impl(ghc >=8.10) ghc-options: @@ -226,14 +227,14 @@ -Wno-monomorphism-restriction -Wno-missing-import-lists -rtsopts build-depends: - aeson >=1.4.7.1, - aeson-qq >=0.8.3, - async >=2.2.2, + aeson >=2.2.3.0, + aeson-qq >=0.8.4, + async >=2.2.5, base >=4 && <5, faktory, - hspec >=2.7.6, - mtl >=2.2.2, - time >=1.9.3 + hspec >=2.11.10, + mtl >=2.3.1, + time >=1.12.2 if impl(ghc >=8.10) ghc-options: @@ -268,10 +269,10 @@ markdown-unlit build-depends: - aeson >=1.4.7.1, + aeson >=2.2.3.0, base >=4 && <5, faktory, - markdown-unlit >=0.5.1 + markdown-unlit >=0.6.0 if impl(ghc >=8.10) ghc-options: diff --git a/library/Faktory/Connection.hs b/library/Faktory/Connection.hs --- a/library/Faktory/Connection.hs +++ b/library/Faktory/Connection.hs @@ -9,6 +9,7 @@ import Faktory.Prelude import Control.Applicative ((<|>)) +import Data.Default (def) import Data.Maybe (fromMaybe) import Data.Void import Network.Connection.Compat @@ -75,13 +76,7 @@ , connectionPort = connectionInfoPort , connectionUseSecure = if connectionInfoTls - then - Just - TLSSettingsSimple - { settingDisableCertificateValidation = False - , settingDisableSession = False - , settingUseServerName = False - } + then Just def else Nothing , connectionUseSocks = Nothing } diff --git a/library/Faktory/Job.hs b/library/Faktory/Job.hs --- a/library/Faktory/Job.hs +++ b/library/Faktory/Job.hs @@ -140,8 +140,6 @@ , "reserve_for" .= joReserveFor jobOptions ] --- brittany-disable-next-binding - instance FromJSON args => FromJSON (Job args) where parseJSON = withObject "Job" $ \o -> Job diff --git a/library/Faktory/JobFailure.hs b/library/Faktory/JobFailure.hs --- a/library/Faktory/JobFailure.hs +++ b/library/Faktory/JobFailure.hs @@ -17,8 +17,6 @@ } deriving stock (Show) --- brittany-disable-next-binding - instance FromJSON JobFailure where parseJSON = withObject "Failure" $ \o -> JobFailure diff --git a/library/Faktory/JobOptions.hs b/library/Faktory/JobOptions.hs --- a/library/Faktory/JobOptions.hs +++ b/library/Faktory/JobOptions.hs @@ -54,8 +54,6 @@ deriving stock (Eq, Show, Generic) deriving (Semigroup, Monoid) via GenericSemigroupMonoid JobOptions --- brittany-disable-next-binding - instance FromJSON JobOptions where parseJSON = withObject "JobOptions" $ \o -> JobOptions diff --git a/library/Network/Connection/Compat.hs b/library/Network/Connection/Compat.hs --- a/library/Network/Connection/Compat.hs +++ b/library/Network/Connection/Compat.hs @@ -13,8 +13,6 @@ import Network.Socket import qualified Network.Socket as S --- brittany --exactprint-only - connectTo :: ConnectionContext -> ConnectionParams -> IO Connection connectTo cg cParams = bracketOnError