diff options
| author | Seth Tisue <seth@tisue.net> | 2015-09-15 08:52:28 -0400 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2015-09-15 08:52:28 -0400 |
| commit | c804987a6406e5bfe25a6653648cb8356a4390a9 (patch) | |
| tree | f82190f6b53bf7107f20cd52c76b48eced1e6286 | |
| parent | 00415d7fbb3f08b6f8c7e24e6ce1c5198e4ef712 (diff) | |
| parent | 049ccd9f19ebe7d09c6e5b215a977e99f690c414 (diff) | |
| download | scala-c804987a6406e5bfe25a6653648cb8356a4390a9.tar.gz scala-c804987a6406e5bfe25a6653648cb8356a4390a9.tar.bz2 scala-c804987a6406e5bfe25a6653648cb8356a4390a9.zip | |
Merge pull request #4743 from SethTisue/modernize-sbt-build
round of sbt build improvements
| -rw-r--r-- | build.sbt | 6 | ||||
| -rw-r--r-- | project/build.properties | 2 |
2 files changed, 4 insertions, 4 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, diff --git a/project/build.properties b/project/build.properties index 748703f770..817bc38df8 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.7 +sbt.version=0.13.9 |