From e40b7351ec88093169f628fcddc0e3f46c74815f Mon Sep 17 00:00:00 2001 From: Adam Wespiser Date: Sun, 12 Jun 2022 13:46:49 -0400 Subject: [PATCH] 0.3.2 Release (#127) (#138) --- .github/workflows/cabal.yml | 2 +- .github/workflows/stack.yml | 2 ++ ChangeLog.md | 5 ++++ Exports.hs | 59 ------------------------------------- protolude.cabal | 30 ++----------------- test_stack_lts.sh | 3 ++ 6 files changed, 13 insertions(+), 88 deletions(-) delete mode 100644 Exports.hs diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml index 228007454..eb87a1545 100644 --- a/.github/workflows/cabal.yml +++ b/.github/workflows/cabal.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ghc: ['9.2', '9.0.1', '8.10.1', '8.8.1', '8.6.5', '8.6.4', '8.6.3', '8.6.2', '8.4.4', '8.2.2', '8.0.2', '7.10.3'] + ghc: ['9.2.2', '9.0.1', '8.10.1', '8.8.1', '8.6.5', '8.6.4', '8.6.3', '8.6.2', '8.4.4', '8.2.2', '8.0.2', '7.10.3'] cabal: ['latest', 3.2] fail-fast: false env: diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml index bdc379116..04c67dedb 100644 --- a/.github/workflows/stack.yml +++ b/.github/workflows/stack.yml @@ -22,6 +22,8 @@ jobs: - { build: stack, resolver: "lts-15" } # ghc-8.8.3 - { build: stack, resolver: "lts-16" } # ghc-8.8.4 - { build: stack, resolver: "lts-17" } # ghc-8.10.4 + - { build: stack, resolver: "lts-18" } # ghc-8.10.7 + - { build: stack, resolver: "lts-19" } # ghc-9.0.2 # - { build: stack, resolver: "" } # use this to include any dependencies from OS package managers include: [] diff --git a/ChangeLog.md b/ChangeLog.md index 9c65bd6e5..1545c7664 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,8 @@ +0.3.2 +==== +* GHC 9.2.2 support +* Drop export executable + 0.3.1 ===== * GHC 9.0.1 and 9.2.1 support diff --git a/Exports.hs b/Exports.hs deleted file mode 100644 index 65c1f7934..000000000 --- a/Exports.hs +++ /dev/null @@ -1,59 +0,0 @@ -{-# LANGUAGE CPP #-} -module Main - ( main, - ) -where - -import Control.Applicative ((<$>)) -import Control.Monad.Trans -import Data.Foldable (concat) -import qualified Data.List as List -import Data.Maybe -import Data.Ord (comparing) -import DynFlags -import GHC -import GhcMonad -import GHC.Paths -import Outputable -import System.FilePath.Posix -import Prelude hiding (concat, mod) - -autoModule :: FilePath -> IO () -autoModule mod = runGhc (Just GHC.Paths.libdir) $ do - dflags <- GHC.getSessionDynFlags -#if (__GLASGOW_HASKELL__ > 706) - _ <- setSessionDynFlags ( dflags `gopt_set` Opt_GhciSandbox ) -#else - _ <- setSessionDynFlags ( dflags `dopt_set` Opt_GhciSandbox ) -#endif - target <- guessTarget ("src" addExtension mod ".hs") Nothing - setTargets [target] - _ <- load LoadAllTargets - modSum <- getModSummary $ mkModuleName mod - p <- GHC.parseModule modSum - t <- typecheckModule p - let modInfo = tm_checked_module_info t - let exports = modInfoExports modInfo - exportThings <- sequence <$> mapM lookupName exports - let sortedThings = List.sortBy (comparing getOccName) (concat exportThings) - GhcMonad.liftIO (mapM_ (showThing dflags) sortedThings) - -showNamed :: NamedThing a => DynFlags -> a -> IO () -showNamed df a = do - let nm = showSDoc df (ppr (getOccName a)) - let mod = showSDoc df (ppr (nameModule (getName a))) - putStrLn (nm ++ " from " ++ mod) - -showThing :: DynFlags -> TyThing -> IO () -showThing df (AnId a) = showNamed df a -#if (__GLASGOW_HASKELL__ > 706) -showThing df (AConLike a) = showNamed df a -#endif -showThing df (ATyCon a) = showNamed df a -showThing _ _ = error "Should never happen." - ---showGhc :: (Outputable a) => a -> String ---showGhc = showPpr unsafeGlobalDynFlags - -main :: IO () -main = autoModule "Protolude" diff --git a/protolude.cabal b/protolude.cabal index 1ccf286f0..faa75cd74 100644 --- a/protolude.cabal +++ b/protolude.cabal @@ -1,5 +1,5 @@ name: protolude -version: 0.3.1 +version: 0.3.2 synopsis: A small prelude. description: A sensible set of defaults for writing custom Preludes. homepage: https://github.com/sdiehl/protolude @@ -23,17 +23,12 @@ tested-with: || ==8.8.1 || ==8.10.1 || ==9.0.1 - || ==9.2.1 + || ==9.2.2 extra-source-files: README.md ChangeLog.md -flag dev - description: Build development tools - manual: True - default: False - source-repository head type: git location: git@github.com:protolude/protolude.git @@ -90,24 +85,3 @@ library hs-source-dirs: src default-language: Haskell2010 - -executable exports - main-is: Exports.hs - default-language: Haskell2010 - - if flag(dev) - buildable: True - - else - buildable: False - - build-depends: - base >=4.6 && <4.15 - , directory - , filepath - , ghc - , ghc-paths - , mtl - , process - , protolude - , transformers diff --git a/test_stack_lts.sh b/test_stack_lts.sh index 306ca73fa..73603409d 100755 --- a/test_stack_lts.sh +++ b/test_stack_lts.sh @@ -14,3 +14,6 @@ stack build --resolver lts-13.0 stack build --resolver lts-14.0 stack build --resolver lts-15.0 stack build --resolver lts-16.0 +stack build --resolver lts-17.0 +stack build --resolver lts-18.0 +stack build --resolver lts-19.0