Commit 1db2d81a authored by Mygod's avatar Mygod

Update dependencies

parent 258cb0c9
...@@ -23,7 +23,7 @@ lazy val commonSettings = Seq( ...@@ -23,7 +23,7 @@ lazy val commonSettings = Seq(
resolvers += "google" at "https://maven.google.com" 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(".")) lazy val root = Project(id = "shadowsocks-android", base = file("."))
.settings(commonSettings) .settings(commonSettings)
.aggregate(plugin, mobile) .aggregate(plugin, mobile)
......
...@@ -23,7 +23,7 @@ proguardOptions ++= ...@@ -23,7 +23,7 @@ proguardOptions ++=
"-keep public class com.evernote.android.job.JobRescheduleService" :: "-keep public class com.evernote.android.job.JobRescheduleService" ::
Nil Nil
val playServicesVersion = "11.0.2" val playServicesVersion = "11.0.4"
resolvers += Resolver.jcenterRepo resolvers += Resolver.jcenterRepo
libraryDependencies ++= libraryDependencies ++=
"com.futuremind.recyclerfastscroll" % "fastscroll" % "0.2.5" :: "com.futuremind.recyclerfastscroll" % "fastscroll" % "0.2.5" ::
...@@ -38,12 +38,12 @@ libraryDependencies ++= ...@@ -38,12 +38,12 @@ libraryDependencies ++=
"com.mikepenz" % "fastadapter" % "2.6.2" :: "com.mikepenz" % "fastadapter" % "2.6.2" ::
"com.mikepenz" % "iconics-core" % "2.8.9" :: "com.mikepenz" % "iconics-core" % "2.8.9" ::
"com.mikepenz" % "materialdrawer" % "5.9.4" :: "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.squareup.okhttp3" % "okhttp" % "3.8.1" ::
"com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" :: "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" ::
"dnsjava" % "dnsjava" % "2.1.8" :: "dnsjava" % "dnsjava" % "2.1.8" ::
"eu.chainfire" % "libsuperuser" % "1.0.0.201704021214" :: "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" :: "net.glxn.qrgen" % "android" % "2.0" ::
Nil Nil
......
...@@ -54,7 +54,7 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str ...@@ -54,7 +54,7 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
private var lockReceiver: BroadcastReceiver = _ private var lockReceiver: BroadcastReceiver = _
private var callbackRegistered: Boolean = _ private var callbackRegistered: Boolean = _
private val builder = new NotificationCompat.Builder(service) private val builder = new NotificationCompat.Builder(service, channel)
.setWhen(0) .setWhen(0)
.setColor(ContextCompat.getColor(service, R.color.material_primary_500)) .setColor(ContextCompat.getColor(service, R.color.material_primary_500))
.setTicker(service.getString(R.string.forward_success)) .setTicker(service.getString(R.string.forward_success))
...@@ -62,7 +62,6 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str ...@@ -62,7 +62,6 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
.setContentIntent(PendingIntent.getActivity(service, 0, new Intent(service, classOf[MainActivity]) .setContentIntent(PendingIntent.getActivity(service, 0, new Intent(service, classOf[MainActivity])
.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), 0)) .setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), 0))
.setSmallIcon(R.drawable.ic_stat_shadowsocks) .setSmallIcon(R.drawable.ic_stat_shadowsocks)
.setChannel(channel)
if (Build.VERSION.SDK_INT < 24) builder.addAction(R.drawable.ic_navigation_close, 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)) service.getString(R.string.stop), PendingIntent.getBroadcast(service, 0, new Intent(Action.CLOSE), 0))
private lazy val style = new BigTextStyle(builder) private lazy val style = new BigTextStyle(builder)
......
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") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment