diff --git a/.github/scala-steward.conf b/.github/scala-steward.conf index f4a5c024..a7779b9b 100644 --- a/.github/scala-steward.conf +++ b/.github/scala-steward.conf @@ -10,3 +10,5 @@ updates.pin = [ # Prevent updates to 3.2.x and beyond { groupId = "org.scalatest", artifactId = "scalatest", version = "3.1."} ] + +updatePullRequests = false diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 9b8306b5..ec275ba7 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -38,8 +38,8 @@ jobs: - "check-docs" uses: playframework/.github/.github/workflows/cmd.yml@v3 with: - java: 11, 8 - scala: 2.12.x, 2.13.x + java: 17, 11 + scala: 2.13.x cmd: sbt ++$MATRIX_SCALA test finish: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 911e825c..db1edc72 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -9,5 +9,5 @@ on: jobs: publish-artifacts: name: Publish / Artifacts - uses: playframework/.github/.github/workflows/publish.yml@v2 + uses: playframework/.github/.github/workflows/publish.yml@v3 secrets: inherit diff --git a/build.sbt b/build.sbt index 84b47fbc..535cf828 100644 --- a/build.sbt +++ b/build.sbt @@ -116,6 +116,7 @@ val playGenerators = Project(id = "play-grpc-generators", file("play-generators" buildInfoPackage := "play.grpc.gen", // Only used in build tools (like sbt), so only 2.12 is needed: crossScalaVersions := Seq(scala212), + scalaVersion := scala212, ) val playTestkit = Project("play-grpc-testkit", file("play-testkit")) diff --git a/project/CommonPlugin.scala b/project/CommonPlugin.scala index 8585aacb..d64c6e1b 100644 --- a/project/CommonPlugin.scala +++ b/project/CommonPlugin.scala @@ -18,7 +18,8 @@ object CommonPlugin extends AutoPlugin { Nil }, doc / javacOptions --= Seq("-Xlint:unchecked", "-Xlint:deprecation"), - crossScalaVersions := Seq(scala212, scala213), + crossScalaVersions := Seq(scala213), + scalaVersion := scala213, ) val scalaVersionNumber = Def.setting(VersionNumber(scalaVersion.value)) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 16efb8f2..b83f5580 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -20,10 +20,10 @@ object Dependencies { val akkaGrpc = AkkaGrpcBuildInfo.version val grpc = AkkaGrpcBuildInfo.grpcVersion - val play = "2.8.21" + val play = "2.9.1" - val scalaTest = "3.1.4" - val scalaTestPlusPlay = "5.1.0" + val scalaTest = "3.2.14" + val scalaTestPlusPlay = "6.0.0" val macwire = "2.5.9" } @@ -74,7 +74,7 @@ object Dependencies { val scalaTestPlusPlay = Compile.scalaTestPlusPlay % Test val junitInterface = "com.github.sbt" % "junit-interface" % "0.13.3" % "test" - val logback = "ch.qos.logback" % "logback-classic" % "1.2.12" % "test" + val logback = "ch.qos.logback" % "logback-classic" % "1.4.4" % "test" } } diff --git a/project/build.properties b/project/build.properties index 563a014d..abbbce5d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.2 +sbt.version=1.9.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index 1301875a..bb5caed0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.44") -addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1") +addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.4") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.1") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") diff --git a/project/project-info.conf b/project/project-info.conf index 06c58d62..47ee00a5 100644 --- a/project/project-info.conf +++ b/project/project-info.conf @@ -1,7 +1,7 @@ project-info { # version is overridden from the `projectInfoVersion` key (which defaults to sbt's project version) version: "current" - jdk-versions: ["OpenJDK 8"] + jdk-versions: ["Eclipse Temurin OpenJDK 11"] title: "play-grpc" issues: { url: "https://github.com/playframework/play-grpc/issues"