Commit 5ef2849c authored by Mygod's avatar Mygod

Update build target to Android 7.1 Developer Preview

parent e1f58bfd
...@@ -27,7 +27,7 @@ cache: ...@@ -27,7 +27,7 @@ cache:
android: android:
components: components:
- tools - tools
- build-tools-24.0.3 - build-tools-25
- extra-android-m2repository - extra-android-m2repository
- extra-google-m2repository - extra-google-m2repository
......
...@@ -14,7 +14,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala. ...@@ -14,7 +14,7 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
* SBT 0.13.0+ * SBT 0.13.0+
* Go 1.4+ * Go 1.4+
* Android SDK * 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 Support Repository and Google Repository (see `build.sbt` for version)
* Android NDK r12b+ * Android NDK r12b+
......
...@@ -8,7 +8,7 @@ name := "shadowsocks" ...@@ -8,7 +8,7 @@ name := "shadowsocks"
version := "3.2.7" version := "3.2.7"
versionCode := Some(167) versionCode := Some(167)
platformTarget := "android-24" platformTarget := "android-25"
compileOrder := CompileOrder.JavaThenScala compileOrder := CompileOrder.JavaThenScala
javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil
...@@ -31,16 +31,16 @@ resConfigs := Seq("ru", "zh-rCN", "zh-rTW") ...@@ -31,16 +31,16 @@ resConfigs := Seq("ru", "zh-rCN", "zh-rTW")
resolvers += Resolver.jcenterRepo resolvers += Resolver.jcenterRepo
libraryDependencies ++= libraryDependencies ++=
"com.android.support" % "design" % "24.2.1" :: "com.android.support" % "design" % "25.0.0" ::
"com.android.support" % "gridlayout-v7" % "24.2.1" :: "com.android.support" % "gridlayout-v7" % "25.0.0" ::
"com.android.support" % "preference-v14" % "24.2.1" :: "com.android.support" % "preference-v14" % "25.0.0" ::
"com.evernote" % "android-job" % "1.1.2" :: "com.evernote" % "android-job" % "1.1.2" ::
"com.github.clans" % "fab" % "1.6.4" :: "com.github.clans" % "fab" % "1.6.4" ::
"com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01" :: "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01" ::
"com.github.kevinsawicki" % "http-request" % "6.0" :: "com.github.kevinsawicki" % "http-request" % "6.0" ::
"com.google.android.gms" % "play-services-ads" % "9.6.1" :: "com.google.android.gms" % "play-services-ads" % "9.8.00" ::
"com.google.android.gms" % "play-services-analytics" % "9.6.1" :: "com.google.android.gms" % "play-services-analytics" % "9.8.00" ::
"com.google.android.gms" % "play-services-gcm" % "9.6.1" :: "com.google.android.gms" % "play-services-gcm" % "9.8.00" ::
"com.j256.ormlite" % "ormlite-android" % "5.0" :: "com.j256.ormlite" % "ormlite-android" % "5.0" ::
"com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" :: "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" ::
"dnsjava" % "dnsjava" % "2.1.7" :: "dnsjava" % "dnsjava" % "2.1.7" ::
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<uses-sdk <uses-sdk
android:minSdkVersion="19" android:minSdkVersion="19"
android:targetSdkVersion="24"/> android:targetSdkVersion="25"/>
<application <application
android:allowBackup="true" android:allowBackup="true"
......
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