From dc439b0802342a0eafe153c4099a78cb298b8f57 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Fri, 14 Jul 2017 11:05:57 +0800
Subject: [PATCH] Update to API 26

---
 build.sbt                           |  4 ++--
 mobile/build.sbt                    | 14 +++++++-------
 mobile/src/main/AndroidManifest.xml |  2 +-
 plugin/src/main/AndroidManifest.xml |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.sbt b/build.sbt
index 5f6450c5..e7a574b7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,7 +4,7 @@ lazy val commonSettings = Seq(
 
   organization := "com.github.shadowsocks",
 
-  platformTarget := "android-O",
+  platformTarget := "android-26",
 
   compileOrder := CompileOrder.JavaThenScala,
   javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil,
@@ -23,7 +23,7 @@ lazy val commonSettings = Seq(
   resolvers += "google" at "https://maven.google.com"
 )
 
-val supportLibsVersion = "26.0.0-beta1"
+val supportLibsVersion = "26.0.0-beta2"
 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 44b43590..4c00204d 100644
--- a/mobile/build.sbt
+++ b/mobile/build.sbt
@@ -16,11 +16,11 @@ proguardOptions ++=
   "-keep class com.github.shadowsocks.JniHelper { *; }" ::
   Nil
 
-val playServicesVersion = "10.2.6"
+val playServicesVersion = "11.0.2"
 resolvers += Resolver.jcenterRepo
 libraryDependencies ++=
   "com.futuremind.recyclerfastscroll" % "fastscroll" % "0.2.5" ::
-  "com.evernote" % "android-job" % "1.1.10" ::
+  "com.evernote" % "android-job" % "1.1.11" ::
   "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01" ::
   "com.google.android.gms" % "play-services-ads" % playServicesVersion ::
   "com.google.android.gms" % "play-services-analytics" % playServicesVersion ::
@@ -28,11 +28,11 @@ libraryDependencies ++=
   "com.google.firebase" % "firebase-config" % playServicesVersion ::
   "com.j256.ormlite" % "ormlite-android" % "5.0" ::
   "com.mikepenz" % "crossfader" % "1.5.0" ::
-  "com.mikepenz" % "fastadapter" % "2.5.2" ::
-  "com.mikepenz" % "iconics-core" % "2.8.4" ::
-  "com.mikepenz" % "materialdrawer" % "5.9.1" ::
-  "com.mikepenz" % "materialize" % "1.0.1" ::
-  "com.squareup.okhttp3" % "okhttp" % "3.8.0" ::
+  "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.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" ::
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index b39c6259..c720b571 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
 
     <uses-sdk
             android:minSdkVersion="19"
-            android:targetSdkVersion="O"/>
+            android:targetSdkVersion="26"/>
 
     <application
             android:name=".ShadowsocksApplication"
diff --git a/plugin/src/main/AndroidManifest.xml b/plugin/src/main/AndroidManifest.xml
index 8986ed41..ca89bcc9 100644
--- a/plugin/src/main/AndroidManifest.xml
+++ b/plugin/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
           package="com.github.shadowsocks.plugin">
     <uses-sdk
             android:minSdkVersion="19"
-            android:targetSdkVersion="O"/>
+            android:targetSdkVersion="26"/>
     <application
             android:theme="@style/Theme.Shadowsocks">
         <meta-data android:name="com.github.shadowsocks.plugin.version"