From 41bcace5fcab33de47c9d7b3c2aac1c06b238a94 Mon Sep 17 00:00:00 2001 From: Daniel Brice Date: Wed, 4 Nov 2020 14:01:57 -0800 Subject: [PATCH 1/4] support persistent 2.11 --- yesod-auth/yesod-auth.cabal | 4 ++-- yesod-persistent/yesod-persistent.cabal | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index 5de976ec..f936ca85 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -1,5 +1,5 @@ name: yesod-auth -version: 1.6.10 +version: 1.6.10.1 license: MIT license-file: LICENSE author: Michael Snoyman, Patrick Brisbin @@ -43,7 +43,7 @@ library , http-types , memory , nonce >= 1.0.2 && < 1.1 - , persistent >= 2.8 && < 2.11 + , persistent >= 2.8 && < 2.12 , random >= 1.0.0.2 , safe , shakespeare diff --git a/yesod-persistent/yesod-persistent.cabal b/yesod-persistent/yesod-persistent.cabal index 99589ba4..99492cf0 100644 --- a/yesod-persistent/yesod-persistent.cabal +++ b/yesod-persistent/yesod-persistent.cabal @@ -1,5 +1,5 @@ name: yesod-persistent -version: 1.6.0.4 +version: 1.6.0.5 license: MIT license-file: LICENSE author: Michael Snoyman @@ -16,7 +16,7 @@ extra-source-files: README.md ChangeLog.md library build-depends: base >= 4.10 && < 5 , yesod-core >= 1.6 && < 1.7 - , persistent >= 2.8 && < 2.11 + , persistent >= 2.8 && < 2.12 , persistent-template >= 2.1 && < 2.9 , transformers >= 0.2.2 , blaze-builder From 0a338177fed6378fba227404784887314822427a Mon Sep 17 00:00:00 2001 From: Daniel Brice Date: Wed, 4 Nov 2020 14:15:21 -0800 Subject: [PATCH 2/4] bump persistent-template --- yesod-persistent/yesod-persistent.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yesod-persistent/yesod-persistent.cabal b/yesod-persistent/yesod-persistent.cabal index 99492cf0..37640d9b 100644 --- a/yesod-persistent/yesod-persistent.cabal +++ b/yesod-persistent/yesod-persistent.cabal @@ -17,7 +17,7 @@ library build-depends: base >= 4.10 && < 5 , yesod-core >= 1.6 && < 1.7 , persistent >= 2.8 && < 2.12 - , persistent-template >= 2.1 && < 2.9 + , persistent-template >= 2.1 && < 2.10 , transformers >= 0.2.2 , blaze-builder , conduit From 46f8879a0a14af98868e6053d6af362a1db38aca Mon Sep 17 00:00:00 2001 From: Daniel Brice Date: Wed, 4 Nov 2020 14:18:23 -0800 Subject: [PATCH 3/4] add language extensions (how did this compile before?) --- yesod-persistent/test/Yesod/PersistSpec.hs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yesod-persistent/test/Yesod/PersistSpec.hs b/yesod-persistent/test/Yesod/PersistSpec.hs index 6164d0d6..a08e475a 100644 --- a/yesod-persistent/test/Yesod/PersistSpec.hs +++ b/yesod-persistent/test/Yesod/PersistSpec.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE FlexibleInstances #-} +{-# LANGUAGE DataKinds #-} {-# LANGUAGE OverloadedStrings, TemplateHaskell, QuasiQuotes, TypeFamilies #-} {-# LANGUAGE EmptyDataDecls, FlexibleContexts, GADTs #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} From 3a44d47acf371eece5a349283029f31f2b580b16 Mon Sep 17 00:00:00 2001 From: Daniel Brice Date: Thu, 5 Nov 2020 18:06:52 -0800 Subject: [PATCH 4/4] link to PR in changelog --- yesod-auth/ChangeLog.md | 4 ++++ yesod-persistent/ChangeLog.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/yesod-auth/ChangeLog.md b/yesod-auth/ChangeLog.md index faa0733f..fb9d5391 100644 --- a/yesod-auth/ChangeLog.md +++ b/yesod-auth/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog for yesod-auth +## 1.6.10.1 + +* Add support for Persistent 2.11 [#1701](https://github.com/yesodweb/yesod/pull/1701) + ## 1.6.10 * Updated `AuthMessage` data type in `Yesod.Auth.Message` to accommodate registration flow where password is supplied initially: deprecated `AddressVerified` and split into `EmailVerifiedChangePass` and `EmailVerified` diff --git a/yesod-persistent/ChangeLog.md b/yesod-persistent/ChangeLog.md index 3ba8a38e..1aaa6c63 100644 --- a/yesod-persistent/ChangeLog.md +++ b/yesod-persistent/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog for yesod-persistent +## 1.6.0.5 + +* Add support for Persistent 2.11 [#1701](https://github.com/yesodweb/yesod/pull/1701) + ## 1.6.0.4 * Fix test suite to be compatible with latest `persistent-template`