summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfozworth <>2018-03-17 16:30:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2018-03-17 16:30:00 (GMT)
commitc5f293826a880be5860e37250884dec800ca5217 (patch)
treed769bb4eddae51bb2de344f9aabeac81cc4ba112
parentf93d50e856b08adcafcef69185fe8bb9bf777bbe (diff)
version 1.1.71.1.7
-rw-r--r--Setup.hs4
-rw-r--r--autoexporter.cabal27
-rw-r--r--executables/Main.hs4
-rw-r--r--library/Autoexporter.hs (renamed from source/library/Autoexporter.hs)22
-rw-r--r--package.yaml51
-rw-r--r--source/executable/Main.hs5
-rw-r--r--stack.yaml2
7 files changed, 69 insertions, 46 deletions
diff --git a/Setup.hs b/Setup.hs
index 7e9567b..4bebcfd 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,4 +1,4 @@
-import qualified Distribution.Simple
+import qualified Distribution.Simple as Cabal
main :: IO ()
-main = Distribution.Simple.defaultMain
+main = Cabal.defaultMain
diff --git a/autoexporter.cabal b/autoexporter.cabal
index ead1f57..f486559 100644
--- a/autoexporter.cabal
+++ b/autoexporter.cabal
@@ -2,10 +2,10 @@
--
-- see: https://github.com/sol/hpack
--
--- hash: 6a190e6853f9ec9990150e0da0f175b85e6cc8368b98ef113fbcd134e4118087
+-- hash: 1e9db3995746e04f9908a67508f57ba69e6db75f57a9cb90eee2305c73b93cae
name: autoexporter
-version: 1.1.4
+version: 1.1.7
synopsis: Automatically re-export modules.
description: Autoexporter automatically re-exports modules.
category: Utility
@@ -29,13 +29,13 @@ source-repository head
library
hs-source-dirs:
- source/library
- ghc-options: -Wall
+ library
+ ghc-options: -Weverything -Wno-implicit-prelude -Wno-safe -Wno-unsafe
build-depends:
- Cabal >=1.22 && <1.25 || >=2.0 && <2.3
- , base >=4.7 && <4.11
- , directory >=1.2.5 && <1.4
- , filepath >=1.3 && <1.5
+ Cabal >=1.24.0 && <1.25 || >=2.0.1 && <2.3
+ , base >=4.9.0 && <4.12
+ , directory >=1.2.6 && <1.4
+ , filepath >=1.4.1 && <1.5
exposed-modules:
Autoexporter
other-modules:
@@ -45,11 +45,14 @@ library
executable autoexporter
main-is: Main.hs
hs-source-dirs:
- source/executable
- ghc-options: -Wall
+ executables
+ ghc-options: -Weverything -Wno-implicit-prelude -Wno-safe -Wno-unsafe
build-depends:
- autoexporter
- , base
+ Cabal >=1.24.0 && <1.25 || >=2.0.1 && <2.3
+ , autoexporter
+ , base >=4.9.0 && <4.12
+ , directory >=1.2.6 && <1.4
+ , filepath >=1.4.1 && <1.5
other-modules:
Paths_autoexporter
default-language: Haskell2010
diff --git a/executables/Main.hs b/executables/Main.hs
new file mode 100644
index 0000000..70747e9
--- /dev/null
+++ b/executables/Main.hs
@@ -0,0 +1,4 @@
+import qualified Autoexporter
+
+main :: IO ()
+main = Autoexporter.defaultMain
diff --git a/source/library/Autoexporter.hs b/library/Autoexporter.hs
index b3774d2..75fa135 100644
--- a/source/library/Autoexporter.hs
+++ b/library/Autoexporter.hs
@@ -5,7 +5,23 @@
--
-- For more information, please see the README on GitHub:
-- <https://github.com/tfausak/autoexporter#readme>.
-module Autoexporter where
+module Autoexporter
+ ( defaultMain
+ , mainWithArgs
+ , autoexport
+ , findFiles
+ , findFilesDeep
+ , makeModuleName
+ , takeWhileEnd
+ , isModuleName
+ , parseModuleName
+ , makeOutput
+ , isHaskellFile
+ , renderModule
+ , unlines'
+ , renderExport
+ , renderImport
+ ) where
import qualified Data.List as List
import qualified Data.Maybe as Maybe
@@ -19,8 +35,8 @@ import qualified System.FilePath as FilePath
data ExportScope = ExportScopeShallow
| ExportScopeDeep
-main :: IO ()
-main = do
+defaultMain :: IO ()
+defaultMain = do
args <- Environment.getArgs
mainWithArgs args
diff --git a/package.yaml b/package.yaml
index 2128bbc..d0b7526 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,30 +1,35 @@
+name: autoexporter
+version: 1.1.7
+
category: Utility
description: Autoexporter automatically re-exports modules.
-executables:
- autoexporter:
- dependencies:
- - base
- - autoexporter
- main: Main.hs
- source-dirs: source/executable
extra-source-files:
-- CHANGELOG.markdown
-- package.yaml
-- README.markdown
-- stack.yaml
-ghc-options:
-- -Wall
+ - CHANGELOG.markdown
+ - package.yaml
+ - README.markdown
+ - stack.yaml
github: tfausak/autoexporter
-library:
- dependencies:
- - base >=4.7 && <4.11
- - Cabal >=1.22 && <1.25 || >=2.0 && <2.3
- - directory >=1.2.5 && <1.4
- - filepath >=1.3 && <1.5
- source-dirs: source/library
-license: MIT
license-file: LICENSE.markdown
+license: MIT
maintainer: Taylor Fausak
-name: autoexporter
synopsis: Automatically re-export modules.
-version: '1.1.4'
+
+dependencies:
+ base: '>= 4.9.0 && < 4.12'
+ Cabal: '>= 1.24.0 && < 1.25 || >= 2.0.1 && < 2.3'
+ directory: '>= 1.2.6 && < 1.4'
+ filepath: '>= 1.4.1 && < 1.5'
+ghc-options:
+ - -Weverything
+ - -Wno-implicit-prelude
+ - -Wno-safe
+ - -Wno-unsafe
+
+library:
+ source-dirs: library
+
+executable:
+ dependencies:
+ autoexporter: -any
+ main: Main.hs
+ source-dirs: executables
diff --git a/source/executable/Main.hs b/source/executable/Main.hs
deleted file mode 100644
index 463e97f..0000000
--- a/source/executable/Main.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-module Main
- ( module Autoexporter
- ) where
-
-import Autoexporter (main)
diff --git a/stack.yaml b/stack.yaml
index 9ec2eed..64757d9 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1 +1 @@
-resolver: lts-10.0
+resolver: lts-11.0