Skip to content

Commit 4bceb16

Browse files
authored
Merge pull request #922 from mkurz/upgrade_play_and_grpc
Play 3.1.0-M4 + play-grpc + pekko + twirl
2 parents 03e3da7 + d40feb1 commit 4bceb16

89 files changed

Lines changed: 124 additions & 124 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

java/chatroom/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ lazy val root = (project in file("."))
66
.settings(
77
name := """play-java-chatroom-example""",
88
version := "1.0-SNAPSHOT",
9-
crossScalaVersions := Seq("2.13.16", "3.3.6"),
9+
crossScalaVersions := Seq("2.13.17", "3.3.7"),
1010
scalaVersion := crossScalaVersions.value.head,
1111
libraryDependencies ++= Seq(
1212
"org.webjars" %% "webjars-play" % "3.1.0-M1",

java/chatroom/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
2-
twirl = "2.0.9"
3-
play = "3.1.0-M3"
2+
twirl = "2.1.0-M5"
3+
play = "3.1.0-M4"
44
junit = "4.13.2"
55
webjars-play = "3.1.0-M1"
66
flot = "0.8.3-1"

java/chatroom/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// The Play plugin
22
resolvers += Resolver.sonatypeCentralSnapshots
3-
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")
3+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M4")

java/compile-di/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version := "1.0-SNAPSHOT"
77
lazy val root = (project in file(".")).enablePlugins(PlayJava)
88
//.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend
99

10-
crossScalaVersions := Seq("2.13.16", "3.3.6")
10+
crossScalaVersions := Seq("2.13.17", "3.3.7")
1111

1212
scalaVersion := crossScalaVersions.value.head
1313

java/compile-di/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
play = "3.1.0-M3"
2+
play = "3.1.0-M4"
33
junit = "4.13.2"
44

55
[libraries]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
resolvers += Resolver.sonatypeCentralSnapshots
2-
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")
2+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M4")

java/dagger2/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ lazy val root = (project in file("."))
66
.settings(
77
name := """play-java-dagger2-example""",
88
version := "1.0-SNAPSHOT",
9-
crossScalaVersions := Seq("2.13.16", "3.3.6"),
9+
crossScalaVersions := Seq("2.13.17", "3.3.7"),
1010
scalaVersion := crossScalaVersions.value.head,
1111
libraryDependencies ++= Seq(
1212
ws,

java/dagger2/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
2-
twirl = "2.0.9"
3-
play = "3.1.0-M3"
2+
twirl = "2.1.0-M5"
3+
play = "3.1.0-M4"
44
junit = "4.13.2"
55
dagger = "2.51.1"
66

java/dagger2/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// The Play plugin
22
resolvers += Resolver.sonatypeCentralSnapshots
3-
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")
3+
addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M4")

java/ebean/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ lazy val root = (project in file("."))
66
.settings(
77
name := "play-java-ebean-example",
88
version := "1.0.0-SNAPSHOT",
9-
crossScalaVersions := Seq("2.13.16", "3.3.6"),
9+
crossScalaVersions := Seq("2.13.17", "3.3.7"),
1010
scalaVersion := crossScalaVersions.value.head,
1111
libraryDependencies ++= Seq(
1212
guice,

0 commit comments

Comments
 (0)