diff --git a/build.sbt b/build.sbt
index bdec7775..d5623a71 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,12 +4,13 @@ import android.Dependencies.{apklib,aar}
android.Plugin.androidBuild
-platformTarget in Android := "android-16"
+platformTarget in Android := "android-19"
name := "shadowsocks"
+compileOrder in Compile := CompileOrder.JavaThenScala
+
libraryDependencies ++= Seq(
- "com.google.android" % "support-v4" % "18.0.0",
"com.google.android" % "analytics" % "3.01",
"dnsjava" % "dnsjava" % "2.1.5",
"org.scalaj" %% "scalaj-http" % "0.3.10",
@@ -18,17 +19,25 @@ libraryDependencies ++= Seq(
)
libraryDependencies ++= Seq(
- apklib("com.actionbarsherlock" % "actionbarsherlock" % "4.4.0"),
- apklib("net.saik0.android.unifiedpreference" % "unifiedpreference" % "0.0.2"),
apklib("org.jraf" % "android-switch-backport" % "1.0"),
apklib("net.simonvt.menudrawer" % "menudrawer" % "3.0.4"),
- "com.google.android.gms" % "play-services" % "4.4.52"
+ apklib("com.actionbarsherlock" % "actionbarsherlock" % "4.4.0"),
+ "com.google.android.gms" % "play-services" % "4.4.52",
+ "com.android.support" % "support-v4" % "19.1.0"
)
libraryDependencies ++= Seq(
- "de.keyboardsurfer.android.widget" % "crouton" % "1.8.1",
+ "de.keyboardsurfer.android.widget" % "crouton" % "1.8.1" exclude("com.google.android", "support-v4"),
"com.nostra13.universalimageloader" % "universal-image-loader" % "1.8.4",
"com.j256.ormlite" % "ormlite-core" % "4.47",
"com.j256.ormlite" % "ormlite-android" % "4.47"
)
+proguardOptions in Android ++= Seq("-keep class android.support.v4.app.** { *; }",
+ "-keep interface android.support.v4.app.** { *; }",
+ "-keep class com.actionbarsherlock.** { *; }",
+ "-keep interface com.actionbarsherlock.** { *; }",
+ "-keep class org.jraf.android.backport.** { *; }",
+ "-keep class com.github.shadowsocks.** { *; }",
+ "-keep class * extends com.j256.ormlite.** { *; }",
+ "-keepattributes *Annotation*")
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 781e4aa0..86d24f13 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
+ android:targetSdkVersion="19"/>