Skip to content

Commit d289786

Browse files
committed
Moved XML dep to plugin only
1 parent 544907d commit d289786

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

Diff for: project/Scoverage.scala

+9-11
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@ object Scoverage extends Build {
3434
"org.mockito" % "mockito-all" % "1.9.5" % "test",
3535
"org.scalatest" %% "scalatest" % ScalatestVersion % "test"
3636
),
37-
libraryDependencies := {
38-
CrossVersion.partialVersion(scalaVersion.value) match {
39-
case Some((2, scalaMajor)) if scalaMajor == 11 =>
40-
EnvSupport.setEnv("CrossBuildScalaVersion", "2.11.4")
41-
libraryDependencies.value :+ "org.scala-lang.modules" %% "scala-xml" % "1.0.1"
42-
case _ =>
43-
EnvSupport.setEnv("CrossBuildScalaVersion", "2.10.4")
44-
libraryDependencies.value
45-
}
46-
},
4737
publishTo <<= version {
4838
(v: String) =>
4939
val nexus = "https://oss.sonatype.org/"
@@ -64,7 +54,15 @@ object Scoverage extends Build {
6454
"org.slf4j" % "slf4j-api" % Slf4jVersion,
6555
"commons-io" % "commons-io" % "2.4",
6656
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
67-
"org.scala-lang" % "scala-compiler" % scalaVersion.value
57+
"org.scala-lang" % "scala-compiler" % scalaVersion.value,
58+
CrossVersion.partialVersion(scalaVersion.value) match {
59+
case Some((2, scalaMajor)) if scalaMajor == 11 =>
60+
EnvSupport.setEnv("CrossBuildScalaVersion", "2.11.4")
61+
libraryDependencies.value :+ "org.scala-lang.modules" %% "scala-xml" % "1.0.1"
62+
case _ =>
63+
EnvSupport.setEnv("CrossBuildScalaVersion", "2.10.4")
64+
libraryDependencies.value
65+
}
6866
))
6967

7068
lazy val runtime = Project("scalac-scoverage-runtime", file("scalac-scoverage-runtime"))

0 commit comments

Comments
 (0)