Commit dc439b08 authored by Mygod's avatar Mygod

Update to API 26

parent 49e30e7b
...@@ -4,7 +4,7 @@ lazy val commonSettings = Seq( ...@@ -4,7 +4,7 @@ lazy val commonSettings = Seq(
organization := "com.github.shadowsocks", organization := "com.github.shadowsocks",
platformTarget := "android-O", platformTarget := "android-26",
compileOrder := CompileOrder.JavaThenScala, compileOrder := CompileOrder.JavaThenScala,
javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil, javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil,
...@@ -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-beta1" val supportLibsVersion = "26.0.0-beta2"
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)
......
...@@ -16,11 +16,11 @@ proguardOptions ++= ...@@ -16,11 +16,11 @@ proguardOptions ++=
"-keep class com.github.shadowsocks.JniHelper { *; }" :: "-keep class com.github.shadowsocks.JniHelper { *; }" ::
Nil Nil
val playServicesVersion = "10.2.6" val playServicesVersion = "11.0.2"
resolvers += Resolver.jcenterRepo resolvers += Resolver.jcenterRepo
libraryDependencies ++= libraryDependencies ++=
"com.futuremind.recyclerfastscroll" % "fastscroll" % "0.2.5" :: "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.github.jorgecastilloprz" % "fabprogresscircle" % "1.01" ::
"com.google.android.gms" % "play-services-ads" % playServicesVersion :: "com.google.android.gms" % "play-services-ads" % playServicesVersion ::
"com.google.android.gms" % "play-services-analytics" % playServicesVersion :: "com.google.android.gms" % "play-services-analytics" % playServicesVersion ::
...@@ -28,11 +28,11 @@ libraryDependencies ++= ...@@ -28,11 +28,11 @@ libraryDependencies ++=
"com.google.firebase" % "firebase-config" % playServicesVersion :: "com.google.firebase" % "firebase-config" % playServicesVersion ::
"com.j256.ormlite" % "ormlite-android" % "5.0" :: "com.j256.ormlite" % "ormlite-android" % "5.0" ::
"com.mikepenz" % "crossfader" % "1.5.0" :: "com.mikepenz" % "crossfader" % "1.5.0" ::
"com.mikepenz" % "fastadapter" % "2.5.2" :: "com.mikepenz" % "fastadapter" % "2.6.2" ::
"com.mikepenz" % "iconics-core" % "2.8.4" :: "com.mikepenz" % "iconics-core" % "2.8.9" ::
"com.mikepenz" % "materialdrawer" % "5.9.1" :: "com.mikepenz" % "materialdrawer" % "5.9.4" ::
"com.mikepenz" % "materialize" % "1.0.1" :: "com.mikepenz" % "materialize" % "1.0.2" ::
"com.squareup.okhttp3" % "okhttp" % "3.8.0" :: "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" ::
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<uses-sdk <uses-sdk
android:minSdkVersion="19" android:minSdkVersion="19"
android:targetSdkVersion="O"/> android:targetSdkVersion="26"/>
<application <application
android:name=".ShadowsocksApplication" android:name=".ShadowsocksApplication"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
package="com.github.shadowsocks.plugin"> package="com.github.shadowsocks.plugin">
<uses-sdk <uses-sdk
android:minSdkVersion="19" android:minSdkVersion="19"
android:targetSdkVersion="O"/> android:targetSdkVersion="26"/>
<application <application
android:theme="@style/Theme.Shadowsocks"> android:theme="@style/Theme.Shadowsocks">
<meta-data android:name="com.github.shadowsocks.plugin.version" <meta-data android:name="com.github.shadowsocks.plugin.version"
......
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