Skip to content

Commit 0af2a79

Browse files
committed
Setup but commented out 2.11 cross compile. We need https://issues.scala-lang.org/browse/SI-8364 first
1 parent 4f63f72 commit 0af2a79

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

build.sbt

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ scalaVersion := "2.10.3"
88

99
scalacOptions := Seq("-unchecked", "-deprecation", "-feature", "-encoding", "utf8")
1010

11-
crossScalaVersions := Seq("2.9.2", "2.10.0")
1211

1312
libraryDependencies ++= Seq(
1413
"commons-io" % "commons-io" % "2.4",
15-
"org.scala-lang" % "scala-compiler" % "2.10.3" % "provided",
16-
"org.scalatest" %% "scalatest" % "2.0" % "test",
17-
"org.mockito" % "mockito-all" % "1.9.5" % "test",
18-
"org.specs2" %% "specs2" % "2.3.7" % "test"
14+
"org.scala-lang" % "scala-compiler" % "2.10.3" % "provided",
15+
"org.scalatest" %% "scalatest" % "2.1.0" % "test",
16+
"org.mockito" % "mockito-all" % "1.9.5" % "test"
1917
)
2018

2119
publishMavenStyle := true
@@ -30,6 +28,19 @@ pomIncludeRepository := {
3028

3129
javacOptions ++= Seq("-source", "1.6", "-target", "1.6")
3230

31+
scalaVersion := "2.10.3"
32+
33+
//crossScalaVersions := Seq("2.10.3", "2.11.0-RC1")
34+
//
35+
//libraryDependencies := {
36+
// CrossVersion.partialVersion(scalaVersion.value) match {
37+
// case Some((2, scalaMajor)) if scalaMajor >= 11 =>
38+
// libraryDependencies.value :+ "org.scala-lang.modules" %% "scala-xml" % "1.0.0"
39+
// case _ =>
40+
// libraryDependencies.value
41+
// }
42+
//}
43+
3344
publishTo <<= version {
3445
(v: String) =>
3546
val nexus = "https://oss.sonatype.org/"

0 commit comments

Comments
 (0)