diff --git a/.azure/azure-linux-template.yml b/.azure/azure-linux-template.yml index 1201b1cf..04a2dbd0 100644 --- a/.azure/azure-linux-template.yml +++ b/.azure/azure-linux-template.yml @@ -5,10 +5,6 @@ jobs: vmImage: ${{ parameters.vmImage }} strategy: matrix: - stack-lts-9: - BUILD: stack - STACK_YAML: stack-lts-9.yaml - ARGS: "--resolver lts-9" stack-lts-11: BUILD: stack STACK_YAML: stack.yaml diff --git a/.azure/azure-osx-template.yml b/.azure/azure-osx-template.yml index ad2c0712..b7e000a1 100644 --- a/.azure/azure-osx-template.yml +++ b/.azure/azure-osx-template.yml @@ -5,10 +5,6 @@ jobs: vmImage: ${{ parameters.vmImage }} strategy: matrix: - stack-lts-9: - BUILD: stack - STACK_YAML: stack-lts-9.yaml - ARGS: "--resolver lts-9" stack-lts-11: BUILD: stack STACK_YAML: stack.yaml diff --git a/stack-lts-9.yaml b/stack-lts-9.yaml deleted file mode 100644 index bceb5f4a..00000000 --- a/stack-lts-9.yaml +++ /dev/null @@ -1,39 +0,0 @@ -resolver: lts-9.21 -packages: -- ./yesod-core -- ./yesod-static -- ./yesod-persistent -- ./yesod-newsfeed -- ./yesod-form -- ./yesod-form-multi -- ./yesod-auth -- ./yesod-auth-oauth -- ./yesod-sitemap -- ./yesod-test -- ./yesod-bin -- ./yesod -- ./yesod-eventsource -- ./yesod-websockets -extra-deps: -- bsb-http-chunked-0.0.0.2@rev:0 -- conduit-1.3.0.2@rev:0 -- conduit-extra-1.3.0@rev:0 -- html-conduit-1.3.0@rev:0 -- http-client-0.5.12.1@rev:0 -- http-conduit-2.3.1@rev:0 -- monad-logger-0.3.28.5@rev:0 -- mono-traversable-1.0.8.1@rev:0 -- persistent-2.8.2@rev:0 -- persistent-sqlite-2.8.1.2@rev:0 -- project-template-0.2.0.1@rev:0 -- resourcet-1.2.1@rev:0 -- rio-0.1.8.0@rev:0 -- streaming-commons-0.2.0.0@rev:0 -- typed-process-0.2.2.0@rev:0 -- unliftio-0.2.7.0@rev:0 -- unliftio-core-0.1.1.0@rev:0 -- wai-extra-3.0.22.1@rev:0 -- wai-logger-2.3.2@rev:0 -- warp-3.2.22@rev:0 -- xml-conduit-1.8.0@rev:0 -- yaml-0.8.30@rev:0 diff --git a/yesod-auth-oauth/yesod-auth-oauth.cabal b/yesod-auth-oauth/yesod-auth-oauth.cabal index 713e43be..4f6487b5 100644 --- a/yesod-auth-oauth/yesod-auth-oauth.cabal +++ b/yesod-auth-oauth/yesod-auth-oauth.cabal @@ -13,15 +13,9 @@ homepage: http://www.yesodweb.com/ description: API docs and the README are available at extra-source-files: README.md ChangeLog.md -flag ghc7 - library - if flag(ghc7) - build-depends: base >= 4.3 && < 5 - cpp-options: -DGHC7 - else - build-depends: base >= 4 && < 4.3 build-depends: authenticate-oauth >= 1.5 && < 1.7 + , base >= 4.10 && < 5 , bytestring >= 0.9.1.4 , text >= 0.7 , unliftio diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index 0fc45986..7e485d6d 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -20,7 +20,7 @@ flag network-uri default: True library - build-depends: base >= 4 && < 5 + build-depends: base >= 4.10 && < 5 , aeson >= 0.7 , authenticate >= 1.3.4 , base16-bytestring diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index 1ebd29b7..49deb0ff 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -24,7 +24,7 @@ executable yesod if os(openbsd) ld-options: -Wl,-zwxneeded - build-depends: base >= 4.3 && < 5 + build-depends: base >= 4.10 && < 5 , Cabal >= 1.18 , bytestring >= 0.9.1.4 , conduit >= 1.3 diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index a5b6af51..7a6cec8c 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -24,7 +24,7 @@ extra-source-files: library hs-source-dirs: src - build-depends: base >= 4.9 && < 5 + build-depends: base >= 4.10 && < 5 , aeson >= 1.0 , auto-update , blaze-html >= 0.5 diff --git a/yesod-eventsource/yesod-eventsource.cabal b/yesod-eventsource/yesod-eventsource.cabal index 29467810..fc74bf26 100644 --- a/yesod-eventsource/yesod-eventsource.cabal +++ b/yesod-eventsource/yesod-eventsource.cabal @@ -14,7 +14,7 @@ description: API docs and the README are available at = 4 && < 5 + build-depends: base >= 4.10 && < 5 , blaze-builder , conduit >= 1.3 , transformers diff --git a/yesod-form-multi/yesod-form-multi.cabal b/yesod-form-multi/yesod-form-multi.cabal index 25cfd536..aa7fe37d 100644 --- a/yesod-form-multi/yesod-form-multi.cabal +++ b/yesod-form-multi/yesod-form-multi.cabal @@ -19,7 +19,7 @@ flag network-uri default: True library - build-depends: base >= 4 && < 5 + build-depends: base >= 4.10 && < 5 , containers >= 0.2 , shakespeare >= 2.0 , text >= 0.9 diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal index 674f1f36..25e59a99 100644 --- a/yesod-form/yesod-form.cabal +++ b/yesod-form/yesod-form.cabal @@ -19,7 +19,7 @@ flag network-uri default: True library - build-depends: base >= 4 && < 5 + build-depends: base >= 4.10 && < 5 , aeson , attoparsec >= 0.10 , blaze-builder >= 0.2.1.4 diff --git a/yesod-newsfeed/yesod-newsfeed.cabal b/yesod-newsfeed/yesod-newsfeed.cabal index 298c2005..1845523b 100644 --- a/yesod-newsfeed/yesod-newsfeed.cabal +++ b/yesod-newsfeed/yesod-newsfeed.cabal @@ -14,7 +14,7 @@ description: API docs and the README are available at = 4 && < 5 + build-depends: base >= 4.10 && < 5 , yesod-core >= 1.6 && < 1.7 , time >= 1.1.4 , shakespeare >= 2.0 diff --git a/yesod-persistent/yesod-persistent.cabal b/yesod-persistent/yesod-persistent.cabal index 492bbefb..99589ba4 100644 --- a/yesod-persistent/yesod-persistent.cabal +++ b/yesod-persistent/yesod-persistent.cabal @@ -14,7 +14,7 @@ description: API docs and the README are available at = 4 && < 5 + build-depends: base >= 4.10 && < 5 , yesod-core >= 1.6 && < 1.7 , persistent >= 2.8 && < 2.11 , persistent-template >= 2.1 && < 2.9 diff --git a/yesod-sitemap/yesod-sitemap.cabal b/yesod-sitemap/yesod-sitemap.cabal index e0f170d2..df63d378 100644 --- a/yesod-sitemap/yesod-sitemap.cabal +++ b/yesod-sitemap/yesod-sitemap.cabal @@ -14,7 +14,7 @@ description: API docs and the README are available at = 4 && < 5 + build-depends: base >= 4.10 && < 5 , conduit , data-default , text diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal index 27b26979..d5e58d7c 100644 --- a/yesod-static/yesod-static.cabal +++ b/yesod-static/yesod-static.cabal @@ -26,7 +26,7 @@ extra-source-files: README.md library - build-depends: base >= 4 && < 5 + build-depends: base >= 4.10 && < 5 , async , attoparsec >= 0.10 , base64-bytestring >= 0.1.0.1 diff --git a/yesod-test/yesod-test.cabal b/yesod-test/yesod-test.cabal index 7bfce05b..f8b9bdc3 100644 --- a/yesod-test/yesod-test.cabal +++ b/yesod-test/yesod-test.cabal @@ -17,7 +17,7 @@ library build-depends: HUnit >= 1.2 , aeson , attoparsec >= 0.10 - , base >= 4.3 && < 5 + , base >= 4.10 && < 5 , blaze-builder , blaze-html >= 0.5 , bytestring >= 0.9 diff --git a/yesod-websockets/yesod-websockets.cabal b/yesod-websockets/yesod-websockets.cabal index 83a63d98..eafe5bc6 100644 --- a/yesod-websockets/yesod-websockets.cabal +++ b/yesod-websockets/yesod-websockets.cabal @@ -14,7 +14,7 @@ extra-source-files: README.md ChangeLog.md library exposed-modules: Yesod.WebSockets - build-depends: base >= 4.5 && < 5 + build-depends: base >= 4.10 && < 5 , conduit >= 1.3 , mtl , transformers >= 0.2 diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index d01e4c8d..192fd2da 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -17,7 +17,7 @@ library if os(windows) cpp-options: -DWINDOWS - build-depends: base >= 4.6 && < 5 + build-depends: base >= 4.10 && < 5 , aeson , bytestring , conduit >= 1.3