You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lr...@apache.org on 2016/01/11 22:02:30 UTC

[48/50] [abbrv] incubator-toree git commit: Upgrade sbt to version 0.13.9

Upgrade sbt to version 0.13.9


Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/f81c327a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/f81c327a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/f81c327a

Branch: refs/heads/master
Commit: f81c327a524fe965dcadd07d44f4688b245b0248
Parents: 5a163a9
Author: Jakob Odersky <jo...@gmail.com>
Authored: Thu Dec 10 14:37:18 2015 -0800
Committer: Jakob Odersky <jo...@gmail.com>
Committed: Fri Dec 11 13:53:18 2015 -0800

----------------------------------------------------------------------
 Vagrantfile              | 6 +++---
 project/Common.scala     | 3 ---
 project/build.properties | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/f81c327a/Vagrantfile
----------------------------------------------------------------------
diff --git a/Vagrantfile b/Vagrantfile
index 09132da..a4f4986 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -98,9 +98,9 @@ fi
 
 # If sbt is not installed, install it
 if ! flag_is_set SBT; then
-  wget --progress=bar:force http://dl.bintray.com/sbt/debian/sbt-0.13.7.deb && \
-  dpkg -i sbt-0.13.7.deb && \
-  rm sbt-0.13.7.deb && \
+  wget --progress=bar:force http://dl.bintray.com/sbt/debian/sbt-0.13.9.deb && \
+  dpkg -i sbt-0.13.9.deb && \
+  rm sbt-0.13.9.deb && \
   set_flag SBT
 fi
 

http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/f81c327a/project/Common.scala
----------------------------------------------------------------------
diff --git a/project/Common.scala b/project/Common.scala
index 0c5f6e5..337b620 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -37,8 +37,6 @@ object Common {
     if (snapshot) s"$versionNumber-SNAPSHOT"
     else versionNumber
   private val buildScalaVersion = "2.10.4"
-  private val buildSbtVersion   = "0.13.7"
-
 
 
   // Global dependencies provided to all projects
@@ -82,7 +80,6 @@ object Common {
     organization := buildOrganization,
     version := buildVersion,
     scalaVersion := buildScalaVersion,
-    sbtVersion := buildSbtVersion,
     libraryDependencies ++= buildLibraryDependencies,
     isSnapshot := snapshot,
 

http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/f81c327a/project/build.properties
----------------------------------------------------------------------
diff --git a/project/build.properties b/project/build.properties
index bb200f4..02cb92b 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=0.13.7
+sbt.version=0.13.9