From f6ea77118a100ce81a20602179a0838e092598a4 Mon Sep 17 00:00:00 2001 From: Melanie Phoenix Date: Tue, 28 Feb 2023 11:07:01 -0500 Subject: [PATCH 1/3] no StarIsType --- yesod-auth/Yesod/Auth.hs | 3 ++- yesod-core/src/Yesod/Core/Handler.hs | 3 ++- yesod-core/src/Yesod/Core/Widget.hs | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs index 933e76f8..005f66dd 100644 --- a/yesod-auth/Yesod/Auth.hs +++ b/yesod-auth/Yesod/Auth.hs @@ -73,6 +73,7 @@ import Control.Exception (Exception) import Network.HTTP.Types (Status, internalServerError500, unauthorized401) import qualified Control.Monad.Trans.Writer as Writer import Control.Monad (void) +import Data.Kind (Type) type AuthRoute = Route Auth @@ -532,7 +533,7 @@ class (YesodAuth master, YesodPersist master) => YesodAuthPersist master where -- > AuthEntity MySite ~ User -- -- @since 1.2.0 - type AuthEntity master :: * + type AuthEntity master :: Type type AuthEntity master = KeyEntity (AuthId master) getAuthEntity :: (MonadHandler m, HandlerSite m ~ master) diff --git a/yesod-core/src/Yesod/Core/Handler.hs b/yesod-core/src/Yesod/Core/Handler.hs index d6ad08da..5a43858d 100644 --- a/yesod-core/src/Yesod/Core/Handler.hs +++ b/yesod-core/src/Yesod/Core/Handler.hs @@ -245,6 +245,7 @@ import Text.Blaze.Html (preEscapedToHtml, toHtml) import qualified Data.IORef as I import Data.Maybe (listToMaybe, mapMaybe) import Data.Typeable (Typeable) +import Data.Kind (Type) import Web.PathPieces (PathPiece(..)) import Yesod.Core.Class.Handler import Yesod.Core.Types @@ -261,7 +262,7 @@ import qualified Data.Word8 as W8 import qualified Data.Foldable as Fold import Control.Monad.Logger (MonadLogger, logWarnS) -type HandlerT site (m :: * -> *) = HandlerFor site +type HandlerT site (m :: Type -> Type) = HandlerFor site {-# DEPRECATED HandlerT "Use HandlerFor directly" #-} get :: MonadHandler m => m GHState diff --git a/yesod-core/src/Yesod/Core/Widget.hs b/yesod-core/src/Yesod/Core/Widget.hs index 0220606a..f20a9983 100644 --- a/yesod-core/src/Yesod/Core/Widget.hs +++ b/yesod-core/src/Yesod/Core/Widget.hs @@ -66,6 +66,7 @@ import Yesod.Routes.Class import Yesod.Core.Handler (getMessageRender, getUrlRenderParams) import Text.Shakespeare.I18N (RenderMessage) import Data.Text (Text) +import Data.Kind (Type) import qualified Data.Map as Map import Language.Haskell.TH.Quote (QuasiQuoter) import Language.Haskell.TH.Syntax (Q, Exp (InfixE, VarE, LamE, AppE), Pat (VarP), newName) @@ -79,7 +80,7 @@ import qualified Data.Text.Lazy.Builder as TB import Yesod.Core.Types import Yesod.Core.Class.Handler -type WidgetT site (m :: * -> *) = WidgetFor site +type WidgetT site (m :: Type -> Type) = WidgetFor site {-# DEPRECATED WidgetT "Use WidgetFor directly" #-} preEscapedLazyText :: TL.Text -> Html From ef58df42c6f845371cb942e8120d467b8c9cb6a9 Mon Sep 17 00:00:00 2001 From: Melanie Phoenix Date: Tue, 28 Feb 2023 11:18:52 -0500 Subject: [PATCH 2/3] bump versions --- yesod-auth/yesod-auth.cabal | 2 +- yesod-core/yesod-core.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index 8ee16554..c0fda1e7 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -1,6 +1,6 @@ cabal-version: >=1.10 name: yesod-auth -version: 1.6.11 +version: 1.6.11.1 license: MIT license-file: LICENSE author: Michael Snoyman, Patrick Brisbin diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 9910bea2..4aa6b021 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.6.24.1 +version: 1.6.24.2 license: MIT license-file: LICENSE author: Michael Snoyman From ee343e616e90fe5707ec52b1b009e00c42693d17 Mon Sep 17 00:00:00 2001 From: Melanie Phoenix Date: Tue, 28 Feb 2023 11:23:25 -0500 Subject: [PATCH 3/3] changelogs --- yesod-auth/ChangeLog.md | 4 ++++ yesod-core/ChangeLog.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/yesod-auth/ChangeLog.md b/yesod-auth/ChangeLog.md index c354c31f..20158c85 100644 --- a/yesod-auth/ChangeLog.md +++ b/yesod-auth/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog for yesod-auth +## 1.6.11.1 + +* No star is type [#1797](https://github.com/yesodweb/yesod/pull/1797) + ## 1.6.11 * Add support for aeson 2 diff --git a/yesod-core/ChangeLog.md b/yesod-core/ChangeLog.md index 988dd27e..ced20414 100644 --- a/yesod-core/ChangeLog.md +++ b/yesod-core/ChangeLog.md @@ -1,5 +1,9 @@ # ChangeLog for yesod-core +## 1.6.24.2 + +* No star is type [#1797](https://github.com/yesodweb/yesod/pull/1797) + ## 1.6.24.1 * Adapt to removal of `ListT` from transformers-0.6. [#1796](https://github.com/yesodweb/yesod/pull/1796)