Merge pull request #227 from mkurz/play29M2

Play 2.9 milestone
playframework · Oct 10, 2022 · 4686d67 · 4686d67
2 parents 7f1d4dc + 2e4a271
commit 4686d67
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -38,7 +38,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
         # Test sample applications

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,9 +2,8 @@ import sbt._
 
 object Dependencies {
   // scalaVersion needs to be kept in sync with ci
-  val Scala212 = "2.12.17"
   val Scala213 = "2.13.10"
-  val ScalaVersions = Seq(Scala212, Scala213)
+  val ScalaVersions = Seq(Scala213)
 
-  val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.8.16"))
+  val PlayVersion = sys.props.getOrElse("play.version", sys.env.getOrElse("PLAY_VERSION", "2.9.0-M2"))
 }
diff --git a/samples/compile-timeDI/build.sbt b/samples/compile-timeDI/build.sbt
@@ -9,7 +9,7 @@ ThisBuild / dynverSonatypeSnapshots := true
 
 scalaVersion := "2.13.10"
 
-crossScalaVersions := Seq("2.12.17", "2.13.10")
+crossScalaVersions := Seq("2.13.10")
 
 libraryDependencies ++= Seq(
   "com.typesafe.play" %% "play-mailer" % version.value,

diff --git a/samples/compile-timeDI/project/plugins.sbt b/samples/compile-timeDI/project/plugins.sbt
@@ -1,2 +1,6 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.8.16"))
+lazy val plugins = (project in file(".")).settings(
+  scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0
+)
+
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.0-M2"))
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
diff --git a/samples/runtimeDI/build.sbt b/samples/runtimeDI/build.sbt
@@ -9,7 +9,7 @@ ThisBuild / dynverSonatypeSnapshots := true
 
 scalaVersion := "2.13.10"
 
-crossScalaVersions := Seq("2.12.17", "2.13.10")
+crossScalaVersions := Seq("2.13.10")
 
 libraryDependencies ++= Seq(
   "com.typesafe.play" %% "play-mailer-guice" % version.value,

diff --git a/samples/runtimeDI/project/plugins.sbt b/samples/runtimeDI/project/plugins.sbt
@@ -1,2 +1,6 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.8.16"))
+lazy val plugins = (project in file(".")).settings(
+  scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0
+)
+
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.env.getOrElse("PLAY_VERSION", "2.9.0-M2"))
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")