Skip to content

Commit

Permalink
Support GHC 9.4 (#1769)
Browse files Browse the repository at this point in the history
* Support GHC 9.4

* tidy it on up

* ok tests pass again

* weird

* woo

* Changelog, cabal files

* fix for older cabal

* Drop MacOS from older resolvers

bravit/hid-examples#7 (comment)

* oops
  • Loading branch information
parsonsmatt authored Sep 7, 2022
1 parent 02a1a56 commit 26a195b
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 5 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@ jobs:
exclude:
- os: windows-latest
args: "--resolver nightly"
- os: macos-latest
args: "--resolver lts-16"
- os: macos-latest
args: "--resolver lts-14"
- os: macos-latest
args: "--resolver lts-12"
- os: macos-latest
args: "--resolver lts-11"

steps:
- name: Clone project
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ tarballs/
# OS X
.DS_Store
*.yaml.lock
dist-newstyle/
15 changes: 15 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
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
4 changes: 3 additions & 1 deletion yesod-bin/AddHandler.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import Data.List (isPrefixOf, isSuffixOf, stripPrefix)
import Data.Maybe (fromMaybe, listToMaybe)
import qualified Data.Text as T
import qualified Data.Text.IO as TIO
#if MIN_VERSION_Cabal(2, 2, 0)
#if MIN_VERSION_Cabal(3, 7, 0)
import Distribution.Simple.PackageDescription (readGenericPackageDescription)
#elif MIN_VERSION_Cabal(2, 2, 0)
import Distribution.PackageDescription.Parsec (readGenericPackageDescription)
#elif MIN_VERSION_Cabal(2, 0, 0)
import Distribution.PackageDescription.Parse (readGenericPackageDescription)
Expand Down
4 changes: 4 additions & 0 deletions yesod-bin/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# ChangeLog for yesod-bin

## 1.6.2.2

* Support Cabal 3.8 [#1769](https://github.com/yesodweb/yesod/pull/1769)

## 1.6.2.1

* Support Cabal 3.6 [#1754](https://github.com/yesodweb/yesod/pull/1754)
Expand Down
5 changes: 4 additions & 1 deletion yesod-bin/Devel.hs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ import Data.String (fromString)
import Data.Time (getCurrentTime)
import qualified Distribution.Package as D
import qualified Distribution.PackageDescription as D
#if MIN_VERSION_Cabal(3,8,0)
import qualified Distribution.Simple.PackageDescription as D
#endif
#if MIN_VERSION_Cabal(2, 2, 0)
import qualified Distribution.PackageDescription.Parsec as D
#else
Expand Down Expand Up @@ -136,7 +139,7 @@ reverseProxy :: DevelOpts -> TVar Int -> IO ()
reverseProxy opts appPortVar = do
manager <- newManager $ managerSetProxy noProxy tlsManagerSettings
let refreshHtml = LB.fromChunks [$(embedFile "refreshing.html")]
sayV = when (verbose opts) . sayString
sayV = when (verbose opts) . sayString
let onExc _ req
| maybe False (("application/json" `elem`) . parseHttpAccept)
(lookup "accept" $ requestHeaders req) =
Expand Down
2 changes: 1 addition & 1 deletion yesod-bin/yesod-bin.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: yesod-bin
version: 1.6.2.1
version: 1.6.2.2
license: MIT
license-file: LICENSE
author: Michael Snoyman <[email protected]>
Expand Down
1 change: 1 addition & 0 deletions yesod-persistent/yesod-persistent.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ test-suite test
main-is: Spec.hs
hs-source-dirs: test
other-modules: Yesod.PersistSpec
build-tool-depends: hspec-discover:hspec-discover
build-depends: base
, hspec
, wai-extra
Expand Down
4 changes: 4 additions & 0 deletions yesod/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# ChangeLog for yesod

## 1.6.2.1

* Support `template-haskell-2.19.0.0` [#1769](https://github.com/yesodweb/yesod/pull/1769)

## 1.6.2

* aeson 2
Expand Down
2 changes: 1 addition & 1 deletion yesod/Yesod/Default/Util.hs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import Yesod.Core -- purposely using complete import so that Haddock will see ad
import Control.Monad (when, unless)
import Conduit
import System.Directory (doesFileExist, createDirectoryIfMissing)
import Language.Haskell.TH.Syntax
import Language.Haskell.TH.Syntax hiding (makeRelativeToProject)
import Text.Lucius (luciusFile, luciusFileReload)
import Text.Julius (juliusFile, juliusFileReload)
import Text.Cassius (cassiusFile, cassiusFileReload)
Expand Down
2 changes: 1 addition & 1 deletion yesod/yesod.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: yesod
version: 1.6.2
version: 1.6.2.1
license: MIT
license-file: LICENSE
author: Michael Snoyman <[email protected]>
Expand Down

0 comments on commit 26a195b

Please sign in to comment.