Skip to content

Commit

Permalink
scala-xml 2.1.0 also for Scala 2.12
Browse files Browse the repository at this point in the history
  • Loading branch information
mkurz committed Sep 26, 2022
1 parent aa58c38 commit 20b3559
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
9 changes: 2 additions & 7 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -62,6 +57,6 @@ object Dependencies {

val standaloneAhcWSJsonDependencies = playJson ++ testDependencies

def standaloneAhcWSXMLDependencies(scalaVersion: String) = scalaXml(scalaVersion) ++ testDependencies
val standaloneAhcWSXMLDependencies = scalaXml ++ testDependencies

}

0 comments on commit 20b3559

Please sign in to comment.