4.0.0 - Simpler lambdas and the death of Template Haskell

.github/workflows/ci.yml

@@ -12,30 +12,34 @@ jobs:
     runs-on: ubuntu-16.04
     strategy:
       matrix:
-        cabal: ["2.4"]
+        cabal: ["3.2"]
         ghc:
-          - "8.6.5"
+          - "8.10.1"
 
     steps:
-    - uses: actions/checkout@v2
-      if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
+      - uses: actions/checkout@v2
+        if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
 
-    - uses: actions/setup-haskell@v1
-      name: Setup Haskell
-      with:
-        ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
+      - uses: actions/setup-haskell@v1
+        name: Setup Haskell
+        with:
+          ghc-version: ${{ matrix.ghc }}
+          cabal-version: ${{ matrix.cabal }}
 
-    - uses: actions/cache@v1
-      name: Cache ~/.cabal/store
-      with:
-        path: ~/.cabal/store
-        key: ${{ runner.os }}-${{ matrix.ghc }}-cabal
+      - uses: actions/cache@v1
+        name: Cache ~/.cabal/store
+        with:
+          path: ~/.cabal/store
+          key: ${{ runner.os }}-${{ matrix.ghc }}-cabal
 
-    - name: Build
-      run: |
-        cabal v2-update
-        cabal v2-build --enable-tests --enable-benchmarks
-    - name: Test
-      run: |
-        cabal v2-test --enable-tests
+      - name: Install hspec-discover
+        run: |
+          cabal v1-install hspec-discover
+
+      - name: Build
+        run: |
+          cabal v2-update
+          cabal v2-build --enable-tests --enable-benchmarks
+      - name: Test
+        run: |
+          cabal v2-test --enable-tests

.gitignore

@@ -10,6 +10,7 @@ dist-*
 cabal-dev
 *.o
 *.hi
+*.hie
 *.chi
 *.chs.h
 *.dyn_o

aws-lambda-haskell-runtime.cabal

@@ -1,21 +1,14 @@
-cabal-version: 1.12
-
--- This file has been generated from package.yaml by hpack version 0.34.1.
---
--- see: https://github.com/sol/hpack
---
--- hash: c833537a67bfa0d976f4297649380558f7db943dcac5a1b180e2ee2401abb3f7
-
+cabal-version:  2.2
 name:           aws-lambda-haskell-runtime
-version:        3.0.4
+version:        4.0.0
 synopsis:       Haskell runtime for AWS Lambda
 description:    Please see the README on GitHub at <https://github.com/theam/aws-lambda-haskell-runtime#readme>
 category:       AWS
 homepage:       https://github.com/theam/aws-lambda-haskell-runtime#readme
 bug-reports:    https://github.com/theam/aws-lambda-haskell-runtime/issues
 author:         Nikita Tchayka
 maintainer:     [email protected]
-copyright:      2018 The Agile Monkeys SL
+copyright:      2020 The Agile Monkeys SL
 license:        Apache-2.0
 license-file:   LICENSE
 build-type:     Simple
@@ -26,57 +19,100 @@ source-repository head
   type: git
   location: https://github.com/theam/aws-lambda-haskell-runtime
 
+common common-options
+  build-depends:       base >= 4.14 && < 4.15
+
+  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:
+                       BangPatterns
+                       BinaryLiterals
+                       ConstraintKinds
+                       DataKinds
+                       DefaultSignatures
+                       DeriveDataTypeable
+                       DeriveFoldable
+                       DeriveFunctor
+                       DeriveGeneric
+                       DerivingStrategies
+                       DeriveTraversable
+                       DoAndIfThenElse
+                       DuplicateRecordFields
+                       EmptyDataDecls
+                       ExistentialQuantification
+                       FlexibleContexts
+                       FlexibleInstances
+                       FunctionalDependencies
+                       GADTs
+                       GeneralisedNewtypeDeriving
+                       InstanceSigs
+                       KindSignatures
+                       LambdaCase
+                       MultiParamTypeClasses
+                       MultiWayIf
+                       NamedFieldPuns
+                       OverloadedStrings
+                       PartialTypeSignatures
+                       PatternGuards
+                       PolyKinds
+                       QuasiQuotes
+                       RankNTypes
+                       RecordWildCards
+                       ScopedTypeVariables
+                       StandaloneDeriving
+                       TemplateHaskell
+                       TupleSections
+                       TypeFamilies
+                       TypeSynonymInstances
+                       ViewPatterns
+
 library
