diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-09-22 16:33:01 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-09-22 16:33:01 +0200 |
| commit | 663de2a9815dcfe38b42f4443341dfb84061e8df (patch) | |
| tree | 02b812925db7b9bf2feed3cd90e4da66f1efc839 /build.sbt | |
| parent | 9995935b6160171527b121263db75b56be6a9ca7 (diff) | |
| parent | a170c999e900dc9b94d8f1ddaa08be80e779102f (diff) | |
| download | scala-663de2a9815dcfe38b42f4443341dfb84061e8df.tar.gz scala-663de2a9815dcfe38b42f4443341dfb84061e8df.tar.bz2 scala-663de2a9815dcfe38b42f4443341dfb84061e8df.zip | |
Merge commit 'a170c99' into 2.12.x
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 = versionProps("starr.version") 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" % versionNumber("scalacheck") % "it") 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, |