Permalink
Browse files

Merge pull request #5 from psm14/master

Use newer version of Scala, ScalaTest, and the Android sbt plugin
  • Loading branch information...
2 parents c40e5ca + b0e2ac1 commit c909afd6366328a15783bd9d8311cb7918a0bc9a @jberkel committed Sep 27, 2012
Showing with 3 additions and 3 deletions.
  1. +2 −2 src/main/g8/default.properties
  2. +1 −1 src/main/g8/project/plugins.sbt
View
4 src/main/g8/default.properties
@@ -1,8 +1,8 @@
name=My Android Project
api_level=10
-scala_version=2.9.1
+scala_version=2.9.2
main_activity=MainActivity
package=my.android.project
description=Template for Android apps in Scala
useProguard=true
-scalatest_version=1.8.RC1
+scalatest_version=1.8
View
2 src/main/g8/project/plugins.sbt
@@ -1,3 +1,3 @@
resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns)
-addSbtPlugin("org.scala-sbt" % "sbt-android-plugin" % "0.6.1")
+addSbtPlugin("org.scala-sbt" % "sbt-android-plugin" % "0.6.2")

0 comments on commit c909afd

Please sign in to comment.