From 6d6ffba83bb9944b0cd9c9c981c52540b353b96c Mon Sep 17 00:00:00 2001 From: Mygod Date: Sun, 19 Nov 2017 01:47:05 -0800 Subject: [PATCH] Update dependencies --- build.sbt | 4 ++-- mobile/build.sbt | 14 +++++++------- .../overture/src/github.com/shadowsocks/overture | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.sbt b/build.sbt index e1b5bcef..d4583673 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ lazy val commonSettings = Seq( - scalaVersion := "2.11.11", + scalaVersion := "2.11.12", dexMaxHeap := "4g", organization := "com.github.shadowsocks", @@ -23,7 +23,7 @@ lazy val commonSettings = Seq( resolvers += "google" at "https://maven.google.com" ) -val supportLibsVersion = "27.0.0" +val supportLibsVersion = "27.0.1" 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 d89a4338..b4e45a01 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.4.2" +val playServicesVersion = "11.6.0" resolvers += Resolver.jcenterRepo libraryDependencies ++= "com.futuremind.recyclerfastscroll" % "fastscroll" % "0.2.5" :: @@ -34,12 +34,12 @@ libraryDependencies ++= "com.google.android.gms" % "play-services-gcm" % playServicesVersion :: "com.google.firebase" % "firebase-config" % playServicesVersion :: "com.j256.ormlite" % "ormlite-android" % "5.0" :: - "com.mikepenz" % "crossfader" % "1.5.0" :: - "com.mikepenz" % "fastadapter" % "2.6.3" :: - "com.mikepenz" % "iconics-core" % "2.9.3" :: - "com.mikepenz" % "materialdrawer" % "5.9.5" :: - "com.mikepenz" % "materialize" % "1.0.3" :: - "com.squareup.okhttp3" % "okhttp" % "3.9.0" :: + "com.mikepenz" % "crossfader" % "1.5.1" :: + "com.mikepenz" % "fastadapter" % "3.0.4" :: + "com.mikepenz" % "iconics-core" % "3.0.0" :: + "com.mikepenz" % "materialdrawer" % "6.0.2" :: + "com.mikepenz" % "materialize" % "1.1.2" :: + "com.squareup.okhttp3" % "okhttp" % "3.9.1" :: "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" :: "dnsjava" % "dnsjava" % "2.1.8" :: "eu.chainfire" % "libsuperuser" % "1.0.0.201704021214" :: diff --git a/mobile/src/overture/src/github.com/shadowsocks/overture b/mobile/src/overture/src/github.com/shadowsocks/overture index c8ec480c..943e9dcb 160000 --- a/mobile/src/overture/src/github.com/shadowsocks/overture +++ b/mobile/src/overture/src/github.com/shadowsocks/overture @@ -1 +1 @@ -Subproject commit c8ec480cf716be70bc3cae2c4cd7f2733901ab09 +Subproject commit 943e9dcb62c47e9016b39185c4d92592e05b6fbb