luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1092 from gkossakowski/scala-2.11-compat 

Build for Scala 2.11
This commit is contained in:
Josh Suereth 2014-01-20 08:19:56 -08:00
parent c699e66342 ff0fd6eec6
commit 09d3487167
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project/Sbt.scala
View File

@ -276,7 +276,7 @@ object Sbt extends Build
artifact in (Compile, packageSrc) := Artifact(srcID).copy(configurations = Compile :: Nil).extra("e:component" -> srcID)
)
def compilerSettings = Seq(
libraryDependencies <+= scalaVersion( "org.scala-lang" % "scala-compiler" % _ % "test"),
libraryDependencies <+= scalaVersion( "org.scala-lang" % "scala-compiler" % _ % "test" excludeAll(ExclusionRule(organization = "org.scala-lang.modules"))),
unmanagedJars in Test <<= (packageSrc in compileInterfaceSub in Compile).map(x => Seq(x).classpath)
)
def precompiled(scalav: String): Project = baseProject(compilePath / "interface", "Precompiled " + scalav.replace('.', '_')) dependsOn(interfaceSub) settings(precompiledSettings : _*) settings(
@ -290,6 +290,6 @@ object Sbt extends Build
sources in Test := Nil
)
def ioSettings: Seq[Setting[_]] = Seq(
libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ % "test")
libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ % "test" excludeAll(ExclusionRule(organization = "org.scala-lang.modules")))
)
}

15
project/Util.scala
View File

@ -172,13 +172,16 @@ object Common
lazy val httpclient = lib("commons-httpclient" % "commons-httpclient" % "3.1")
lazy val jsch = lib("com.jcraft" % "jsch" % "0.1.46" intransitive() )
lazy val sbinary = libraryDependencies <+= Util.nightly211(n => "org.scala-tools.sbinary" % "sbinary" % "0.4.2" cross(if(n) CrossVersion.full else CrossVersion.binary))
lazy val scalaCompiler = libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ )
lazy val scalaCompiler = libraryDependencies <+= scalaVersion(
sv => "org.scala-lang" % "scala-compiler" % sv excludeAll(ExclusionRule(organization = "org.scala-lang.modules")))
lazy val testInterface = lib("org.scala-sbt" % "test-interface" % "1.0")
def libModular(name: String) = libraryDependencies <++= (scalaVersion, scalaOrganization)( (sv,o) =>
if(sv.startsWith("2.11.")) (o % name % sv) :: Nil else Nil
)
lazy val scalaXml = libModular("scala-xml")
lazy val scalaParsers = libModular("scala-parser-combinators")
private def scala211Module(name: String, moduleVersion: String) =
libraryDependencies <++= (scalaVersion)( scalaVersion =>
if (scalaVersion startsWith "2.11.") ("org.scala-lang.modules" %% name % moduleVersion) :: Nil
else Nil
)
lazy val scalaXml = scala211Module("scala-xml", "1.0.0-RC7")
lazy val scalaParsers = scala211Module("scala-parser-combinators", "1.0.0-RC5")
}
object Licensed
{