Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

support sbt 0.13.1, use java 1.7 by default #61

Closed
wants to merge 2 commits into from

2 participants

@fizx

No description provided.

@naaman
Owner

Can you separate these into two pull requests? Making JDK 1.7 the default requires some communication to ensure we don't break existing user's apps. The SBT 0.13.1 change is quite a bit simpler.

@naaman naaman closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 3, 2014
  1. @fizx

    use java 1.7

    fizx authored
  2. @fizx

    add boot.properties for 0.13.1

    fizx authored
This page is out of date. Refresh to see the latest.
Showing with 23 additions and 1 deletion.
  1. +1 −1  bin/compile
  2. +22 −0 opt/sbt-0.13.1.boot.properties
View
2  bin/compile
@@ -29,7 +29,7 @@ mkdir -p $CACHE_DIR
# create default system.properties
if [ ! -f ${BUILD_DIR}/system.properties ]; then
- echo "java.runtime.version=1.6" > ${BUILD_DIR}/system.properties
+ echo "java.runtime.version=1.7" > ${BUILD_DIR}/system.properties
fi
# install JDK
View
22 opt/sbt-0.13.1.boot.properties
@@ -0,0 +1,22 @@
+[scala]
+ version: ${sbt.scala.version-auto}
+
+[app]
+ org: ${sbt.organization-org.scala-sbt}
+ name: sbt
+ version: ${sbt.version-read(sbt.version)[0.13.1]}
+ class: ${sbt.main.class-sbt.xMain}
+ components: xsbti,extra
+ cross-versioned: ${sbt.cross.versioned-false}
+
+[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-typesafe-snapshots: http://s3pository.heroku.com/ivy-typesafe-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext]
+ typesafe-releases: http://typesafe.artifactoryonline.com/typesafe/releases
+ typesafe-ivy-releases: http://typesafe.artifactoryonline.com/typesafe/ivy-releases, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]
+
+[log]
+ level: info
Something went wrong with that request. Please try again.