mirror of https://github.com/sbt/sbt.git
use latest, renamed proguard-base artifact
This commit is contained in:
parent
8f25b07d71
commit
214cd62a2a
|
|
@ -18,7 +18,7 @@ object LaunchProguard
|
||||||
lazy val settings: Seq[Setting[_]] =
|
lazy val settings: Seq[Setting[_]] =
|
||||||
inScope(GlobalScope)(inConfig(Proguard)(globalSettings)) ++
|
inScope(GlobalScope)(inConfig(Proguard)(globalSettings)) ++
|
||||||
inConfig(Proguard)( baseSettings ) :+
|
inConfig(Proguard)( baseSettings ) :+
|
||||||
(libraryDependencies += "net.sf.proguard" % "proguard" % "4.6" % Proguard.name)
|
(libraryDependencies += "net.sf.proguard" % "proguard-base" % "4.8" % Proguard.name)
|
||||||
|
|
||||||
def globalSettings = Seq(
|
def globalSettings = Seq(
|
||||||
optimizePasses := 2,
|
optimizePasses := 2,
|
||||||
|
|
@ -124,7 +124,7 @@ object LaunchProguard
|
||||||
"org/apache/ivy/plugins/report/ivy-report-*" ::
|
"org/apache/ivy/plugins/report/ivy-report-*" ::
|
||||||
Nil
|
Nil
|
||||||
|
|
||||||
private def libraryFilter = "(!META-INF/**,!*.properties,!scala/actors/**.!scala/util/parsing/*.class,**.class)"
|
private def libraryFilter = "(!META-INF/**,!*.properties,!scala/actors/**,!scala/util/parsing/*.class,**.class)"
|
||||||
private def jlineFilter = "(!META-INF/**)"
|
private def jlineFilter = "(!META-INF/**)"
|
||||||
private def generalFilter = "(!META-INF/**,!*.properties)"
|
private def generalFilter = "(!META-INF/**,!*.properties)"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue