Skip to content

Commit

Permalink
project: upgrade the xml dependency to 2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
symbiont-eric-torreborre committed Aug 31, 2021
1 parent d65d4fd commit 631f405
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.DS_Store

.project
.settings
.bsp
.idea
**/target
Expand Down
15 changes: 8 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,9 @@ lazy val examples = crossProject(JSPlatform, JVMPlatform, NativePlatform).in(fil
jsSettings(depends.jsTest, commonJsSettings).
jvmSettings(depends.jvmTest, commonJvmSettings).
nativeSettings(commonNativeSettings).
dependsOn(common, matcher, core, matcherExtra, junit, scalacheck, mock)
dependsOn(common, matcher, core, junit, scalacheck, mock)

lazy val examplesJVM = examples.jvm.dependsOn(analysisJVM, formJVM, gwtJVM, html, markdownJVM)
lazy val examplesJVM = examples.jvm.dependsOn(formJVM, gwtJVM, html, markdownJVM)
lazy val examplesJS = examples.js
lazy val examplesNative = examples.native

Expand All @@ -197,7 +197,7 @@ lazy val form = crossProject(JSPlatform, JVMPlatform, NativePlatform).
jvmSettings(depends.jvmTest, commonJvmSettings).
jsSettings(depends.jsTest, commonJsSettings).
nativeSettings(depends.nativeTest, commonNativeSettings).
dependsOn(core, markdown, matcherExtra, scalacheck % "test->test", xml)
dependsOn(core, markdown, scalacheck % "test->test", xml)

lazy val formJVM = form.jvm
lazy val formJS = form.js
Expand All @@ -221,7 +221,7 @@ lazy val gwt = crossProject(JSPlatform, JVMPlatform, NativePlatform).
jvmSettings(depends.jvmTest, commonJvmSettings).
jsSettings(depends.jsTest, commonJsSettings).
nativeSettings(depends.nativeTest, commonNativeSettings).
dependsOn(core, matcherExtra, scalacheck)
dependsOn(core, scalacheck)

lazy val gwtJVM = gwt.jvm
lazy val gwtJS = gwt.js
Expand All @@ -233,7 +233,7 @@ lazy val html = project.in(file("html")).
commonSettings,
name := "specs2-html").
settings(depends.jvmTest, commonJvmSettings).
dependsOn(formJVM, mockJVM % Test, matcherExtraJVM % Test, scalacheckJVM % Test, xmlJVM)
dependsOn(formJVM, mockJVM % Test, scalacheckJVM % Test, xmlJVM)

lazy val junit = crossProject(JSPlatform, JVMPlatform, NativePlatform).in(file("junit")).
settings(
Expand Down Expand Up @@ -291,7 +291,7 @@ lazy val matcherExtra = crossProject(JSPlatform, JVMPlatform, NativePlatform).in
jsSettings(depends.jsTest, commonJsSettings).
jvmSettings(depends.jvmTest, commonJvmSettings).
nativeSettings(depends.nativeTest, commonNativeSettings).
dependsOn(analysis, matcher, xml, core % "test->test")
dependsOn(analysis, matcher, core % "test->test")

lazy val matcherExtraJS = matcherExtra.js
lazy val matcherExtraJVM = matcherExtra.jvm
Expand Down Expand Up @@ -376,7 +376,8 @@ lazy val tests = Project(id = "tests", base = file("tests")).
commonSettings,
name := "specs2-tests",
depends.jvmTest,
commonJvmSettings
commonJvmSettings,
publishArtifact := false,
).dependsOn(
coreJVM % "compile->compile;test->test",
shapelessJVM % "compile->compile;test->test",
Expand Down
1 change: 1 addition & 0 deletions guide/src/test/scala/org/specs2/guide/Installation.scala
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ Depending on the $specs2 features you want to use you will need to add more depe
`specs2-html` | to export specifications as html
`specs2-form` | to create html form-like specifications
`specs2-junit` | to run specifications as JUnit tests
`specs2-xml` | to use xml matchers

Note: the `specs2-core` jar depends on 2 other $specs2 jars:

Expand Down
2 changes: 1 addition & 1 deletion project/depends.scala
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ object depends {
scalaParser.value
}

def scalaXml = "org.scala-lang.modules" %% "scala-xml" % "1.3.0"
def scalaXml = "org.scala-lang.modules" %% "scala-xml" % "2.0.1"

lazy val mockito = "org.mockito" % "mockito-core" % "3.11.2"
lazy val junit = "junit" % "junit" % "4.13.2"
Expand Down

0 comments on commit 631f405

Please sign in to comment.