From 941393cab4b2c6cbd190f5218b19fe4c7d410b43 Mon Sep 17 00:00:00 2001 From: Mygod Date: Mon, 8 Aug 2016 01:16:46 +0800 Subject: [PATCH] Update dependencies --- build.sbt | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/build.sbt b/build.sbt index 40b00afb..038e3c16 100644 --- a/build.sbt +++ b/build.sbt @@ -37,16 +37,16 @@ libraryDependencies ++= Seq( "com.github.kevinsawicki" % "http-request" % "6.0", "eu.chainfire" % "libsuperuser" % "1.0.0.201607041850", "net.glxn.qrgen" % "android" % "2.0", - "com.google.android.gms" % "play-services-ads" % "9.2.1", - "com.google.android.gms" % "play-services-analytics" % "9.2.1", - "com.android.support" % "design" % "24.1.0", - "com.android.support" % "gridlayout-v7" % "24.1.0", - "com.android.support" % "cardview-v7" % "24.1.0", + "com.google.android.gms" % "play-services-ads" % "9.4.0", + "com.google.android.gms" % "play-services-analytics" % "9.4.0", + "com.android.support" % "design" % "24.1.1", + "com.android.support" % "gridlayout-v7" % "24.1.1", + "com.android.support" % "cardview-v7" % "24.1.1", "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01", - "com.j256.ormlite" % "ormlite-android" % "4.48", + "com.j256.ormlite" % "ormlite-android" % "5.0", "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2", "com.github.clans" % "fab" % "1.6.4", - "me.dm7.barcodescanner" % "zxing" % "1.8.4" + "me.dm7.barcodescanner" % "zxing" % "1.9" ) proguardVersion in Android := "5.2.1" @@ -55,12 +55,8 @@ proguardCache in Android := Seq() proguardOptions in Android ++= Seq( "-keep class com.github.shadowsocks.System { *; }", - "-dontwarn com.google.android.gms.**", - "-keep class com.google.android.gms.**", - "-dontnote com.google.android.gms.internal.**", - "-dontnote com.j256.ormlite.**", - "-dontnote me.dm7.barcodescannerview.**", - "-dontnote org.xbill.**", + "-dontwarn com.google.android.gms.internal.**", + "-dontwarn com.j256.ormlite.**", "-dontwarn org.xbill.**") lazy val nativeBuild = TaskKey[Unit]("native-build", "Build native executables")