Merge pull request #7 from haskell-works/upgrade-to-hackage@1.4.1

Upgrade to hackage@1.4.1

Author: newhoggy

.circleci/config.yml

@@ -1,9 +1,9 @@
 version: 2.1
 
 orbs:
-  haskell: haskell-works/haskell-build@1.6.5
+  haskell: haskell-works/haskell-build@4.1.7
   github: haskell-works/github-release@1.2.1
-  hackage: haskell-works/hackage@1.0.0
+  hackage: haskell-works/hackage@1.4.1
 
 workflows:
   multiple-ghc-build:
@@ -20,13 +20,18 @@ workflows:
           name: GHC 8.6.4
           executor: haskell/ghc-8_6_4
 
+      - haskell/build:
+          name: GHC 8.8.3
+          executor: haskell/ghc-8_8_3
+
       - github/release-cabal:
           name: GitHub Release
           context: haskell-ci
           requires:
             - GHC 8.2.2
             - GHC 8.4.4
             - GHC 8.6.4
+            - GHC 8.8.3
           checkout: true
           filters:
             branches:

.vscode/tasks.json

@@ -0,0 +1,69 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Build",
+      "type": "shell",
+      "command": "bash",
+      "args": ["-lc", "./project.sh build && echo 'Done'"],
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      },
+      "problemMatcher": {
+        "owner": "haskell",
+        "fileLocation": "relative",
+        "pattern": [
+          {
+            "regexp": "^(.+?):(\\d+):(\\d+):\\s+(error|warning|info):.*$",
+            "file": 1, "line": 2, "column": 3, "severity": 4
+          },
+          {
+            "regexp": "\\s*(.*)$",
+            "message": 1
+          }
+        ]
+      },
+      "presentation": {
+        "echo": false,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": false,
+        "clear": true
+      }
+    },
+    {
+      "label": "Test",
+      "type": "shell",
+      "command": "bash",
+      "args": ["-lc", "./project.sh test && echo 'Done'"],
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "problemMatcher": {
+        "owner": "haskell",
+        "fileLocation": "relative",
+        "pattern": [
+          {
+            "regexp": "^(.+?):(\\d+):(\\d+):.*$",
+            "file": 1, "line": 2, "column": 3, "severity": 4
+          },
+          {
+            "regexp": "\\s*(\\d\\)\\s)?(.*)$",
+            "message": 2
+          }
+        ]
+      },
+      "presentation": {
+        "echo": false,
+        "reveal": "always",
+        "focus": false,
+        "panel": "shared",
+        "showReuseMessage": false,
+        "clear": true
+      }
+    }
+  ]
+}

example-haskell-project.cabal

@@ -1,37 +1,33 @@
 cabal-version:       2.4
 
-name:                example-haskell-project
-version:             0.1.0.0
-synopsis:            Example Haskell Project
-description:         Example Haskell Project that demostrates how to get a simple project up and running with Circle CI.
-homepage:            https://github.com/haskell-works/example-haskell-project
--- bug-reports:
-license:             BSD-3-Clause
-license-file:        LICENSE
-author:              John Ky
-maintainer:          newhoggy@gmail.com
--- copyright:
-category:            Example
-extra-source-files:  CHANGELOG.md
+name:                   example-haskell-project
+version:                0.1.0.0
+synopsis:               Example Haskell Project
+description:            Example Haskell Project that demostrates how to get a simple project up and running with Circle CI.
+homepage:               https://github.com/haskell-works/example-haskell-project
+license:                BSD-3-Clause
+license-file:           LICENSE
+author:                 John Ky
+maintainer:             newhoggy@gmail.com
+copyright:              2016-2020 John Ky
+category:               Example
+extra-source-files:     CHANGELOG.md
 
 source-repository head
   type: git
   location: https://github.com/haskell-works/example-haskell-project
 
+common base                     { build-depends: base                     >= 4          && < 5      }
+
+common config
+  default-language:     Haskell2010
+
 library
-  exposed-modules:
-    Example.Module
-  -- other-modules:
-  -- other-extensions:
-  build-depends:       base ^>= 4.10.1.0
-  hs-source-dirs:      src
-  default-language:    Haskell2010
+  import:               base, config
+  exposed-modules:      Example.Module
+  hs-source-dirs:       src
 
 executable example-haskell-project
-  main-is:             Main.hs
-  -- other-modules:
-  -- other-extensions:
-  build-depends:       base ^>=4.11.1.0
-  hs-source-dirs:      src
-  default-language:    Haskell2010
-
+  import:               base, config
+  main-is:              Main.hs
+  hs-source-dirs:       src

project.sh

@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+CABAL_FLAGS="-j8"
+
+cmd="$1"
+
+shift
+
+cabal-install() {
+  cabal v2-install \
+    -j8 \
+    --installdir="$HOME/.local/bin" \
+    --overwrite-policy=always \
+    --disable-documentation \
+    $CABAL_FLAGS "$@"
+}
+
+cabal-build() {
+  cabal v2-build \
+    --enable-tests \
+    --write-ghc-environment-files=ghc8.4.4+ \
+    $CABAL_FLAGS "$@"
+}
+
+cabal-test() {
+  cabal v2-test \
+    --enable-tests \
+    --test-show-details=direct \
+    $CABAL_FLAGS "$@"
+}
+
+cabal-exec() {
+  cabal v2-exec "$(echo *.cabal | cut -d . -f 1)" "$@"
+}
+
+cabal-bench() {
+  cabal v2-bench -j8 \
+    $CABAL_FLAGS "$@"
+}
+
+cabal-repl() {
+  cabal v2-repl \
+    $CABAL_FLAGS "$@"
+}
+
+cabal-clean() {
+  cabal v2-clean
+}
+
+case "$cmd" in
+  install)
+    cabal-install
+    ;;
+
+  build)
+    cabal-build
+    ;;
+
+  exec)
+    cabal-exec
+    ;;
+
+  test)
+    cabal-build
+    cabal-test
+    ;;
+
+  bench)
+    cabal-bench
+    ;;
+
+  repl)
+    cabal-repl
+    ;;
+
+  clean)
+    cabal-clean
+    ;;
+
+  *)
+    echo "Unrecognised command: $cmd"
+    exit 1
+esac