diff options
author | Seth Tisue <seth@tisue.net> | 2015-09-14 15:09:36 -0400 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2015-09-14 15:11:44 -0400 |
commit | 9770578aa11156ab4983f72560defc78a0902448 (patch) | |
tree | b0c6c687a6f1984ae76e93cda126b8d66e6a602d /build.sbt | |
parent | cc05d611ec09a926a0d9f99fa029f2be3da4d6cb (diff) | |
download | scala-9770578aa11156ab4983f72560defc78a0902448.tar.gz scala-9770578aa11156ab4983f72560defc78a0902448.tar.bz2 scala-9770578aa11156ab4983f72560defc78a0902448.zip |
sbt build: bring versions up to date with versions.properties
Scala bootstrap version, ScalaCheck version should be the same
as the ant build.
Diffstat (limited to 'build.sbt')
-rw-r--r-- | build.sbt | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -50,7 +50,7 @@ * https://groups.google.com/d/topic/scala-internals/gp5JsM1E0Fo/discussion */ -val bootstrapScalaVersion = "2.11.5" +val bootstrapScalaVersion = "2.11.7" def withoutScalaLang(moduleId: ModuleID): ModuleID = moduleId exclude("org.scala-lang", "*") @@ -64,11 +64,11 @@ val junitIntefaceDep = "com.novocode" % "junit-interface" % "0.11" % "test" val asmDep = "org.scala-lang.modules" % "scala-asm" % versionProps("scala-asm.version") val jlineDep = "jline" % "jline" % versionProps("jline.version") val antDep = "org.apache.ant" % "ant" % "1.9.4" -val scalacheckDep = withoutScalaLang("org.scalacheck" %% "scalacheck" % "1.11.4") +val scalacheckDep = withoutScalaLang("org.scalacheck" %% "scalacheck" % "1.11.6") lazy val commonSettings = clearSourceAndResourceDirectories ++ Seq[Setting[_]]( organization := "org.scala-lang", - version := "2.11.6-SNAPSHOT", + version := "2.11.8-SNAPSHOT", scalaVersion := bootstrapScalaVersion, // we don't cross build Scala itself crossPaths := false, |