From 96ddf5b742b37dfcc270e363decaae33fb2c82bd Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Tue, 4 Dec 2012 21:08:39 -0500 Subject: [PATCH] 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 --- project/Proguard.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Proguard.scala b/project/Proguard.scala index 079c1a350..a26044684 100644 --- a/project/Proguard.scala +++ b/project/Proguard.scala @@ -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)"