+  import:              common-options
   exposed-modules:
       Aws.Lambda
       Aws.Lambda.Runtime
+      Aws.Lambda.Events
   other-modules:
-      Aws.Lambda.Configuration
-      Aws.Lambda.Meta.Common
-      Aws.Lambda.Meta.Discover
-      Aws.Lambda.Meta.Dispatch
-      Aws.Lambda.Meta.Main
-      Aws.Lambda.Meta.Run
+      Aws.Lambda.Events.ApiGateway
       Aws.Lambda.Runtime.API.Endpoints
       Aws.Lambda.Runtime.API.Version
-      Aws.Lambda.Runtime.ApiGatewayInfo
       Aws.Lambda.Runtime.ApiInfo
       Aws.Lambda.Runtime.Common
       Aws.Lambda.Runtime.Context
       Aws.Lambda.Runtime.Environment
       Aws.Lambda.Runtime.Error
       Aws.Lambda.Runtime.Publish
       Aws.Lambda.Utilities
-      Paths_aws_lambda_haskell_runtime
   hs-source-dirs:
       src
-  default-extensions: TemplateHaskell OverloadedStrings RecordWildCards ScopedTypeVariables DeriveGeneric TypeApplications FlexibleContexts DeriveAnyClass QuasiQuotes
-  ghc-options: -Wall -fno-warn-orphans -optP-Wno-nonportable-include-path -Wincomplete-uni-patterns -Wincomplete-record-updates -Wcompat -Widentities -Wredundant-constraints -Wmissing-export-lists -Wpartial-fields -fhide-source-paths -freverse-errors
   build-depends:
       aeson
-    , base >=4.7 && <5
     , bytestring
     , case-insensitive
     , http-client
     , http-types
     , path >0.7
     , path-io
-    , safe-exceptions-checked
     , template-haskell
     , text
     , unordered-containers
   default-language: Haskell2010
 
 test-suite aws-lambda-haskell-runtime-test
+  import:              common-options
   type: exitcode-stdio-1.0
   main-is: Spec.hs
-  other-modules:
-      Paths_aws_lambda_haskell_runtime
   hs-source-dirs:
       test
-  default-extensions: TemplateHaskell OverloadedStrings RecordWildCards ScopedTypeVariables DeriveGeneric TypeApplications FlexibleContexts DeriveAnyClass QuasiQuotes
-  ghc-options: -Wall -fno-warn-orphans -optP-Wno-nonportable-include-path -Wincomplete-uni-patterns -Wincomplete-record-updates -Wcompat -Widentities -Wredundant-constraints -Wmissing-export-lists -Wpartial-fields -fhide-source-paths -freverse-errors -threaded -rtsopts -with-rtsopts=-N
   build-depends:
-      base >=4.7 && <5
-    , hspec
+      hspec
+    , hspec-discover
   default-language: Haskell2010

hie.yaml

@@ -0,0 +1,7 @@
+cradle:
+  stack:
+    - path: "./src"
+      component: "aws-lambda-haskell-runtime:lib"
+
+    - path: "./test"
+      component: "aws-lambda-haskell-runtime:test:aws-lambda-haskell-runtime-test"

src/Aws/Lambda.hs

@@ -1,8 +1,8 @@
 module Aws.Lambda
-  ( module Reexported
-  ) where
+  ( module Reexported,
+  )
+where
 
-import Aws.Lambda.Configuration as Reexported
 import Aws.Lambda.Runtime as Reexported
+import Aws.Lambda.Events as Reexported
 import Aws.Lambda.Runtime.Context as Reexported
-import Aws.Lambda.Runtime.ApiGatewayInfo as Reexported

src/Aws/Lambda/Events.hs

@@ -0,0 +1,5 @@
+module Aws.Lambda.Events
+  ( module Aws.Lambda.Events.ApiGateway )
+  where
+
+import Aws.Lambda.Events.ApiGateway