Skip to content
Permalink
Browse files

bump up dependencies

  • Loading branch information
pocorall committed Oct 29, 2014
1 parent c755ee1 commit d1ac185531c022680dd9fe6e53762e89361f13ae
Showing with 8 additions and 5 deletions.
  1. +6 −3 build.sbt
  2. +1 −1 project/build.properties
  3. +1 −1 project/plugins.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"

@@ -1 +1 @@
sbt.version=0.13.5
sbt.version=0.13.6
@@ -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")

0 comments on commit d1ac185

Please sign in to comment.
You can’t perform that action at this time.