Skip to content

Commit

Permalink
update for 0.11.0 GA
Browse files Browse the repository at this point in the history
  • Loading branch information
sclasen committed Sep 25, 2011
1 parent 29d1fbc commit c2b6d15
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 3 deletions.
14 changes: 11 additions & 3 deletions bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,21 @@ for DIR in $CACHED_DIRS; do
done


if grep -q -v 'sbt.version *= *0\.11\.' project/build.properties ; then
if grep -q -v 'sbt.version *= *0\.11\.[0-9]' project/build.properties; then
echo " ! Error, you have defined an unsupported sbt.version in project/build.properties"
echo " ! You must use sbt.version=0.11.0-RC1 or greater"
echo " ! You must use a release verison of sbt, sbt.version=0.11.0 or greater"
exit 1
fi

SBT_VERSION="0.11.0-RC1"
if grep -q 'sbt.version *= *0\.11\.[0-9]-RC' project/build.properties; then
echo " ! Error, you have defined an unsupported sbt.version in project/build.properties"
echo " ! You must use a release verison of sbt, sbt.version=0.11.0 or greater"
exit 1
fi



SBT_VERSION="0.11.0"
SBT_JAR="sbt-launch-$SBT_VERSION.jar"
SBT_PROPS="sbt-$SBT_VERSION.boot.properties"
SBT_URL="http://s3.amazonaws.com/heroku-jvm-langpack-scala/$SBT_JAR"
Expand Down
13 changes: 13 additions & 0 deletions opt/Heroku-0.11.0.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import sbt._
import Keys._

object Heroku extends Plugin {
override def settings = Seq(
externalResolvers <<= resolvers map { appResolvers =>
Seq(Resolver.defaultLocal) ++ appResolvers ++
Seq(Resolver.url("heroku-sbt-typesafe") artifacts "http://s3pository.heroku.com/ivy-typesafe-releases/[organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]",
"heroku-central" at "http://s3pository.heroku.com/maven-central/",
"heroku-scala-tools-releases" at "http://s3pository.heroku.com/maven-scala-tools-releases/",
"heroku-scala-tools-snapshots" at "http://s3pository.heroku.com/maven-scala-tools-snapshots/")
})
}
6 changes: 6 additions & 0 deletions opt/heroku-plugins-0.11.0.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
resolvers ++= Seq(Resolver.url("heroku-sbt-typesafe") artifacts "http://s3pository.heroku.com/ivy-typesafe-releases/[organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]",
"heroku-central" at "http://s3pository.heroku.com/maven-central/",
"heroku-scala-tools-releases" at "http://s3pository.heroku.com/maven-scala-tools-releases/",
"heroku-scala-tools-snapshots" at "http://s3pository.heroku.com/maven-scala-tools-snapshots/")


3 changes: 3 additions & 0 deletions opt/sbt-0.11.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

/usr/bin/java $SBT_OPTS -jar `dirname $0`/sbt-launch-0.11.0.jar "$@"
24 changes: 24 additions & 0 deletions opt/sbt-0.11.0.boot.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[scala]
version: 2.9.1
[app]
org: org.scala-tools.sbt
name: sbt
version: read(sbt.version)
class: sbt.xMain
components: xsbti
cross-versioned: true
# classifiers: sources, javadocs

[repositories]
local
maven-local
heroku-typesafe-ivy: http://s3pository.heroku.com/ivy-typesafe-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
heroku-central: http://s3pository.heroku.com/maven-central/
heroku-scala-tools-releases: http://s3pository.heroku.com/maven-scala-tools-releases/
heroku-typesafe-snapshots: http://s3pository.heroku.com/ivy-typesafe-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
heroku-scala-tools-snapshots: http://s3pository.heroku.com/maven-scala-tools-snapshots/

[log]
level: info


0 comments on commit c2b6d15

Please sign in to comment.