From 9ccf2bc436fb76b98bd57d0747697c8102ea5de1 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 13 Oct 2016 12:08:53 +0800
Subject: [PATCH] Update sbt-android to 1.7.0

---
 build.sbt                    | 97 ++++++++++++++++--------------------
 project/plugins.sbt          |  2 +-
 src/main/AndroidManifest.xml |  4 +-
 3 files changed, 45 insertions(+), 58 deletions(-)

diff --git a/build.sbt b/build.sbt
index ee0e2453..233a2546 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,66 +1,55 @@
-import android.Keys._
-
-android.Plugin.androidBuild
-
-platformTarget in Android := "android-24"
-
-name := "shadowsocks"
-
 scalaVersion := "2.11.8"
+dexMaxHeap := "4g"
 
-compileOrder in Compile := CompileOrder.JavaThenScala
-
-javacOptions ++= Seq("-source", "1.7", "-target", "1.7")
-
-scalacOptions ++= Seq("-target:jvm-1.7", "-Xexperimental")
-
-ndkJavah in Android := List()
-
-ndkBuild in Android := List()
-
-shrinkResources in Android := true
-
-typedResources in Android := false
-
-resConfigs in Android := Seq("ru", "zh-rCN", "zh-rTW")
-
-dexMaxHeap in Android := "4g"
-
-resolvers += Resolver.jcenterRepo
-
+enablePlugins(AndroidApp)
 useSupportVectors
 
-libraryDependencies ++= Seq(
-  "com.android.support" % "design" % "24.2.1",
-  "com.android.support" % "gridlayout-v7" % "24.2.1",
-  "com.android.support" % "preference-v14" % "24.2.1",
-  "com.evernote" % "android-job" % "1.1.0",
-  "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.j256.ormlite" % "ormlite-android" % "5.0",
-  "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2",
-  "dnsjava" % "dnsjava" % "2.1.7",
-  "eu.chainfire" % "libsuperuser" % "1.0.0.201608240809",
-  "me.dm7.barcodescanner" % "zxing" % "1.9",
-  "net.glxn.qrgen" % "android" % "2.0"
-)
+name := "shadowsocks"
+version := "3.2.6"
+versionCode := Some(166)
 
-proguardVersion in Android := "5.3"
+platformTarget := "android-24"
 
-proguardCache in Android := Seq()
+compileOrder := CompileOrder.JavaThenScala
+javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil
+scalacOptions ++= "-target:jvm-1.7" :: "-Xexperimental" :: Nil
+ndkJavah := Seq()
+ndkBuild := Seq()
 
-proguardOptions in Android ++= Seq(
-  "-keep class com.github.shadowsocks.System { *; }",
-  "-dontwarn com.google.android.gms.internal.**",
-  "-dontwarn com.j256.ormlite.**",
-  "-dontwarn org.xbill.**")
+proguardVersion := "5.3"
+proguardCache := Seq()
+proguardOptions ++=
+  "-keep class com.github.shadowsocks.System { *; }" ::
+    "-dontwarn com.google.android.gms.internal.**" ::
+    "-dontwarn com.j256.ormlite.**" ::
+    "-dontwarn org.xbill.**" ::
+    Nil
+
+shrinkResources := true
+typedResources := false
+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.evernote" % "android-job" % "1.1.0" ::
+  "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.j256.ormlite" % "ormlite-android" % "5.0" ::
+  "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" ::
+  "dnsjava" % "dnsjava" % "2.1.7" ::
+  "eu.chainfire" % "libsuperuser" % "1.0.0.201608240809" ::
+  "me.dm7.barcodescanner" % "zxing" % "1.9" ::
+  "net.glxn.qrgen" % "android" % "2.0" ::
+  Nil
 
 lazy val nativeBuild = TaskKey[Unit]("native-build", "Build native executables")
-
 nativeBuild := {
   val logger = streams.value.log
   Process("./build.sh") ! logger match {
diff --git a/project/plugins.sbt b/project/plugins.sbt
index f10c70aa..af0cd300 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.18")
+addSbtPlugin("org.scala-android" % "sbt-android" % "1.7.0")
 
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")
 
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index c02f5614..56208edd 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,7 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
-          android:versionCode="166"
-          android:versionName="3.2.6">
+          xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>