Skip to content

Commit 8d9599c

Browse files
committed
Add sbt.boot.properties to git repo and source locally instead of from s3
1 parent 21a6f08 commit 8d9599c

6 files changed

+68
-27
lines changed

bin/compile

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
# fail fast
55
set -e
66

7-
BIN_DIR=$(cd $(dirname $0); pwd) # absolute path
7+
BP_DIR=$(cd $(dirname $0)/..; pwd) # absolute path
8+
BIN_DIR=$BP_DIR/bin
9+
OPT_DIR=$BP_DIR/opt
810
. $BIN_DIR/common
911

1012
# parse args
@@ -112,7 +114,11 @@ if [ ! -f "$SBT_BINDIR"/"$SBT_JAR" ]; then
112114
cd $BUILD_DIR
113115
fi
114116

115-
curl --silent --max-time 10 --location $SBT_PROPS_URL --output "$SBT_BINDIR"/sbt.boot.properties --fail || error "Error, SBT version $SBT_VERSION not supported"
117+
if [ -f $OPT_DIR/$SBT_PROPS ]; then
118+
cp $OPT_DIR/$SBT_PROPS $SBT_BINDIR/sbt.boot.properties
119+
else
120+
error "Error, SBT version $SBT_VERSION not supported"
121+
fi
116122

117123
HEROKU_PLUGIN="Heroku-0.11.3.scala"
118124
mkdir -p "$SBT_USER_HOME/.sbt/plugins"
File renamed without changes.

opt/sbt-0.11.0.boot.properties.noproxy

-25
This file was deleted.

opt/sbt-0.11.1.boot.properties

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[scala]
2+
version: 2.9.1
3+
4+
[app]
5+
org: ${sbt.organization-org.scala-tools.sbt}
6+
name: sbt
7+
version: ${sbt.version-0.11.1}
8+
class: ${sbt.main.class-sbt.xMain}
9+
components: xsbti,extra
10+
cross-versioned: ${sbt.cross.versioned-true}
11+
12+
[repositories]
13+
local
14+
maven-local
15+
heroku-typesafe-ivy: http://s3pository.heroku.com/ivy-typesafe-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
16+
heroku-central: http://s3pository.heroku.com/maven-central/
17+
heroku-typesafe-snapshots: http://s3pository.heroku.com/ivy-typesafe-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
18+
19+
[log]
20+
level: info

opt/sbt-0.11.2.boot.properties

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[scala]
2+
version: 2.9.1
3+
4+
[app]
5+
org: ${sbt.organization-org.scala-tools.sbt}
6+
name: sbt
7+
version: ${sbt.version-0.11.2}
8+
class: ${sbt.main.class-sbt.xMain}
9+
components: xsbti,extra
10+
cross-versioned: ${sbt.cross.versioned-true}
11+
12+
[repositories]
13+
local
14+
maven-local
15+
heroku-typesafe-ivy: http://s3pository.heroku.com/ivy-typesafe-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
16+
heroku-central: http://s3pository.heroku.com/maven-central/
17+
heroku-typesafe-snapshots: http://s3pository.heroku.com/ivy-typesafe-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
18+
19+
[log]
20+
level: info

opt/sbt-0.11.3.boot.properties

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[scala]
2+
version: 2.9.1
3+
4+
[app]
5+
org: ${sbt.organization-org.scala-sbt}
6+
name: sbt
7+
version: ${sbt.version-0.11.3}
8+
class: ${sbt.main.class-sbt.xMain}
9+
components: xsbti,extra
10+
cross-versioned: ${sbt.cross.versioned-true}
11+
12+
[repositories]
13+
local
14+
maven-local
15+
heroku-typesafe-ivy: http://s3pository.heroku.com/ivy-typesafe-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
16+
heroku-central: http://s3pository.heroku.com/maven-central/
17+
heroku-typesafe-snapshots: http://s3pository.heroku.com/ivy-typesafe-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
18+
19+
[log]
20+
level: info

0 commit comments

Comments
 (0)