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.

Sign up for GitHub

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

Jump to bottom

Drop Java 8 #176

Merged
merged 16 commits into from
Oct 4, 2022
Merged

Drop Java 8 #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
600c12e
Drop Java 8
mkurz Sep 29, 2022
117f837
Play 2.9.0-M2
mkurz Oct 4, 2022
eb702de
Next sbt-ebean milestone
mkurz Oct 4, 2022
ed381b1
Fix Scala warnings
mkurz Oct 4, 2022
6839bd1
Fix deprecated code
mkurz Oct 4, 2022
782e393
Fix grpc-example
mkurz Oct 4, 2022
aa20d18
Upgrade scalatestplus-play
mkurz Oct 4, 2022
aa6efee
Fix play-scala-hello-world-tutorial
mkurz Oct 4, 2022
18e01b4
Remove old keys
mkurz Oct 4, 2022
b49616f
Fix application secret
mkurz Oct 4, 2022
4ec2db9
Remove ALPN Agent
mkurz Oct 4, 2022
c04be07
Upgrade sbt-paradox (support for Java 17 / drops Java 8)
mkurz Oct 4, 2022
df675d6
--add-exports needed for self signed certificated under Java 17
mkurz Oct 4, 2022
23e4c2b
Fix play-scala-grpc-example
mkurz Oct 4, 2022
5b3aa83
Workarounds for scala-xml conflict
mkurz Oct 4, 2022
fbf7b0d
Temporary add play-ahc-ws because of outdated scalatestplus-play
mkurz Oct 4, 2022
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
8 changes: 4 additions & 4 deletions .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ concurrency:
jobs:
# check-code-style:
# name: Code Style
# uses: playframework/.github/.github/workflows/cmd.yml@v2
# uses: playframework/.github/.github/workflows/cmd.yml@v3
# with:
# cmd: sbt validateCode

tests:
name: Tests
# needs:
# - "check-code-style"
uses: playframework/.github/.github/workflows/cmd.yml@v2
uses: playframework/.github/.github/workflows/cmd.yml@v3
with:
java: 11, 8
java: 17, 11
scala: 2.13.8
cmd: |
# sudo add-apt-repository -y ppa:ondrej/php && sudo apt-get -qq update && sudo apt-get install -y libsodium-dev # for secure session examples
Expand All @@ -36,4 +36,4 @@ jobs:
if: github.event_name == 'pull_request'
needs: # Should be last
- "tests"
uses: playframework/.github/.github/workflows/rtm.yml@v2
uses: playframework/.github/.github/workflows/rtm.yml@v3
6 changes: 5 additions & 1 deletion play-java-akka-cluster-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
6 changes: 5 additions & 1 deletion play-java-chatroom-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
6 changes: 5 additions & 1 deletion play-java-compile-di-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
6 changes: 5 additions & 1 deletion play-java-dagger2-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
8 changes: 6 additions & 2 deletions play-java-ebean-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")

addSbtPlugin("com.typesafe.play" % "sbt-play-ebean" % "6.2.0-RC4")
addSbtPlugin("com.typesafe.play" % "sbt-play-ebean" % "7.0.0-M1")
2 changes: 1 addition & 1 deletion play-java-fileupload-example/app/controllers/MyMultipartFormDataBodyParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class MyMultipartFormDataBodyParser extends BodyParser.DelegatingMultipartFormDa

@Inject
public MyMultipartFormDataBodyParser(Materializer materializer, play.api.http.HttpConfiguration config, HttpErrorHandler errorHandler) {
super(materializer, config.parser().maxMemoryBuffer(), config.parser().maxDiskBuffer(), errorHandler);
super(materializer, config.parser().maxMemoryBuffer(), config.parser().maxDiskBuffer(), false, errorHandler);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion play-java-fileupload-example/app/views/index.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

@main("Welcome to Play") {

@helper.form(action = routes.HomeController.upload, Symbol("enctype") -> "multipart/form-data") {
@helper.form(action = routes.HomeController.upload(), Symbol("enctype") -> "multipart/form-data") {
@helper.inputFile(form("name"))
@helper.CSRF.formField
<input type="submit" value="upload file"/>
Expand Down
6 changes: 5 additions & 1 deletion play-java-fileupload-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
6 changes: 5 additions & 1 deletion play-java-forms-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
4 changes: 3 additions & 1 deletion play-java-grpc-example/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ lazy val `play-java-grpc-example` = (project in file("."))
libraryDependencies ++= CompileDeps ++ TestDeps
)

scalaVersion := "2.12.16"
scalaVersion := "2.13.8"
scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked")
javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation")
// Needed for ssl-config to create self signed certificated under Java 17
Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED")

val CompileDeps = Seq(
guice,
Expand Down
2 changes: 1 addition & 1 deletion play-java-grpc-example/conf/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ play {
play.server.https.keyStore.path = conf/selfsigned.keystore

# http://www.playframework.com/documentation/latest/ApplicationSecret
play.http.secret.key = "default-value-used-locally"
play.http.secret.key = "default-value-used-locally-with-at-minimal-length"

# #grpc_enable_client_module
# conf/application.conf
Expand Down
2 changes: 1 addition & 1 deletion play-java-grpc-example/project/paradox.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.8.0")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.2")
6 changes: 5 additions & 1 deletion play-java-grpc-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

enablePlugins(BuildInfoPlugin)
val playGrpcV = "0.9.1"
buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV)
buildInfoPackage := "play.java.grpc.sample"

addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")

// #grpc_sbt_plugin
// project/plugins.sbt
Expand Down
2 changes: 1 addition & 1 deletion play-java-grpc-example/scripts/test-sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
echo "+----------------------------+"
echo "| Executing tests using sbt |"
echo "+----------------------------+"
sbt ++2.12.16 test docs/paradox
sbt ++$MATRIX_SCALA test docs/paradox
6 changes: 5 additions & 1 deletion play-java-hello-world-tutorial/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
6 changes: 5 additions & 1 deletion play-java-jpa-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")

// Web plugins
addSbtPlugin("com.typesafe.sbt" % "sbt-coffeescript" % "1.0.2")
Expand Down
6 changes: 5 additions & 1 deletion play-java-rest-api-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")

// Load testing tool:
// http://gatling.io/docs/2.2.2/extensions/sbt_plugin.html
Expand Down
6 changes: 5 additions & 1 deletion play-java-starter-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
6 changes: 5 additions & 1 deletion play-java-streaming-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

// Use the Play sbt plugin for Play projects
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
6 changes: 5 additions & 1 deletion play-java-telemetry-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")

addSbtPlugin("com.lightbend.cinnamon" % "sbt-cinnamon" % "2.12.4")

Expand Down
6 changes: 5 additions & 1 deletion play-java-websocket-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")

addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.2")

Expand Down
6 changes: 4 additions & 2 deletions play-scala-anorm-example/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ lazy val root = (project in file("."))
evolutions,
"com.h2database" % "h2" % "1.4.199",
"org.playframework.anorm" %% "anorm" % "2.6.5",
"org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test,
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test,
),
scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked", "-Xfatal-warnings"),
javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation", "-Werror")
javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation", "-Werror"),
// Needed for ssl-config to create self signed certificated under Java 17
Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED"),
)
6 changes: 5 additions & 1 deletion play-scala-anorm-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
5 changes: 4 additions & 1 deletion play-scala-chatroom-example/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import play.core.PlayVersion.akkaVersion

val playVersion = play.core.PlayVersion.current

lazy val root = (project in file("."))
.enablePlugins(PlayScala)
.settings(
Expand All @@ -17,7 +19,8 @@ lazy val root = (project in file("."))
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion,
"com.typesafe.akka" %% "akka-testkit" % akkaVersion % Test,
"com.typesafe.akka" %% "akka-stream-testkit" % akkaVersion % Test,
"org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
"com.typesafe.play" %% "play-ahc-ws" % playVersion % Test,
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test
),
scalacOptions ++= Seq(
"-feature",
Expand Down
6 changes: 5 additions & 1 deletion play-scala-chatroom-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
9 changes: 7 additions & 2 deletions play-scala-compile-di-example/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
val playVersion = play.core.PlayVersion.current

lazy val root = (project in file("."))
.enablePlugins(PlayScala)
.settings(
name := """play-scala-compile-di-example""",
version := "1.0-SNAPSHOT",
scalaVersion := "2.13.8",
libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test,
libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test,
libraryDependencies += "com.typesafe.play" %% "play-ahc-ws" % playVersion % Test,
scalacOptions ++= List(
"-encoding", "utf8",
"-deprecation",
"-feature",
"-unchecked",
"-Xfatal-warnings"
)
),
// Needed for ssl-config to create self signed certificated under Java 17
Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED"),
)
6 changes: 5 additions & 1 deletion play-scala-compile-di-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
6 changes: 4 additions & 2 deletions play-scala-fileupload-example/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ lazy val root = (project in file("."))
libraryDependencies ++= Seq(
ws,
guice,
"org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test
),
scalacOptions ++= Seq(
"-feature",
"-deprecation",
"-Xfatal-warnings"
)
),
// Needed for ssl-config to create self signed certificated under Java 17
Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED"),
)
6 changes: 5 additions & 1 deletion play-scala-fileupload-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

resolvers += Resolver.typesafeRepo("snapshots")

resolvers += Resolver.jcenterRepo

// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
6 changes: 4 additions & 2 deletions play-scala-forms-example/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ lazy val root = (project in file("."))
scalaVersion := "2.13.8",
libraryDependencies ++= Seq(
guice,
"org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test,
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test,
),
scalacOptions ++= Seq(
"-feature",
"-deprecation",
"-Xfatal-warnings"
)
),
// Needed for ssl-config to create self signed certificated under Java 17
Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED"),
)
6 changes: 5 additions & 1 deletion play-scala-forms-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")
7 changes: 5 additions & 2 deletions play-scala-grpc-example/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,14 @@ val TestDeps = Seq(
"com.lightbend.play" %% "play-grpc-specs2" % BuildInfo.playGrpcVersion % Test,
"com.typesafe.play" %% "play-test" % playVersion % Test,
"com.typesafe.play" %% "play-specs2" % playVersion % Test,
"org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test,
"org.scalatestplus.play" %% "scalatestplus-play" % "5.1.0" % Test,
"com.typesafe.play" %% "play-ahc-ws" % playVersion % Test,
)

scalaVersion := "2.12.16"
scalaVersion := "2.13.8"
scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked")
// Needed for ssl-config to create self signed certificated under Java 17
Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED")

// Make verbose tests
(Test / testOptions) := Seq(Tests.Argument(TestFrameworks.JUnit, "-a", "-v"))
Expand Down
2 changes: 1 addition & 1 deletion play-scala-grpc-example/conf/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ play {
play.server.https.keyStore.path = conf/selfsigned.keystore

# http://www.playframework.com/documentation/latest/ApplicationSecret
play.http.secret.key = "default-value-used-locally"
play.http.secret.key = "default-value-used-locally-with-at-minimal-length"

# #grpc_enable_client_module
# conf/application.conf
Expand Down
2 changes: 1 addition & 1 deletion play-scala-grpc-example/project/paradox.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.8.0")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.2")
6 changes: 5 additions & 1 deletion play-scala-grpc-example/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

enablePlugins(BuildInfoPlugin)
val playGrpcV = "0.9.1"
buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV)
buildInfoPackage := "play.scala.grpc.sample"


addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.16")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0-M2")

// #grpc_sbt_plugin
// project/plugins.sbt
Expand Down
2 changes: 1 addition & 1 deletion play-scala-grpc-example/scripts/test-sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
echo "+----------------------------+"
echo "| Executing tests using sbt |"
echo "+----------------------------+"
sbt ++2.12.16 test docs/paradox
sbt ++$MATRIX_SCALA test docs/paradox
Loading