[#59] Update cabal, use GHC-8.6.5 (#61)

Upgrade to relude-0.5.0 Upgrade to tomland-1.1.0.1 Resolves #59
kowainik · Jul 25, 2019 · 0d10408 · 0d10408
1 parent d7cc99c
commit 0d10408
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 98 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ cabal.project.local
 .HTF/
 # Stack
 .stack-work/
+stack.yaml.lock
 
 ### IDE/support
 # Vim

diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ language: haskell
 git:
   depth: 5
 
-cabal: "head"
+cabal: "2.4"
 
 cache:
   directories:
@@ -16,10 +16,10 @@ matrix:
   include:
 
   # cabal
-  - ghc: 8.6.3
+  - ghc: 8.6.5
 
   # stack
-  - ghc: 8.6.3
+  - ghc: 8.6.5
     env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
 
 install:
@@ -39,14 +39,14 @@ install:
     fi
 
 script:
+  - curl https://raw.githubusercontent.com/kowainik/relude/988bbdd3a09df1159917012933780523644880e5/.hlint.yaml -o .hlint-relude.yaml
+  - curl -sSL https://raw.github.com/ndmitchell/neil/master/misc/travis.sh | sh -s -- hlint -h .hlint-relude.yaml src/ test/
   - |
     if [ -z "$STACK_YAML" ]; then
        cabal new-test --enable-tests
     else
       stack test --system-ghc --no-terminal
     fi
-  - curl https://raw.githubusercontent.com/kowainik/relude/988bbdd3a09df1159917012933780523644880e5/.hlint.yaml -o .hlint-relude.yaml
-  - curl -sSL https://raw.github.com/ndmitchell/neil/master/misc/travis.sh | sh -s -- hlint -h .hlint-relude.yaml src/ test/
 
 notifications:
   email: false
diff --git a/hintman.cabal b/hintman.cabal
@@ -1,26 +1,55 @@
-cabal-version:       2.0
+cabal-version:       2.4
 name:                hintman
-version:             0.0.0
+version:             0.0.0.0
 synopsis:            GitHub application to suggest hints
 description:         GitHub application to suggest hints
 homepage:            https://github.com/kowainik/hintman
 bug-reports:         https://github.com/kowainik/hintman/issues
 license:             MPL-2.0
 license-file:        LICENSE
-author:              Kowainik
-maintainer:          xrom.xkov@gmail.com
+author:              Veronika Romashkina, Dmitrii Kovanikov
+maintainer:          Kowainik <xrom.xkov@gmail.com>
 copyright:           2018-2019 Kowainik
 category:            GitHub, Webhook
 build-type:          Simple
 extra-doc-files:     README.md
                    , CHANGELOG.md
-tested-with:         GHC == 8.6.3
+tested-with:         GHC == 8.6.5
 
 source-repository head
   type:                git
   location:            https://github.com/kowainik/hintman.git
 
+common common-options
+  build-depends:       base-noprelude ^>= 4.12
+                     , relude ^>= 0.5.0
+
+  ghc-options:         -Wall
+                       -Wincomplete-uni-patterns
+                       -Wincomplete-record-updates
+                       -Wcompat
+                       -Widentities
+                       -Wredundant-constraints
+                       -fhide-source-paths
+                       -Wmissing-export-lists
+                       -Wpartial-fields
+
+  default-language:    Haskell2010
+  default-extensions:  ConstraintKinds
+                       DeriveGeneric
+                       InstanceSigs
+                       GeneralizedNewtypeDeriving
+                       LambdaCase
+                       OverloadedStrings
+                       RecordWildCards
+                       ScopedTypeVariables
+                       StandaloneDeriving
+                       TupleSections
+                       TypeApplications
+                       ViewPatterns
+
 library
+  import:              common-options
   hs-source-dirs:      src
   exposed-modules:     Prelude
                        Hintman
@@ -37,116 +66,41 @@ library
                          Hintman.Suggestion.TrailingNewline
                          Hintman.Suggestion.TrailingSpaces
 
-  build-depends:       base-noprelude ^>= 4.12
-                     , containers
+  build-depends:       containers
                      , optparse-applicative ^>= 0.14.3
                      , jwt ^>= 0.7.2
-                     , relude ^>= 0.4.0
                      , bytestring ^>= 0.10.8.2
                      , servant ^>= 0.15
                      , servant-server ^>= 0.15
                      , text ^>= 1.2.3
-                     , tomland ^>= 1.0.0
+                     , tomland ^>= 1.1.0.1
                      , time >= 1.8 && < 1.10
                      , transformers ^>= 0.5.5.0
                      , wai ^>= 3.2
                      , warp ^>= 3.2
 
-  ghc-options:         -Wall
-                       -Wincomplete-uni-patterns
-                       -Wincomplete-record-updates
-                       -Wcompat
-                       -Widentities
-                       -Wredundant-constraints
-                       -fhide-source-paths
-                       -Wmissing-export-lists
-                       -Wpartial-fields
-
-  default-language:    Haskell2010
-  default-extensions:  ConstraintKinds
-                       DeriveGeneric
-                       GeneralizedNewtypeDeriving
-                       LambdaCase
-                       OverloadedStrings
-                       RecordWildCards
-                       ScopedTypeVariables
-                       StandaloneDeriving
-                       TupleSections
-                       TypeApplications
-                       ViewPatterns
-
 executable hintman
+  import:              common-options
   hs-source-dirs:      app
   main-is:             Main.hs
 
-  build-depends:       base-noprelude
-                     , hintman
-                     , relude
+  build-depends:       hintman
 
-  ghc-options:         -Wall
-                       -threaded
-                       -rtsopts
-                       -with-rtsopts=-N
-                       -Wincomplete-uni-patterns
-                       -Wincomplete-record-updates
-                       -Wcompat
-                       -Widentities
-                       -Wredundant-constraints
-                       -fhide-source-paths
-                       -Wmissing-export-lists
-                       -Wpartial-fields
-
-  default-language:    Haskell2010
-  default-extensions:  ConstraintKinds
-                       DeriveGeneric
-                       GeneralizedNewtypeDeriving
-                       LambdaCase
-                       OverloadedStrings
-                       RecordWildCards
-                       ScopedTypeVariables
-                       StandaloneDeriving
-                       TupleSections
-                       TypeApplications
-                       ViewPatterns
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
 
 test-suite hintman-test
+  import:              common-options
   type:                exitcode-stdio-1.0
   hs-source-dirs:      test
   other-modules:       Test.Config
                        Test.Suggestion
   main-is:             Spec.hs
 
-  build-depends:       base-noprelude
-                     , hedgehog ^>= 0.6
+  build-depends:       hedgehog ^>= 0.6
                      , hintman
                      , hspec ^>= 2.6.1
-                     , relude
                      , silently
                      , text ^>= 1.2.3
                      , temporary
 
-  ghc-options:         -Wall
-                       -threaded
-                       -rtsopts
-                       -with-rtsopts=-N
-                       -Wincomplete-uni-patterns
-                       -Wincomplete-record-updates
-                       -Wcompat
-                       -Widentities
-                       -Wredundant-constraints
-                       -fhide-source-paths
-                       -Wmissing-export-lists
-                       -Wpartial-fields
-
-  default-language:    Haskell2010
-  default-extensions:  ConstraintKinds
-                       DeriveGeneric
-                       GeneralizedNewtypeDeriving
-                       LambdaCase
-                       OverloadedStrings
-                       RecordWildCards
-                       ScopedTypeVariables
-                       StandaloneDeriving
-                       TupleSections
-                       TypeApplications
-                       ViewPatterns
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
diff --git a/stack.yaml b/stack.yaml
@@ -1,8 +1,7 @@
-resolver: lts-13.6
+resolver: lts-13.29
 
 extra-deps:
   - jwt-0.7.2
-  - tomland-1.0.0
-
-ghc-options:
-  "$locals": -fhide-source-paths
+  - relude-0.5.0
+  - tomland-1.1.0.1
+  - parser-combinators-1.1.0 # for tomland