Created
April 25, 2014 14:17
-
-
Save gkossakowski/11291128 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Greks-MBP:uber-build grek (test/new-zinc-script2)$ git diff | |
diff --git a/config/nightly-4.0.x-juno-2.11.conf b/config/nightly-4.0.x-juno-2.11.conf | |
index 27de8cd..f115399 100644 | |
--- a/config/nightly-4.0.x-juno-2.11.conf | |
+++ b/config/nightly-4.0.x-juno-2.11.conf | |
@@ -37,12 +37,12 @@ BUILD_TYPE=dev | |
##### Scala information ##### | |
SCALA_GIT_REPO=git://github.com/scala/scala | |
# The version of Scala to use | |
-SCALA_VERSION=2.11.0-SNAPSHOT | |
+SCALA_VERSION=2.11.0 | |
# The git version of Scala to use | |
#SCALA_GIT_HASH= | |
##### zinc information ##### | |
-SBT_VERSION=0.13.1 | |
+SBT_VERSION=0.13.5-M3 | |
SBT_TAG=v${SBT_VERSION} | |
SBT_BUILD_FILE=sbt-on-2.11.x | |
diff --git a/config/release-40x-211.conf b/config/release-40x-211.conf | |
index 1a4b691..11d9fa4 100644 | |
--- a/config/release-40x-211.conf | |
+++ b/config/release-40x-211.conf | |
@@ -37,12 +37,12 @@ BUILD_TYPE=dev | |
##### Scala information ##### | |
SCALA_GIT_REPO=git://github.com/scala/scala | |
# The version of Scala to use | |
-SCALA_VERSION=2.11.0-M8 | |
+SCALA_VERSION=2.11.0 | |
# The git version of Scala to use | |
#SCALA_GIT_HASH= | |
##### zinc information ##### | |
-SBT_VERSION=0.13.1 | |
+SBT_VERSION=0.13.5-M3 | |
SBT_TAG=v${SBT_VERSION} | |
SBT_BUILD_FILE=sbt-on-2.11.x | |
diff --git a/zinc/sbt-on-2.11.x.properties b/zinc/sbt-on-2.11.x.properties | |
index e55bafc..f988ad6 100644 | |
--- a/zinc/sbt-on-2.11.x.properties | |
+++ b/zinc/sbt-on-2.11.x.properties | |
@@ -5,12 +5,12 @@ publish-repo=http://private-repo.typesafe.com/typesafe/ide-2.11 | |
# Version the IDE will see/pull in. | |
-sbt-version=0.13.1-on-2.11.0-SNAPSHOT-for-IDE-SNAPSHOT | |
+sbt-version=0.13.5-M3-on-2.11.0-SNAPSHOT-for-IDE-SNAPSHOT | |
# Git branch tags for this distribution. | |
scalacheck-tag=1.11.3 | |
sbinary-tag=2.11 | |
-sbt-tag=sbt-0.13.1-scala-2.11.0-M8 | |
+sbt-tag=v0.13.5-M3 | |
sbt-republish-tag=master | |
-zinc-tag=v0.3.0 | |
-sbt-build-sbt-version=0.13.1 | |
+zinc-tag=v0.3.5-M3 | |
+sbt-build-sbt-version=0.13.5-M3 | |
Greks-MBP:uber-build grek (test/new-zinc-script2)$ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment