Merge pull request #237 from yanns/235_update_scala_xml

update scala-xml
dispatch · Feb 2, 2023 · 658a1ba · 658a1ba
2 parents 0578795 + d30bcc1
commit 658a1ba
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 64 deletions.
diff --git a/build.sbt b/build.sbt
@@ -8,7 +8,6 @@ lazy val root = Project(
   core,
   jsoup,
   tagsoup,
-  liftjson,
   json4sJackson,
   json4sNative
 )
@@ -24,10 +23,6 @@ def module(name: String, settings: Seq[Def.Setting[_]] = Seq.empty) =
 
 lazy val core = module("core", xmlDependency)
 
-lazy val liftjson = module("lift-json")
-  .dependsOn(core)
-  .dependsOn(core % "test->test")
-
 lazy val json4sJackson = module("json4s-jackson")
   .dependsOn(core)
   .dependsOn(core % "test->test")
@@ -44,7 +39,7 @@ lazy val tagsoup = module("tagsoup")
   .dependsOn(core)
   .dependsOn(core % "test->test")
 
-lazy val xmlDependency = libraryDependencies ++= Seq("org.scala-lang.modules" %% "scala-xml" % "1.2.0")
+lazy val xmlDependency = libraryDependencies ++= Seq("org.scala-lang.modules" %% "scala-xml" % "2.1.0")
 
 /** Util module for using unfiltered with scalacheck */
 lazy val ufcheck = project.in(file("ufcheck")).settings(

diff --git a/liftjson/build.sbt b/liftjson/build.sbt
diff --git a/liftjson/src/main/scala/as/json.scala b/liftjson/src/main/scala/as/json.scala
diff --git a/liftjson/src/main/scala/as/stream/json.scala b/liftjson/src/main/scala/as/stream/json.scala
diff --git a/liftjson/src/test/scala/json.scala b/liftjson/src/test/scala/json.scala