Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update dependencies

Browse Source
This commit is contained in:
Mygod
2017-07-29 14:36:37 +08:00
parent 258cb0c9c9
commit 1db2d81aca
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.sbt
+1 -1
View File
@@ -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)
mobile/build.sbt
+3 -3
View File
@@ -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
mobile/src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala
+1 -2
View File
@@ -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)
project/plugins.sbt
+1 -1
View File
@@ -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")