Merge pull request #704 from mkurz/scala-xml-2.1.0

scala-xml 2.1.0 also for Scala 2.12
playframework · Sep 26, 2022 · 4caba96 · 4caba96
2 parents aa58c38 + 20b3559
commit 4caba96
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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
 
 }