Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
java: [ '17' ]
scala: [ '2.12.19', '2.13.16', '3.3.5' ]
scala: [ '2.12.x', '2.13.x', '3.x' ]
steps:
- uses: actions/checkout@v4
- name: Setup Java
Expand All @@ -30,7 +30,7 @@ jobs:
- name: Lint code
run: sbt check
- name: Run tests
run: sbt ++${{ matrix.scala }}! test
run: sbt ++${{ matrix.scala }} test

website:
runs-on: ubuntu-latest
Expand Down
13 changes: 5 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ inThisBuild(
)
)

val zioVersion = "2.1.17"
val zioJsonVersion = "0.7.3"
val awsLambdaJavaTests = "1.1.1"
val zioVersion = "2.1.24"
val zioJsonVersion = "0.7.45"
val awsLambdaJavaTests = "1.1.2"

lazy val root =
project
Expand All @@ -51,7 +51,6 @@ lazy val zioLambda = module("zio-lambda", "lambda")
.settings(
stdSettings("zio-lambda"),
scalacOptions -= "-Xfatal-warnings", //temporary disable fatal errors on depricated method calls.
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= Seq(
"com.amazonaws" % "aws-lambda-java-tests" % awsLambdaJavaTests % "test"
)
Expand All @@ -68,7 +67,6 @@ lazy val zioLambdaEvent = module("zio-lambda-event", "lambda-event")
.settings(
stdSettings("zio-lambda-event"),
scalacOptions -= "-Yretain-trees",
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= Seq(
"com.amazonaws" % "aws-lambda-java-tests" % awsLambdaJavaTests % "test"
)
Expand All @@ -80,7 +78,6 @@ lazy val zioLambdaResponse = module("zio-lambda-response", "lambda-response")
.settings(
stdSettings("zio-lambda-response"),
scalacOptions -= "-Yretain-trees",
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")),
libraryDependencies ++= Seq(
"com.amazonaws" % "aws-lambda-java-tests" % awsLambdaJavaTests % "test"
)
Expand Down Expand Up @@ -131,8 +128,8 @@ lazy val docs = project
mainModuleName := (zioLambda / moduleName).value,
projectStage := ProjectStage.Development,
ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(zioLambda, zioLambdaEvent, zioLambdaResponse),
docsPublishBranch := "master",
excludeDependencies += "org.scala-lang.modules" % "scala-collection-compat_2.13"
excludeDependencies += "org.scala-lang.modules" % "scala-collection-compat_2.13",
test := {}
)
.dependsOn(zioLambda, zioLambdaEvent, zioLambdaResponse)
.enablePlugins(WebsitePlugin)
Expand Down
6 changes: 3 additions & 3 deletions project/BuildHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import sbtbuildinfo._
import BuildInfoKeys._

object BuildHelper {
private val Scala212 = "2.12.19"
private val Scala213 = "2.13.16"
private val Scala3 = "3.3.5"
private val Scala212 = "2.12.21"
private val Scala213 = "2.13.18"
private val Scala3 = "3.3.7"

def buildInfoSettings(packageName: String) =
Seq(
Expand Down
14 changes: 7 additions & 7 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.7.2")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.6.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.7.1")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.1")
addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.3.9")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.4")
addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.4.9")

resolvers += Resolver.sonatypeRepo("public")
Loading