aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--project/build.properties3
-rwxr-xr-xsbt/sbt2
2 files changed, 1 insertions, 4 deletions
diff --git a/project/build.properties b/project/build.properties
index 03438f6558..839f5fbb0c 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -14,7 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-# Note: If you change the sbt version please also change the sbt download
-# script sbt/sbt
sbt.version=0.12.4
diff --git a/sbt/sbt b/sbt/sbt
index 2c19987b92..22672f2346 100755
--- a/sbt/sbt
+++ b/sbt/sbt
@@ -2,7 +2,7 @@
# This script launches sbt for this project. If present it uses the system
# version of sbt. If there is no system version of sbt it attempts to download
# sbt locally.
-SBT_VERSION=0.12.4
+SBT_VERSION=`awk -F "=" '/sbt\\.version/ {print $2}' ./project/build.properties`
URL1=http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar
URL2=http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar
JAR=sbt/sbt-launch-${SBT_VERSION}.jar