Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #133 from rtyley/proguard-4.8

Upgrade to ProGuard 4.8
  • Loading branch information...
commit ef843571948d8a8f68f553e930dfbfc26982abd9 2 parents a8aba78 + 2b02b30
Jan Berkel authored
Showing with 3 additions and 2 deletions.
  1. +1 −1  build.sbt
  2. +2 −1  src/main/scala/AndroidInstall.scala
2  build.sbt
View
@@ -21,7 +21,7 @@ credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
libraryDependencies ++= Seq(
"com.google.android.tools" % "ddmlib" % "r10",
- "net.sf.proguard" % "proguard-base" % "4.6"
+ "net.sf.proguard" % "proguard-base" % "4.8"
)
sbtPlugin := true
3  src/main/scala/AndroidInstall.scala
View
@@ -1,3 +1,4 @@
+import java.util.Properties
import proguard.{Configuration=>ProGuardConfiguration, ProGuard, ConfigurationParser}
import sbt._
@@ -151,7 +152,7 @@ object AndroidInstall {
""" ::
proguardOption :: Nil )
val config = new ProGuardConfiguration
- new ConfigurationParser(args.toArray[String]).parse(config)
+ new ConfigurationParser(args.toArray[String], new Properties).parse(config)
streams.log.debug("executing proguard: "+args.mkString("\n"))
new ProGuard(config).execute
Some(classesMinJarPath)
Please sign in to comment.
Something went wrong with that request. Please try again.