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

Merge pull request #2068 from sbt/wip/scalaversionbump 

Bumping up Scala version to 2.10.5/2.11.6. Fixes #1666, Ref #1980
This commit is contained in:
eugene yokota 2015-06-20 10:59:03 -04:00
parent e381ac6157 d0473906c2
commit 3cda2efb96
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -24,7 +24,7 @@ def buildLevelSettings: Seq[Setting[_]] = Seq(
) )
def commonSettings: Seq[Setting[_]] = Seq( def commonSettings: Seq[Setting[_]] = Seq(
scalaVersion := "2.10.4", scalaVersion := scala210,
publishArtifact in packageDoc := false, publishArtifact in packageDoc := false,
publishMavenStyle := false, publishMavenStyle := false,
componentID := None, componentID := None,
@ -387,7 +387,7 @@ lazy val scriptedBaseProj = (project in scriptedPath / "base").
) )
lazy val scriptedSbtProj = (project in scriptedPath / "sbt"). lazy val scriptedSbtProj = (project in scriptedPath / "sbt").
dependsOn (ioProj, logProj, processProj, scriptedBaseProj). dependsOn (ioProj, logProj, processProj, scriptedBaseProj, interfaceProj).
settings( settings(
baseSettings, baseSettings,
name := "Scripted sbt", name := "Scripted sbt",