Commit 82b27c4a authored by Max Lv's avatar Max Lv

update sbt-android-plugin

parent b89cb8f4
javacOptions in Compile ++= Seq("-source", "1.6", "-target", "1.6")
javacOptions in doc ++= Seq("-source", "1.6")
libraryDependencies ++= Seq( libraryDependencies ++= Seq(
"com.google.android" % "support-v4" % "r12", "com.google.android" % "support-v4" % "r12",
"com.google.android.analytics" % "analytics" % "2.0beta4", "com.google.android.analytics" % "analytics" % "2.0beta4",
......
...@@ -2,7 +2,7 @@ import sbt._ ...@@ -2,7 +2,7 @@ import sbt._
import sbt.Keys._ import sbt.Keys._
import sbtandroid._ import sbtandroid._
import sbtandroid.AndroidKeys._ import sbtandroid.AndroidPlugin._
object App { object App {
val version = "1.8.2" val version = "1.8.2"
...@@ -17,7 +17,7 @@ object General { ...@@ -17,7 +17,7 @@ object General {
versionCode := App.versionCode, versionCode := App.versionCode,
scalaVersion := "2.9.2", scalaVersion := "2.9.2",
compileOrder := CompileOrder.JavaThenScala, compileOrder := CompileOrder.JavaThenScala,
platformName in Android := "android-16", platformName := "android-16",
resolvers += "madeye-maven" at "http://madeye-maven-repository.googlecode.com/git", resolvers += "madeye-maven" at "http://madeye-maven-repository.googlecode.com/git",
resolvers += "central-maven" at "http://repo.maven.apache.org/maven2" resolvers += "central-maven" at "http://repo.maven.apache.org/maven2"
) )
...@@ -28,22 +28,23 @@ object General { ...@@ -28,22 +28,23 @@ object General {
"-keep interface com.actionbarsherlock.** { *; }", "-keep interface com.actionbarsherlock.** { *; }",
"-keep class org.jraf.android.backport.** { *; }", "-keep class org.jraf.android.backport.** { *; }",
"-keep class com.github.shadowsocks.** { *; }", "-keep class com.github.shadowsocks.** { *; }",
"-keepattributes *Annotation*").mkString(" ") "-keepattributes *Annotation*")
val proguardSettings = Seq ( val proguardSettings = Seq (
useProguard in Android := true, useProguard := true,
proguardOption in Android := pgOptions proguardOptions := pgOptions
)
val miscSettings = Seq (
cachePasswords := true,
publicServer := "127.0.0.1"
) )
lazy val fullAndroidSettings = lazy val fullAndroidSettings =
General.settings ++ General.settings ++
AndroidProject.androidSettings ++ AndroidPlugin.androidDefaults ++
TypedResources.settings ++
proguardSettings ++ proguardSettings ++
AndroidManifestGenerator.settings ++ miscSettings
AndroidMarketPublish.settings ++ Seq (
cachePasswords in Android := true
)
} }
object AndroidBuild extends Build { object AndroidBuild extends Build {
......
...@@ -4,6 +4,6 @@ resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifact ...@@ -4,6 +4,6 @@ resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifact
resolvers += Resolver.url("madeye private releases", new URL("http://madeye-maven-repository.googlecode.com/git/ivy"))(Resolver.ivyStylePatterns) resolvers += Resolver.url("madeye private releases", new URL("http://madeye-maven-repository.googlecode.com/git/ivy"))(Resolver.ivyStylePatterns)
addSbtPlugin("org.scala-sbt" % "sbt-android" % "0.6.4-SNAPSHOT") addSbtPlugin("org.scala-sbt" % "sbt-android" % "0.7.1-SNAPSHOT")
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.4.0") addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.4.0")
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