Skip to content

Commit

Permalink
Update versions in contrib.playlib (#1958)
Browse files Browse the repository at this point in the history
Pull request: #1958

Co-authored-by: Tobias Roeser <[email protected]>
  • Loading branch information
James and lefou authored Jul 27, 2022
1 parent a16916b commit d084b83
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 25 deletions.
2 changes: 1 addition & 1 deletion build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ object contrib extends MillModule {
def playVersion = playBinary match {
case "2.6" => "2.6.25"
case "2.7" => "2.7.9"
case "2.8" => "2.8.8"
case "2.8" => "2.8.16"
}
override def ivyDeps = Agg(
Deps.osLib,
Expand Down
2 changes: 1 addition & 1 deletion contrib/playlib/src/mill/playlib/PlayModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ trait PlayApiModule extends Dependencies with Router with Server {
trait PlayTests extends super.Tests with TestModule.ScalaTest {
override def ivyDeps = T {
val scalatestPlusPlayVersion = playMinorVersion() match {
case Versions.PLAY_2_6 => "3.1.2"
case Versions.PLAY_2_6 => "3.1.3"
case Versions.PLAY_2_7 => "4.0.3"
case Versions.PLAY_2_8 => "5.1.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import utest.{TestSuite, Tests, assert, _}
object PlaySingleApiModuleTests extends TestSuite with PlayTestSuite {

object playsingleapi extends TestUtil.BaseModule with PlayApiModule with SingleModule {
override def playVersion = T { "2.7.0" }
override def scalaVersion = T { "2.12.8" }
override def playVersion = T { "2.8.16" }
def twirlVersion = T { "1.5.1" }
override def scalaVersion = T { "2.13.8" }
object test extends PlayTests
}

Expand All @@ -22,7 +23,7 @@ object PlaySingleApiModuleTests extends TestSuite with PlayTestSuite {
workspaceTest(playsingleapi) { eval =>
val Right((result, evalCount)) = eval.apply(playsingleapi.playVersion)
assert(
result == "2.7.0",
result == "2.8.16",
evalCount > 0
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import utest.{TestSuite, Tests, assert, _}
object PlaySingleModuleTests extends TestSuite with PlayTestSuite {

object playsingle extends TestUtil.BaseModule with PlayModule with SingleModule {
override def playVersion = T { "2.8.9" }
override def playVersion = T { "2.8.16" }
override def twirlVersion = T { "1.5.1" }
override def twirlScalaVersion: T[String] =
T { sys.props.getOrElse("MILL_SCALA_2_13_VERSION", ???) }
Expand Down
4 changes: 2 additions & 2 deletions contrib/playlib/test/src/mill/playlib/PlayTestSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ trait PlayTestSuite {
val testScala213 = sys.props.getOrElse("MILL_SCALA_2_13_VERSION", ???)

val matrix = Seq(
(testScala212, "2.6.15"),
(testScala212, "2.6.25"),
(testScala212, "2.7.9"),
(testScala213, "2.8.8")
(testScala213, "2.8.16")
)

def resourcePath: os.Path
Expand Down
34 changes: 17 additions & 17 deletions docs/antora/modules/ROOT/pages/Plugin_Play.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ import $ivy.`com.lihaoyi::mill-contrib-playlib:`, mill.playlib._
object core extends PlayModule {
//config
override def scalaVersion= T{"2.12.8"}
override def playVersion= T{"2.7.0"}
override def twirlVersion= T{"1.4.0"}
override def scalaVersion= T{"2.13.8"}
override def playVersion= T{"2.8.16"}
override def twirlVersion= T{"1.5.1"}
object test extends PlayTests
}
Expand Down Expand Up @@ -95,7 +95,7 @@ added (the actual version depends on the version of Play you are pulling `2.6.x`

[source,scala]
----
ivy"org.scalatestplus.play::scalatestplus-play::4.0.1"
ivy"org.scalatestplus.play::scalatestplus-play::5.1.0"
----

In order to have a working `start` command the following runtime dependency is also added:
Expand All @@ -117,8 +117,8 @@ import $ivy.`com.lihaoyi::mill-contrib-playlib:$MILL_VERSION`, mill.playlib._
object core extends PlayApiModule {
//config
override def scalaVersion= T{"2.12.8"}
override def playVersion= T{"2.7.0"}
override def scalaVersion= T{"2.13.8"}
override def playVersion= T{"2.8.16"}
object test extends PlayTests
}
Expand Down Expand Up @@ -154,8 +154,8 @@ import $ivy.`com.lihaoyi::mill-contrib-playlib:$MILL_VERSION`, mill.playlib._
object core extends PlayApiModule {
//config
override def scalaVersion= T{"2.12.8"}
override def playVersion= T{"2.7.0"}
override def scalaVersion= T{"2.13.8"}
override def playVersion= T{"2.8.16"}
object test extends PlayTests
Expand Down Expand Up @@ -195,9 +195,9 @@ import $ivy.`com.lihaoyi::mill-contrib-playlib:$MILL_VERSION`, mill.playlib._
object core extends PlayModule {
//config
override def scalaVersion= T{"2.12.8"}
override def playVersion= T{"2.7.0"}
override def twirlVersion= T{"1.4.0"}
override def scalaVersion= T{"2.13.8"}
override def playVersion= T{"2.8.16"}
override def twirlVersion= T{"1.5.1"}
object test extends PlayTests
}
Expand Down Expand Up @@ -236,9 +236,9 @@ import $ivy.`com.lihaoyi::mill-contrib-playlib:`, mill.playlib._
object core extends PlayModule with SingleModule {
//config
override def scalaVersion= T{"2.12.8"}
override def playVersion= T{"2.7.0"}
override def twirlVersion= T{"1.4.0"}
override def scalaVersion= T{"2.13.8"}
override def playVersion= T{"2.8.16"}
override def twirlVersion= T{"1.5.1"}
object test extends PlayTests
}
Expand Down Expand Up @@ -280,8 +280,8 @@ import mill._
import $ivy.`com.lihaoyi::mill-contrib-playlib:`, mill.playlib._
object app extends ScalaModule with RouterModule {
def playVersion= T{"2.7.0"}
def scalaVersion= T{"2.12.8"}
def playVersion= T{"2.8.16"}
def scalaVersion= T{"2.13.8"}
}
----

Expand Down Expand Up @@ -335,7 +335,7 @@ import mill.scalalib._
import $ivy.`com.lihaoyi::mill-contrib-playlib:$MILL_VERSION`, mill.playlib._
object app extends ScalaModule with RouterModule {
def playVersion = "2.7.0"
def playVersion = "2.8.16"
override def routesAdditionalImport = Seq("my.additional.stuff._", "my.other.stuff._")
}
----

0 comments on commit d084b83

Please sign in to comment.