From 9a4af9c107eddbb9485096708102fcb2b0668054 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 5 Jun 2023 15:12:02 +0200 Subject: [PATCH] Update Play build with Scala 3.3 --- project/plugins.sbt | 2 +- scripts/test-code.sh | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 93bbcb576..90321f721 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ resolvers ++= DefaultOptions.resolvers(snapshot = true) resolvers += Resolver.typesafeRepo("releases") -addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.0-M5")) +addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.0-M6")) addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.4") diff --git a/scripts/test-code.sh b/scripts/test-code.sh index 12c4fc2ed..e859fc0cc 100755 --- a/scripts/test-code.sh +++ b/scripts/test-code.sh @@ -7,13 +7,8 @@ sbt -DscalaJSStage=full \ ++$MATRIX_SCALA test publishLocal || exit 1 case "$MATRIX_SCALA" in - 3.* | 2.12.*) echo "SKIPPING docs/test" ;; + 2.12.*) echo "SKIPPING docs/test" ;; # ^ because Play 2.9.x does not get published for Scala 2.12.x anymore - # ^ because there is no play-docs for Scala 3 - # and we can't use play-docs_2.13 because then: - # [error] Modules were resolved with conflicting cross-version suffixes in ProjectRef(uri("file:/d/play-json/"), "docs"): - # [error] com.typesafe.play:play-functional _2.13, _3.0.0-M3 - # [error] com.typesafe.play:play-json _2.13, _3.0.0-M3 *) sbt ++$MATRIX_SCALA docs/test || exit 2 ;; esac