From 37d4560156de7aae9ff2e6e0d14b27da77195c51 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Fri, 30 Sep 2022 00:05:51 +0200 Subject: [PATCH 01/10] Drop Java 8 --- .github/workflows/build-test.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 9b8306b5..6240eff8 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -38,7 +38,7 @@ jobs: - "check-docs" uses: playframework/.github/.github/workflows/cmd.yml@v3 with: - java: 11, 8 + java: 17, 11 scala: 2.12.x, 2.13.x cmd: sbt ++$MATRIX_SCALA test 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 From 44e2b5f0916707d3893d6ab50473a822d82809d9 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 3 Oct 2022 15:27:03 +0200 Subject: [PATCH 02/10] First unstable milestone for next major release --- .github/workflows/build-test.yml | 2 +- build.sbt | 1 + project/CommonPlugin.scala | 3 ++- project/Dependencies.scala | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 6240eff8..ec275ba7 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -39,7 +39,7 @@ jobs: uses: playframework/.github/.github/workflows/cmd.yml@v3 with: java: 17, 11 - scala: 2.12.x, 2.13.x + scala: 2.13.x cmd: sbt ++$MATRIX_SCALA test finish: diff --git a/build.sbt b/build.sbt index 84b47fbc..71bbfd3d 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..b9c26136 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..34496394 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -20,7 +20,7 @@ object Dependencies { val akkaGrpc = AkkaGrpcBuildInfo.version val grpc = AkkaGrpcBuildInfo.grpcVersion - val play = "2.8.21" + val play = "2.9.0-M2" val scalaTest = "3.1.4" val scalaTestPlusPlay = "5.1.0" From a89791efcc95b44d5fe1c261777bf19993646c6b Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 12 Oct 2022 22:42:05 +0200 Subject: [PATCH 03/10] scalatestplus-play 6 milestone --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 34496394..fd241192 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -23,7 +23,7 @@ object Dependencies { val play = "2.9.0-M2" val scalaTest = "3.1.4" - val scalaTestPlusPlay = "5.1.0" + val scalaTestPlusPlay = "6.0.0-M1" val macwire = "2.5.9" } From f068b2cb4b1ca5bb2b5f116c24e93f1d91e35b42 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 12 Oct 2022 22:44:21 +0200 Subject: [PATCH 04/10] Latest ScalaTest --- .github/scala-steward.conf | 2 ++ project/Dependencies.scala | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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/project/Dependencies.scala b/project/Dependencies.scala index fd241192..29fba98e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -22,7 +22,7 @@ object Dependencies { val play = "2.9.0-M2" - val scalaTest = "3.1.4" + val scalaTest = "3.2.14" val scalaTestPlusPlay = "6.0.0-M1" val macwire = "2.5.9" From 2d61db1d793422e13a05701b59c1a4cd89aeb879 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 17 Oct 2022 00:44:57 +0200 Subject: [PATCH 05/10] Upgrade logback --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 29fba98e..eecbb2bf 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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" } } From 4fe35bee48be259584cc8aec3bb74ddcae01e2b4 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Thu, 9 Mar 2023 22:23:43 +0100 Subject: [PATCH 06/10] Mention OpenJDK 11 --- project/project-info.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From 71ea7fa36a728d2e3967751e7fc1ad5434708716 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 17 Nov 2023 23:15:57 +0000 Subject: [PATCH 07/10] sbt-twirl 1.6.4 (was 1.5.1) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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") From 992dfa0bacec6a12fd248af8e38e0c1dca3b6b7a Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 19 Dec 2023 16:51:17 +0100 Subject: [PATCH 08/10] sbt 1.9.8 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From bbc2df223700d9936be65cb068fabb92b9ebb6aa Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 19 Dec 2023 16:52:26 +0100 Subject: [PATCH 09/10] formatting --- build.sbt | 2 +- project/CommonPlugin.scala | 2 +- project/Dependencies.scala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 71bbfd3d..535cf828 100644 --- a/build.sbt +++ b/build.sbt @@ -116,7 +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, + scalaVersion := scala212, ) val playTestkit = Project("play-grpc-testkit", file("play-testkit")) diff --git a/project/CommonPlugin.scala b/project/CommonPlugin.scala index b9c26136..d64c6e1b 100644 --- a/project/CommonPlugin.scala +++ b/project/CommonPlugin.scala @@ -19,7 +19,7 @@ object CommonPlugin extends AutoPlugin { }, doc / javacOptions --= Seq("-Xlint:unchecked", "-Xlint:deprecation"), crossScalaVersions := Seq(scala213), - scalaVersion := scala213, + scalaVersion := scala213, ) val scalaVersionNumber = Def.setting(VersionNumber(scalaVersion.value)) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index eecbb2bf..bca9ce61 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -20,7 +20,7 @@ object Dependencies { val akkaGrpc = AkkaGrpcBuildInfo.version val grpc = AkkaGrpcBuildInfo.grpcVersion - val play = "2.9.0-M2" + val play = "2.9.0-M2" val scalaTest = "3.2.14" val scalaTestPlusPlay = "6.0.0-M1" @@ -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.4.4" % "test" + val logback = "ch.qos.logback" % "logback-classic" % "1.4.4" % "test" } } From 2a6feebbd37f0c1700826d2619a43fd3f4ad7d53 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Wed, 20 Dec 2023 13:29:53 +0100 Subject: [PATCH 10/10] Update versions --- project/Dependencies.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index bca9ce61..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.9.0-M2" + val play = "2.9.1" val scalaTest = "3.2.14" - val scalaTestPlusPlay = "6.0.0-M1" + val scalaTestPlusPlay = "6.0.0" val macwire = "2.5.9" }