bump up dependencies

pocorall · Oct 29, 2014 · d1ac185 · d1ac185
1 parent c755ee1
commit d1ac185
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -4,15 +4,18 @@ android.Plugin.androidBuild
 
 name := "hello-scaloid-sbt"
 
-scalaVersion := "2.11.2"
+scalaVersion := "2.11.3"
 
 proguardCache in Android ++= Seq(
   ProguardCache("org.scaloid") % "org.scaloid"
 )
 
-proguardOptions in Android ++= Seq("-dontobfuscate", "-dontoptimize", "-dontwarn scala.collection.mutable.**")
+proguardOptions in Android ++= Seq("-dontobfuscate", "-dontoptimize", "-keepattributes Signature"
+  , "-dontwarn scala.collection.**" // required from Scala 2.11.3
+  , "-dontwarn scala.collection.mutable.**" // required from Scala 2.11.0
+)
 
-libraryDependencies += "org.scaloid" %% "scaloid" % "3.5-10" withSources() withJavadoc()
+libraryDependencies += "org.scaloid" %% "scaloid" % "3.6-10" withSources() withJavadoc()
 
 scalacOptions in Compile += "-feature"
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.5
+sbt.version=0.13.6
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.3.5")
+addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.3.6")
 
 addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")