From 013079ed92e2b6da6e6fadf1117dc42246e0edd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sitko?= Date: Fri, 27 Mar 2020 16:39:01 +0100 Subject: [PATCH] Add scala 2.13 cross build --- build.sbt | 5 +++-- project/build.properties | 2 +- project/plugins.sbt | 2 +- src/main/scala/com/lifeway/aws/lambda/ProxyWithBody.scala | 1 + src/test/scala/com/lifeway/aws/lambda/ErrorsTest.scala | 1 + src/test/scala/com/lifeway/aws/lambda/ProxyNoBodyTest.scala | 1 + .../scala/com/lifeway/aws/lambda/ProxyWithBodyTest.scala | 1 + 7 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index eb8771e..76a14a8 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,8 @@ name := "scala-lambda-handler" organization := "com.lifeway.aws" -scalaVersion := "2.12.8" +scalaVersion := "2.13.1" +crossScalaVersions := Seq("2.12.11", "2.13.1") val circeVersion = "0.12.3" val slf4jVersion = "1.7.26" @@ -12,7 +13,7 @@ libraryDependencies ++= Seq( "org.slf4j" % "slf4j-api" % slf4jVersion, "com.amazonaws" % "aws-lambda-java-core" % "1.2.0", "com.lihaoyi" %% "requests" % "0.2.0", - "com.lihaoyi" %% "utest" % "0.6.3" % "test" + "com.lihaoyi" %% "utest" % "0.7.4" % "test" ) testFrameworks += new TestFramework("utest.runner.Framework") diff --git a/project/build.properties b/project/build.properties index 31334bb..a919a9b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.1 +sbt.version=1.3.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index 45dd360..4cf1887 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.7") diff --git a/src/main/scala/com/lifeway/aws/lambda/ProxyWithBody.scala b/src/main/scala/com/lifeway/aws/lambda/ProxyWithBody.scala index ab101f5..0a1a061 100644 --- a/src/main/scala/com/lifeway/aws/lambda/ProxyWithBody.scala +++ b/src/main/scala/com/lifeway/aws/lambda/ProxyWithBody.scala @@ -5,6 +5,7 @@ import com.amazonaws.services.lambda.runtime.Context import io.circe import io.circe._ import io.circe.parser._ +import com.lifeway.aws.lambda.Errors /** * Abstract Lambda Handler for Scala for API Gateway Proxied requests containing a JSON message body. You must extend diff --git a/src/test/scala/com/lifeway/aws/lambda/ErrorsTest.scala b/src/test/scala/com/lifeway/aws/lambda/ErrorsTest.scala index d3b7254..2b30524 100644 --- a/src/test/scala/com/lifeway/aws/lambda/ErrorsTest.scala +++ b/src/test/scala/com/lifeway/aws/lambda/ErrorsTest.scala @@ -1,5 +1,6 @@ package com.lifeway.aws.lambda +import com.lifeway.aws.lambda.Errors import io.circe._ import io.circe.syntax._ import utest._ diff --git a/src/test/scala/com/lifeway/aws/lambda/ProxyNoBodyTest.scala b/src/test/scala/com/lifeway/aws/lambda/ProxyNoBodyTest.scala index 70deeec..fd89b62 100644 --- a/src/test/scala/com/lifeway/aws/lambda/ProxyNoBodyTest.scala +++ b/src/test/scala/com/lifeway/aws/lambda/ProxyNoBodyTest.scala @@ -1,5 +1,6 @@ package com.lifeway.aws.lambda +import com.lifeway.aws.lambda.Errors import java.io.ByteArrayOutputStream import com.amazonaws.services.lambda.runtime.Context diff --git a/src/test/scala/com/lifeway/aws/lambda/ProxyWithBodyTest.scala b/src/test/scala/com/lifeway/aws/lambda/ProxyWithBodyTest.scala index f8c2279..600f75b 100644 --- a/src/test/scala/com/lifeway/aws/lambda/ProxyWithBodyTest.scala +++ b/src/test/scala/com/lifeway/aws/lambda/ProxyWithBodyTest.scala @@ -1,5 +1,6 @@ package com.lifeway.aws.lambda +import com.lifeway.aws.lambda.Errors import java.io.ByteArrayOutputStream import com.amazonaws.services.lambda.runtime.Context