From 1db2d81aca6ee26fe0a850a41b577604f31dd1f3 Mon Sep 17 00:00:00 2001 From: Mygod Date: Sat, 29 Jul 2017 13:14:35 +0800 Subject: [PATCH] Update dependencies --- build.sbt | 2 +- mobile/build.sbt | 6 +++--- .../com/github/shadowsocks/ShadowsocksNotification.scala | 3 +-- project/plugins.sbt | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index e7a574b7..db86a192 100644 --- a/build.sbt +++ b/build.sbt @@ -23,7 +23,7 @@ lazy val commonSettings = Seq( resolvers += "google" at "https://maven.google.com" ) -val supportLibsVersion = "26.0.0-beta2" +val supportLibsVersion = "26.0.0" lazy val root = Project(id = "shadowsocks-android", base = file(".")) .settings(commonSettings) .aggregate(plugin, mobile) diff --git a/mobile/build.sbt b/mobile/build.sbt index c5e20eee..54c86540 100644 --- a/mobile/build.sbt +++ b/mobile/build.sbt @@ -23,7 +23,7 @@ proguardOptions ++= "-keep public class com.evernote.android.job.JobRescheduleService" :: Nil -val playServicesVersion = "11.0.2" +val playServicesVersion = "11.0.4" resolvers += Resolver.jcenterRepo libraryDependencies ++= "com.futuremind.recyclerfastscroll" % "fastscroll" % "0.2.5" :: @@ -38,12 +38,12 @@ libraryDependencies ++= "com.mikepenz" % "fastadapter" % "2.6.2" :: "com.mikepenz" % "iconics-core" % "2.8.9" :: "com.mikepenz" % "materialdrawer" % "5.9.4" :: - "com.mikepenz" % "materialize" % "1.0.2" :: + "com.mikepenz" % "materialize" % "1.0.3" :: "com.squareup.okhttp3" % "okhttp" % "3.8.1" :: "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" :: "dnsjava" % "dnsjava" % "2.1.8" :: "eu.chainfire" % "libsuperuser" % "1.0.0.201704021214" :: - "me.dm7.barcodescanner" % "zxing" % "1.9.3" :: + "me.dm7.barcodescanner" % "zxing" % "1.9.5" :: "net.glxn.qrgen" % "android" % "2.0" :: Nil diff --git a/mobile/src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala b/mobile/src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala index 7ca79437..6433d985 100644 --- a/mobile/src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala +++ b/mobile/src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala @@ -54,7 +54,7 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str private var lockReceiver: BroadcastReceiver = _ private var callbackRegistered: Boolean = _ - private val builder = new NotificationCompat.Builder(service) + private val builder = new NotificationCompat.Builder(service, channel) .setWhen(0) .setColor(ContextCompat.getColor(service, R.color.material_primary_500)) .setTicker(service.getString(R.string.forward_success)) @@ -62,7 +62,6 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str .setContentIntent(PendingIntent.getActivity(service, 0, new Intent(service, classOf[MainActivity]) .setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), 0)) .setSmallIcon(R.drawable.ic_stat_shadowsocks) - .setChannel(channel) if (Build.VERSION.SDK_INT < 24) builder.addAction(R.drawable.ic_navigation_close, service.getString(R.string.stop), PendingIntent.getBroadcast(service, 0, new Intent(Action.CLOSE), 0)) private lazy val style = new BigTextStyle(builder) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8fd06146..8246189c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-android" % "sbt-android" % "1.7.7") +addSbtPlugin("org.scala-android" % "sbt-android" % "1.7.8") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")