move to proguard 4.6 to avoid index out of bounds in variable remapper

upgrading Proguard changed what gets included: now need scala package object, which brings in 100kB more bytecode with it
This commit is contained in:
Mark Harrah 2012-12-04 21:08:39 -05:00
parent b7084ffa1f
commit 96ddf5b742
1 changed files with 2 additions and 2 deletions

View File

@ -18,7 +18,7 @@ object LaunchProguard
lazy val settings: Seq[Setting[_]] =
inScope(GlobalScope)(inConfig(Proguard)(globalSettings)) ++
inConfig(Proguard)( baseSettings ) :+
(libraryDependencies += "net.sf.proguard" % "proguard" % "4.4" % Proguard.name)
(libraryDependencies += "net.sf.proguard" % "proguard" % "4.6" % Proguard.name)
def globalSettings = Seq(
optimizePasses := 2,
@ -124,7 +124,7 @@ object LaunchProguard
"org/apache/ivy/plugins/report/ivy-report-*" ::
Nil
private def libraryFilter = "(!META-INF/**,!*.properties,!scala/actors/**.!scala/util/parsing/*.class,!scala/xml/**.class,!scala/package$.class,**.class)"
private def libraryFilter = "(!META-INF/**,!*.properties,!scala/actors/**.!scala/util/parsing/*.class,**.class)"
private def jlineFilter = "(!META-INF/**)"
private def generalFilter = "(!META-INF/**,!*.properties)"