From dde0c9dedb0d059160d7721e6626db6e0ac7733c Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Fri, 9 Sep 2022 19:00:49 -0400 Subject: [PATCH 1/2] Fix a Windows build error in the test suite The definition of `withApp` was mistakenly guarded behind CPP that is not reachable on Windows, but `withApp` is also needed outside of the CPP. --- test/Web/ScottySpec.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/Web/ScottySpec.hs b/test/Web/ScottySpec.hs index 236ee892..2fcb6c54 100644 --- a/test/Web/ScottySpec.hs +++ b/test/Web/ScottySpec.hs @@ -36,6 +36,7 @@ availableMethods = [GET, POST, HEAD, PUT, PATCH, DELETE, OPTIONS] spec :: Spec spec = do + let withApp = with . scottyApp describe "ScottyM" $ do forM_ [ ("GET", Scotty.get, get) @@ -186,8 +187,6 @@ spec = do ok = "HTTP/1.1 200 OK" no = "HTTP/1.1 404 Not Found" - withApp = with . scottyApp - socketPath :: FilePath socketPath = "/tmp/scotty-test.socket" From 89a38f878e3d8a3c1cd8c12c14a5bb277f157d64 Mon Sep 17 00:00:00 2001 From: "Daniel P. Brice" Date: Thu, 17 Nov 2022 11:12:16 -0800 Subject: [PATCH 2/2] update version numbers --- changelog.md | 3 +++ scotty.cabal | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 88513c3a..465edd7f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,7 @@ ## next [????.??.??] + +## 0.12.1 [2022.11.17] +* Fix CPP bug that prevented tests from building on Windows. * Allow building with `transformers-0.6.*` and `mtl-2.3.*`. Because the `MonadTrans t` class gained a `forall m. Monad m => Monad (t m)` superclass in `transformers-0.6.0.0`, the `MonadTrans` and `MonadTransControl` instances diff --git a/scotty.cabal b/scotty.cabal index 2813f291..2f26494f 100644 --- a/scotty.cabal +++ b/scotty.cabal @@ -1,5 +1,5 @@ Name: scotty -Version: 0.12 +Version: 0.12.1 Synopsis: Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp Homepage: https://github.com/scotty-web/scotty Bug-reports: https://github.com/scotty-web/scotty/issues