Update to LTS-19.18 and Aeson 2.x compatibility

aws-lambda-haskell-runtime.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           aws-lambda-haskell-runtime
-version:        4.1.1
+version:        4.1.2
 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

package.yaml

@@ -1,5 +1,5 @@
 name: aws-lambda-haskell-runtime
-version: 4.1.1
+version: 4.1.2
 github: "theam/aws-lambda-haskell-runtime"
 license: Apache-2.0
 author: Nikita Tchayka

src/Aws/Lambda/Runtime/ALB/Types.hs

@@ -20,12 +20,14 @@ import Data.Aeson
     KeyValue ((.=)),
     Object,
     ToJSON (toJSON),
+    Key,
     Value (Null, Object, String),
     eitherDecodeStrict,
     object,
     (.:),
   )
 import Data.Aeson.Types (Parser)
+import Data.Aeson.Key (fromText)
 import qualified Data.Aeson.Types as T
 import qualified Data.CaseInsensitive as CI
 import Data.HashMap.Strict (HashMap)
@@ -59,7 +61,7 @@ instance FromJSON body => FromJSON (ALBRequest body) where
   parseJSON = parseALBRequest parseObjectFromStringField
 
 -- We need this because API Gateway is going to send us the payload as a JSON string
-parseObjectFromStringField :: FromJSON a => Object -> Text -> Parser (Maybe a)
+parseObjectFromStringField :: FromJSON a => Object -> Key -> Parser (Maybe a)
 parseObjectFromStringField obj fieldName = do
   fieldContents <- obj .: fieldName
   case fieldContents of
@@ -70,7 +72,7 @@ parseObjectFromStringField obj fieldName = do
     Null -> pure Nothing
     other -> T.typeMismatch "String or Null" other
 
-parseALBRequest :: (Object -> Text -> Parser (Maybe body)) -> Value -> Parser (ALBRequest body)
+parseALBRequest :: (Object -> Key -> Parser (Maybe body)) -> Value -> Parser (ALBRequest body)
 parseALBRequest bodyParser (Object v) =
   ALBRequest
     <$> v .: "path"
@@ -167,5 +169,5 @@ mkALBResponse code headers payload =
 headerToPair :: Header -> T.Pair
 headerToPair (cibyte, bstr) = k .= v
   where
-    k = (T.decodeUtf8 . CI.original) cibyte
+    k = fromText $ (T.decodeUtf8 . CI.original) cibyte
     v = T.decodeUtf8 bstr

src/Aws/Lambda/Runtime/APIGateway/Types.hs

@@ -22,13 +22,15 @@ import Data.Aeson
     KeyValue ((.=)),
     Object,
     ToJSON (toJSON),
+    Key,
     Value (Null, Object, String),
     eitherDecodeStrict,
     object,
     (.:),
     (.:?)
   )
 import Data.Aeson.Types (Parser)
+import Data.Aeson.Key (fromText)
 import qualified Data.Aeson.Types as T
 import qualified Data.CaseInsensitive as CI
 import Data.HashMap.Strict (HashMap)
@@ -70,7 +72,7 @@ instance FromJSON body => FromJSON (ApiGatewayRequest body) where
   parseJSON = parseApiGatewayRequest parseObjectFromStringField
 
 -- We need this because API Gateway is going to send us the payload as a JSON string
-parseObjectFromStringField :: FromJSON a => Object -> Text -> Parser (Maybe a)
+parseObjectFromStringField :: FromJSON a => Object -> Key -> Parser (Maybe a)
 parseObjectFromStringField obj fieldName = do
   fieldContents <- obj .: fieldName
   case fieldContents of
@@ -81,7 +83,7 @@ parseObjectFromStringField obj fieldName = do
     Null -> pure Nothing
     other -> T.typeMismatch "String or Null" other
 
-parseApiGatewayRequest :: (Object -> Text -> Parser (Maybe body)) -> Value -> Parser (ApiGatewayRequest body)
+parseApiGatewayRequest :: (Object -> Key -> Parser (Maybe body)) -> Value -> Parser (ApiGatewayRequest body)
 parseApiGatewayRequest bodyParser (Object v) =
   ApiGatewayRequest
     <$> v .: "resource"
@@ -215,5 +217,5 @@ mkApiGatewayResponse code headers payload =
 headerToPair :: Header -> T.Pair
 headerToPair (cibyte, bstr) = k .= v
   where
-    k = (T.decodeUtf8 . CI.original) cibyte
+    k = fromText $ (T.decodeUtf8 . CI.original) cibyte
     v = T.decodeUtf8 bstr

stack.yaml

@@ -17,7 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-16.12
+resolver: lts-19.24
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.

stack.yaml.lock

@@ -34,7 +34,7 @@ packages:
     hackage: megaparsec-7.0.5@sha256:45e1f1348fab2783646fdb4d9e6097568981a740951c7356d36d794e2baba305,3902
 snapshots:
 - completed:
-    size: 532377
-    url: https://github.com/raw/commercialhaskell/stackage-snapshots/master/lts/16/12.yaml
-    sha256: f914cfa23fef85bdf895e300a8234d9d0edc2dbec67f4bc9c53f85867c50eab6
-  original: lts-16.12
+    size: 619403
+    url: https://github.com/raw/commercialhaskell/stackage-snapshots/master/lts/19/24.yaml
+    sha256: 98f5bee5bf07ff25263d7061e03c34595bfca543b611f9d3da5c95f2a6c8d723
+  original: lts-19.24