[#85] Remove base-noprelude dependency (#86)

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Summoner
 
+1.0.1
+=====
+
+* [#85](https://github.com/kowainik/summoner/issues/85):
+  Remove `base-noprelude` from dependencies.
+
 1.0.0
 =====
 

app/Main.hs

@@ -1,5 +1,7 @@
 module Main where
 
+import Universum
+
 import System.IO (hSetEncoding, utf8)
 
 import Summoner (summon)

src/Summoner/Ansi.hs

@@ -18,6 +18,8 @@ module Summoner.Ansi
        , skipMessage
        ) where
 
+import Universum
+
 import System.Console.ANSI (Color (..), ColorIntensity (Vivid), ConsoleIntensity (BoldIntensity),
                             ConsoleLayer (Foreground), SGR (..), setSGR)
 import System.IO (hFlush)

src/Summoner/CLI.hs

@@ -8,6 +8,8 @@ module Summoner.CLI
        ( summon
        ) where
 
+import Universum
+
 import Data.Version (showVersion)
 import NeatInterpolation (text)
 import Options.Applicative (Parser, ParserInfo, command, execParser, flag, fullDesc, help, helper,

src/Summoner/Config.hs

@@ -23,6 +23,8 @@ module Summoner.Config
        , loadFileConfig
        ) where
 
+import Universum hiding (Key)
+
 import Control.Exception (throwIO)
 import Data.List (lookup)
 import Data.Monoid (Last (..))

src/Summoner/Default.hs

@@ -8,6 +8,8 @@ module Summoner.Default
        , endLine
        ) where
 
+import Universum
+
 import Data.Time (getCurrentTime, toGregorian, utctDay)
 import System.Directory (getHomeDirectory)
 import System.FilePath ((</>))

src/Summoner/License.hs

@@ -5,6 +5,8 @@ module Summoner.License
        , githubLicenseQueryNames
        ) where
 
+import Universum
+
 import Data.Aeson (FromJSON (..), withObject, (.:))
 
 import qualified Data.Text as T

src/Summoner/Process.hs

@@ -8,6 +8,8 @@ module Summoner.Process
        ( deleteFile
        ) where
 
+import Universum
+
 import Control.Exception (displayException)
 import System.Directory (removeFile, setCurrentDirectory)
 import System.Process (callProcess)

src/Summoner/Project.hs

@@ -6,6 +6,8 @@ module Summoner.Project
        ( generateProject
        ) where
 
+import Universum
+
 import Data.Aeson (decodeStrict)
 import Data.ByteString.Char8 (pack)
 import NeatInterpolation (text)

src/Summoner/ProjectData.hs

@@ -16,6 +16,8 @@ module Summoner.ProjectData
        , yesOrNo
        ) where
 
+import Universum
+
 import Generics.Deriving.Monoid (GMonoid (..))
 import Generics.Deriving.Semigroup (GSemigroup (..))
 

src/Summoner/Question.hs

@@ -17,6 +17,8 @@ module Summoner.Question
        , falseMessage
        ) where
 
+import Universum
+
 import System.Directory (doesPathExist, getCurrentDirectory)
 import System.FilePath ((</>))
 

src/Summoner/Template.hs

@@ -7,6 +7,8 @@ module Summoner.Template
        ( createStackTemplate
        ) where
 
+import Universum
+
 import NeatInterpolation (text)
 
 import Summoner.Default (defaultGHC, endLine)

src/Summoner/Text.hs

@@ -4,6 +4,8 @@ module Summoner.Text
        , headToUpper
        ) where
 
+import Universum
+
 import qualified Data.Char as C
 import qualified Data.Text as T
 

src/Summoner/Tree.hs

@@ -6,6 +6,8 @@ module Summoner.Tree
        , showTree
        ) where
 
+import Universum
+
 import System.Directory (createDirectoryIfMissing, withCurrentDirectory)
 
 -- | Describes simple structure of filesystem tree.

src/Summoner/Validation.hs

@@ -2,6 +2,8 @@ module Summoner.Validation
        ( Validation (..)
        ) where
 
+import Universum
+
 -- | 'Validation' is 'Either' with a Left that is a 'Monoid'
 data Validation e a
   = Failure e

stack-8.4.2.yaml

@@ -1,6 +1 @@
-resolver: nightly-2018-05-28
-
-extra-deps:
-  - base-noprelude-4.11.1.0
-  - tomland-0.2.1
-  - universum-1.2.0
+resolver: nightly-2018-05-30

stack.yaml

@@ -1,7 +1,6 @@
 resolver: lts-11.10
 
 extra-deps:
-  - base-noprelude-4.10.1.0
   - tomland-0.2.1
   - universum-1.2.0
 

summoner.cabal

@@ -1,5 +1,5 @@
 name:                summoner
-version:             1.0.0
+version:             1.0.1
 synopsis:            Tool for creating completely configured production Haskell projects.
 description:         Tool for creating completely configured production Haskell projects.
                      See README.md for details.
@@ -25,8 +25,7 @@ source-repository head
 
 library
   hs-source-dirs:      src
-  exposed-modules:     Prelude
-                       Summoner
+  exposed-modules:     Summoner
                          Summoner.Ansi
                          Summoner.CLI
                          Summoner.Config
@@ -45,7 +44,7 @@ library
   autogen-modules:     Paths_summoner
 
   ghc-options:         -Wall
-  build-depends:       base-noprelude >= 4.9 && < 5
+  build-depends:       base >= 4.9 && < 5
                      , aeson
                      , ansi-terminal
                      , bytestring
@@ -57,13 +56,14 @@ library
                      , process
                      , text
                      , time
-                     , tomland
+                     , tomland >= 0.2.1
                      , universum >= 1.2.0
 
   default-extensions:  DeriveGeneric
                        GeneralizedNewtypeDeriving
                        InstanceSigs
                        LambdaCase
+                       NoImplicitPrelude
                        OverloadedStrings
                        RecordWildCards
 
@@ -73,8 +73,9 @@ executable summon
   hs-source-dirs:      app
   main-is:             Main.hs
   ghc-options:         -Wall -threaded -rtsopts -with-rtsopts=-N
-  build-depends:       base-noprelude
+  build-depends:       base
                      , summoner
+                     , universum
   default-language:    Haskell2010
 
 test-suite summoner-test
@@ -85,7 +86,7 @@ test-suite summoner-test
   other-modules:       Test.DecisionSpec
 
   build-tool-depends:  tasty-discover:tasty-discover
-  build-depends:       base-noprelude
+  build-depends:       base
                      , hedgehog
                      , tasty
                      , tasty-hedgehog

test/Test/DecisionSpec.hs

@@ -1,5 +1,7 @@
 module Test.DecisionSpec where
 
+import Universum
+
 import Hedgehog (MonadGen, forAll, property, (===))
 import Test.Tasty (TestTree)
 import Test.Tasty.Hedgehog (testProperty)