diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-09-17 16:18:31 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-09-17 16:18:31 +1000 |
| commit | 01103764ef576395dc6201d1d2b5a700a28bdd2a (patch) | |
| tree | 278005d7e09acb9e178236144747406bfd38c729 /build.sbt | |
| parent | 7719a3cc908464d34d602a7a5a23e943059bb714 (diff) | |
| parent | 224efebaf17e2bb91bd89348f63bb0905dc72288 (diff) | |
| download | scala-01103764ef576395dc6201d1d2b5a700a28bdd2a.tar.gz scala-01103764ef576395dc6201d1d2b5a700a28bdd2a.tar.bz2 scala-01103764ef576395dc6201d1d2b5a700a28bdd2a.zip | |
Merge remote-tracking branch 'origin/2.11.x' into topic/completely-2.11
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, |