Skip to content
This repository was archived by the owner on Oct 26, 2022. It is now read-only.

more precise control and verbose logging for proguard task #132

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

more precise control and verbose logging for proguard task #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion src/main/scala/AndroidBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,31 @@ object AndroidBase {
jarPath <<= (platformPath, jarName) (_ / _),
libraryJarPath <<= (jarPath (_ get)),

proguardOption := "",
proguardOption <<= (manifestPackage) map {
(manifestPackage) =>
("-dontwarn" :: "-dontobfuscate" ::
"-dontnote scala.Enumeration" ::
"-dontnote org.xml.sax.EntityResolver" ::
"-keep public class * extends android.app.Activity" ::
"-keep public class * extends android.app.Service" ::
"-keep public class * extends android.app.backup.BackupAgent" ::
"-keep public class * extends android.appwidget.AppWidgetProvider" ::
"-keep public class * extends android.content.BroadcastReceiver" ::
"-keep public class * extends android.content.ContentProvider" ::
"-keep public class * extends android.view.View" ::
"-keep public class * extends android.app.Application" ::
"-keep public class "+manifestPackage+".** { public protected *; }" ::
"-keep public class * implements junit.framework.Test { public void test*(); }" ::
"""
-keepclassmembers class * implements java.io.Serializable {
private static final java.io.ObjectStreamField[] serialPersistentFields;
private void writeObject(java.io.ObjectOutputStream);
private void readObject(java.io.ObjectInputStream);
java.lang.Object writeReplace();
java.lang.Object readResolve();
}
""" :: Nil)
},
proguardExclude <<= (libraryJarPath, classDirectory, resourceDirectory) map {
(libPath, classDirectory, resourceDirectory) =>
libPath :+ classDirectory :+ resourceDirectory
Expand Down
31 changes: 4 additions & 27 deletions src/main/scala/AndroidInstall.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ object AndroidInstall {

private def proguardTask: Project.Initialize[Task[Option[File]]] =
(useProguard, proguardOptimizations, classDirectory, proguardInJars, streams,
classesMinJarPath, libraryJarPath, manifestPackage, proguardOption) map {
classesMinJarPath, libraryJarPath, proguardOption) map {
(useProguard, proguardOptimizations, classDirectory, proguardInJars, streams,
classesMinJarPath, libraryJarPath, manifestPackage, proguardOption) =>
classesMinJarPath, libraryJarPath, proguardOption) =>
if (useProguard) {
val optimizationOptions = if (proguardOptimizations.isEmpty) Seq("-dontoptimize") else proguardOptimizations
val manifestr = List("!META-INF/MANIFEST.MF", "R.class", "R$*.class",
Expand All @@ -125,31 +125,8 @@ object AndroidInstall {
"-injars" :: inJars.mkString(sep) ::
"-outjars" :: "\""+classesMinJarPath.absolutePath+"\"" ::
"-libraryjars" :: libraryJarPath.map("\""+_+"\"").mkString(sep) ::
Nil) ++
optimizationOptions ++ (
"-dontwarn" :: "-dontobfuscate" ::
"-dontnote scala.Enumeration" ::
"-dontnote org.xml.sax.EntityResolver" ::
"-keep public class * extends android.app.Activity" ::
"-keep public class * extends android.app.Service" ::
"-keep public class * extends android.app.backup.BackupAgent" ::
"-keep public class * extends android.appwidget.AppWidgetProvider" ::
"-keep public class * extends android.content.BroadcastReceiver" ::
"-keep public class * extends android.content.ContentProvider" ::
"-keep public class * extends android.view.View" ::
"-keep public class * extends android.app.Application" ::
"-keep public class "+manifestPackage+".** { public protected *; }" ::
"-keep public class * implements junit.framework.Test { public void test*(); }" ::
"""
-keepclassmembers class * implements java.io.Serializable {
private static final java.io.ObjectStreamField[] serialPersistentFields;
private void writeObject(java.io.ObjectOutputStream);
private void readObject(java.io.ObjectInputStream);
java.lang.Object writeReplace();
java.lang.Object readResolve();
}
""" ::
proguardOption :: Nil )
Nil) ++ optimizationOptions ++ proguardOption
streams.log.debug("executing proguard: " + (for (i <- 0 until args.size) yield {"arg" + (i + 1) + ": " + args(i)}).mkString("\n"))
val config = new ProGuardConfiguration
new ConfigurationParser(args.toArray[String]).parse(config)
streams.log.debug("executing proguard: "+args.mkString("\n"))
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/AndroidKeys.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ object AndroidKeys {
val versionName = TaskKey[String]("version-name")

/** Proguard Settings */
val proguardOption = SettingKey[String]("proguard-option")
val proguardOption = TaskKey[Seq[String]]("proguard-option")
val proguardOptimizations = SettingKey[Seq[String]]("proguard-optimizations")
val libraryJarPath = SettingKey[Seq[File]]("library-path")

Expand Down