Skip to content

Commit

Permalink
Merge pull request #547 from mkurz/scala-xml_2.1.0
Browse files Browse the repository at this point in the history
Scala 2.12.17 / 2.13.9 + scala-xml 2.1.0
  • Loading branch information
mkurz authored Sep 22, 2022
2 parents 93a65b1 + 06018d6 commit a38fc2f
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
uses: playframework/.github/.github/workflows/cmd.yml@v2
with:
java: 11, 8
scala: 2.12.16, 2.13.8, 3.2.0
scala: 2.12.17, 2.13.9, 3.2.0
cmd: scripts/test-code.sh

finish:
Expand Down
9 changes: 2 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,8 @@ lazy val api = crossProject(JVMPlatform, JSPlatform)
"org.scalatest.tools.ScalaTestFramework"
)
),
libraryDependencies += "org.scala-lang.modules" %%% "scala-xml" % {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, 12)) => "1.3.0"
case _ => "2.1.0"
}
},
libraryDependencies += "org.scalatest" %%% "scalatest" % ScalaTestVersion % Test,
libraryDependencies += "org.scala-lang.modules" %%% "scala-xml" % "2.1.0",
libraryDependencies += "org.scalatest" %%% "scalatest" % ScalaTestVersion % Test,
)

lazy val apiJvm = api.jvm
Expand Down
2 changes: 1 addition & 1 deletion docs/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ lazy val docs = project
.enablePlugins(PlayDocsPlugin)
.configs(Configuration.of("Docs", "docs"))
.settings(
scalaVersion := "2.12.16",
scalaVersion := "2.12.17",
// use special snapshot play version for now
resolvers ++= DefaultOptions.resolvers(snapshot = true),
resolvers += Resolver.typesafeRepo("releases"),
Expand Down
6 changes: 5 additions & 1 deletion docs/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
lazy val plugins = (project in file(".")).dependsOn(sbtTwirl)
lazy val plugins = (project in file(".")).dependsOn(sbtTwirl).settings(
excludeDependencies += "com.typesafe.sbt" % "sbt-native-packager", // TODO: remove when Play switched to com.github.sbt
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

lazy val sbtTwirl = ProjectRef(Path.fileProperty("user.dir").getParentFile, "plugin")

Expand All @@ -7,3 +10,4 @@ resolvers ++= DefaultOptions.resolvers(snapshot = true)
addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.8.0"))
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.11") // TODO: remove when Play itself pulls in 1.9.11+
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
object Dependencies {
val Scala212 = "2.12.16"
val Scala213 = "2.13.8"
val Scala212 = "2.12.17"
val Scala213 = "2.13.9"
val Scala3 = "3.2.0"
val ScalaVersions = Seq(Scala212, Scala213, Scala3)
}
4 changes: 4 additions & 0 deletions sbt-twirl/src/sbt-test/twirl/compile/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

addSbtPlugin("com.typesafe.play" % "sbt-twirl" % sys.props("project.version"))
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
lazy val plugins = (project in file(".")).settings(
scalaVersion := "2.12.17", // TODO: remove when upgraded to sbt 1.8.0 (maybe even 1.7.2), see https://github.com/sbt/sbt/pull/7021
)

addSbtPlugin("com.typesafe.play" % "sbt-twirl" % sys.props("project.version"))
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.11.0")

0 comments on commit a38fc2f

Please sign in to comment.