Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Java 8 #434

Merged
merged 10 commits into from
Dec 21, 2023
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
2 changes: 2 additions & 0 deletions .github/scala-steward.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ updates.pin = [
# Prevent updates to 3.2.x and beyond
{ groupId = "org.scalatest", artifactId = "scalatest", version = "3.1."}
]

updatePullRequests = false
4 changes: 2 additions & 2 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
ihostage marked this conversation as resolved.
Show resolved Hide resolved
cmd: sbt ++$MATRIX_SCALA test

finish:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
3 changes: 2 additions & 1 deletion project/CommonPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
8 changes: 4 additions & 4 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -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"
}

}
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.7.2
sbt.version=1.9.8
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
2 changes: 1 addition & 1 deletion project/project-info.conf
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading