From 20b355982a3cd175836a6e7e7525b2734269f436 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Mon, 26 Sep 2022 19:49:08 +0200 Subject: [PATCH] scala-xml 2.1.0 also for Scala 2.12 --- build.sbt | 2 +- project/Dependencies.scala | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 51e220ba..c7694083 100644 --- a/build.sbt +++ b/build.sbt @@ -379,7 +379,7 @@ lazy val `play-ws-standalone-xml` = project .settings( Test / fork := true, Test / testOptions := Seq(Tests.Argument(TestFrameworks.JUnit, "-a", "-v")), - libraryDependencies ++= standaloneAhcWSXMLDependencies(scalaVersion.value) + libraryDependencies ++= standaloneAhcWSXMLDependencies ) .settings(AutomaticModuleName.settings("play.ws.standalone.xml")) .dependsOn( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index dcc7e4f9..b98d1567 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -34,12 +34,7 @@ object Dependencies { val sslConfigCore = Seq("com.typesafe" %% "ssl-config-core" % "0.6.1") - def scalaXml(scalaVersion: String) = Seq("org.scala-lang.modules" %% "scala-xml" % { - CrossVersion.partialVersion(scalaVersion) match { - case Some((2, 12)) => "1.3.0" - case _ => "2.1.0" - } - }) + val scalaXml = Seq("org.scala-lang.modules" %% "scala-xml" % "2.1.0") val oauth = Seq("oauth.signpost" % "signpost-core" % "2.1.1") @@ -62,6 +57,6 @@ object Dependencies { val standaloneAhcWSJsonDependencies = playJson ++ testDependencies - def standaloneAhcWSXMLDependencies(scalaVersion: String) = scalaXml(scalaVersion) ++ testDependencies + val standaloneAhcWSXMLDependencies = scalaXml ++ testDependencies }