Permalink
Browse files

Merge branch 'master' of github.com:jberkel/android-plugin into typed

  • Loading branch information...
2 parents ccf200b + c3c1a5f commit 6b6c1470a67c9d77920786f5a620c8aaf80c074f @n8han n8han committed Jul 14, 2010
Showing with 11 additions and 3 deletions.
  1. +8 −0 README.markdown
  2. +3 −3 script/create_project
View
@@ -51,6 +51,14 @@ To build a signed package for release into the Marketplace
$ sbt sign-release
+##Scala Versions
+
+The version of Scala that sbt compiles your project against is configured in the `buildScalaVersion` property in the `project/build.properties` file. While this currently defaults to 2.7.7, you may set it to other versions including Scala 2.8 versions.
+
+Whenever you change build versions, you'll need to run `update` again to fetch dependencies. For more information, see the sbt documentation on [cross-building][cb].
+
+[cb]: http://code.google.com/p/simple-build-tool/wiki/CrossBuild
+
##Hacking on the plugin
If you need make modifications to the plugin itself, you can compile and install it locally (you need at least sbt 0.7.x to build it):
View
@@ -2,7 +2,7 @@
exec scala -deprecation "$0" "$@"
!#
-var apiLevel = "4"
+var apiLevel = "7"
var platform = "android-" + apiLevel
var activity = "MainActivity"
var scalaVersion = """\d\.\d\.\d""".r.findFirstIn(scala.util.Properties.versionString).getOrElse("2.7.7")
@@ -19,7 +19,7 @@ val e = args.elements
val (project, pkg) = (take(e), take(e))
while (e.hasNext) e.next match {
case "--activity" => activity = take(e)
- case "--api-level" => apiLevel = take(e)
+ case "--api-level" => apiLevel = take(e); platform = "android-" + apiLevel
case "--platform" => platform = take(e)
case "--scala-version" => scalaVersion = take(e)
case _ => usage
@@ -70,7 +70,7 @@ val buildProperties = """
|sbt.version=0.7.4
|project.version=0.1
|def.scala.version=2.7.7
- |build.scala.versions=2.7.7
+ |build.scala.versions=#{scalaVersion}
|project.initialize=false
|""".stripMargin.trim

0 comments on commit 6b6c147

Please sign in to comment.