diff --git a/.travis.yml b/.travis.yml index 7ea976a1..7055a5cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ cache: android: components: - tools - - build-tools-24.0.3 + - build-tools-25 - extra-android-m2repository - extra-google-m2repository diff --git a/README.md b/README.md index 2008fa45..96934c4c 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala. * SBT 0.13.0+ * Go 1.4+ * Android SDK - - Build Tools 24+ (as required by [`sbt-android`](https://github.com/scala-android/sbt-android)) + - Build Tools 25+ - Android Support Repository and Google Repository (see `build.sbt` for version) * Android NDK r12b+ diff --git a/build.sbt b/build.sbt index 0c17693e..7e70f907 100644 --- a/build.sbt +++ b/build.sbt @@ -8,7 +8,7 @@ name := "shadowsocks" version := "3.2.7" versionCode := Some(167) -platformTarget := "android-24" +platformTarget := "android-25" compileOrder := CompileOrder.JavaThenScala javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil @@ -31,16 +31,16 @@ resConfigs := Seq("ru", "zh-rCN", "zh-rTW") resolvers += Resolver.jcenterRepo libraryDependencies ++= - "com.android.support" % "design" % "24.2.1" :: - "com.android.support" % "gridlayout-v7" % "24.2.1" :: - "com.android.support" % "preference-v14" % "24.2.1" :: + "com.android.support" % "design" % "25.0.0" :: + "com.android.support" % "gridlayout-v7" % "25.0.0" :: + "com.android.support" % "preference-v14" % "25.0.0" :: "com.evernote" % "android-job" % "1.1.2" :: "com.github.clans" % "fab" % "1.6.4" :: "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01" :: "com.github.kevinsawicki" % "http-request" % "6.0" :: - "com.google.android.gms" % "play-services-ads" % "9.6.1" :: - "com.google.android.gms" % "play-services-analytics" % "9.6.1" :: - "com.google.android.gms" % "play-services-gcm" % "9.6.1" :: + "com.google.android.gms" % "play-services-ads" % "9.8.00" :: + "com.google.android.gms" % "play-services-analytics" % "9.8.00" :: + "com.google.android.gms" % "play-services-gcm" % "9.8.00" :: "com.j256.ormlite" % "ormlite-android" % "5.0" :: "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" :: "dnsjava" % "dnsjava" % "2.1.7" :: diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 8b2cfb09..c0ab305c 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -18,7 +18,7 @@ + android:targetSdkVersion="25"/>