Merge pull request #283 from mkurz/play29rc1

mkurz · web-flow · commit 86806cc34722 · 2023-09-18T22:59:15.000+02:00
Play 2.9 release candidate
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,5 +6,5 @@ object Dependencies {
   val Scala3 = "3.3.1"
   val ScalaVersions = Seq(Scala213, Scala3)
 
-  val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.9.0-M7"))
+  val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.9.0-RC2"))
 }
diff --git a/samples/compile-timeDI/build.sbt b/samples/compile-timeDI/build.sbt
@@ -13,7 +13,7 @@ crossScalaVersions := Seq("2.13.12", "3.3.1")
 
 libraryDependencies ++= Seq(
   "com.typesafe.play" %% "play-mailer" % version.value,
-  "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.0-M6" % Test
+  "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.0-RC2" % Test
 )
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
diff --git a/samples/compile-timeDI/project/plugins.sbt b/samples/compile-timeDI/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.0-M7"))
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.0-RC2"))
 addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
diff --git a/samples/runtimeDI/build.sbt b/samples/runtimeDI/build.sbt
@@ -13,7 +13,7 @@ crossScalaVersions := Seq("2.13.12", "3.3.1")
 
 libraryDependencies ++= Seq(
   "com.typesafe.play" %% "play-mailer-guice" % version.value,
-  "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.0-M6" % Test
+  "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.0-RC2" % Test
 )
 
 lazy val root = (project in file(".")).enablePlugins(PlayJava)
diff --git a/samples/runtimeDI/project/plugins.sbt b/samples/runtimeDI/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.0-M7"))
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.0-RC2"))
 addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ object Dependencies {`
`6`	`6`	`val Scala3 = "3.3.1"`
`7`	`7`	`val ScalaVersions = Seq(Scala213, Scala3)`
`8`	`8`
`9`		`- val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.9.0-M7"))`
	`9`	`+ val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.9.0-RC2"))`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ crossScalaVersions := Seq("2.13.12", "3.3.1")`
`13`	`13`
`14`	`14`	`libraryDependencies ++= Seq(`
`15`	`15`	`"com.typesafe.play" %% "play-mailer" % version.value,`
`16`		`- "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.0-M6" % Test`
	`16`	`+ "org.scalatestplus.play" %% "scalatestplus-play" % "6.0.0-RC2" % Test`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`lazy val root = (project in file(".")).enablePlugins(PlayScala)`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.0-M7"))`
	`1`	`+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.0-RC2"))`
`2`	`2`	`addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")`