File tree Expand file tree Collapse file tree 2 files changed +12
-5
lines changed Expand file tree Collapse file tree 2 files changed +12
-5
lines changed Original file line number Diff line number Diff line change @@ -38,9 +38,11 @@ crossScalaVersions := Seq("2.10.4", "2.11.0")
38
38
39
39
libraryDependencies := {
40
40
CrossVersion .partialVersion(scalaVersion.value) match {
41
- case Some ((2 , scalaMajor)) if scalaMajor >= 11 =>
41
+ case Some ((2 , scalaMajor)) if scalaMajor == 11 =>
42
+ System .setProperty(" CrossBuildScalaVersion" , " 2.11.0" )
42
43
libraryDependencies.value :+ " org.scala-lang.modules" %% " scala-xml" % " 1.0.1"
43
44
case _ =>
45
+ System .setProperty(" CrossBuildScalaVersion" , " 2.10.4" )
44
46
libraryDependencies.value
45
47
}
46
48
}
Original file line number Diff line number Diff line change @@ -11,13 +11,18 @@ import scala.collection.mutable.ListBuffer
11
11
trait PluginSupport {
12
12
13
13
val scalaVersion = " 2.11.0"
14
+ // System.getProperty("CrossBuildScalaVersion")
14
15
val shortScalaVersion = scalaVersion.dropRight(2 )
15
16
16
- val settings = new scala.tools.nsc.Settings
17
17
val classPath = getScalaJars.map(_.getAbsolutePath) :+ sbtCompileDir.getAbsolutePath
18
- settings.Xprint .value = List (" all" )
19
- settings.Yrangepos .value = true
20
- settings.classpath.value = classPath.mkString(" :" )
18
+
19
+ val settings = {
20
+ val settings = new scala.tools.nsc.Settings
21
+ settings.Xprint .value = List (" all" )
22
+ settings.Yrangepos .value = true
23
+ settings.classpath.value = classPath.mkString(" :" )
24
+ settings
25
+ }
21
26
22
27
val reporter = new scala.tools.nsc.reporters.ConsoleReporter (settings)
23
28
You can’t perform that action at this time.
0 commit comments