From 09d05f4be356347f8e012fb70be14595423e367e Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Fri, 12 Feb 2016 00:01:48 +0100
Subject: [PATCH] Really use proguarded JAR generated from SBT

---
 project/generate-standalone-launcher.sh | 42 +++----------------------
 1 file changed, 4 insertions(+), 38 deletions(-)

diff --git a/project/generate-standalone-launcher.sh b/project/generate-standalone-launcher.sh
index 2109a34f3..594adc9d8 100755
--- a/project/generate-standalone-launcher.sh
+++ b/project/generate-standalone-launcher.sh
@@ -3,48 +3,14 @@ set -e
 
 cd "$(dirname "$0")/.."
 
-if [ ! -d cli/target/pack/lib ]; then
-  echo "Compiling coursier-cli..." 1>&2
-  sbt cli/pack
+if [ ! -e cli/target/scala-2.11/proguard/coursier-standalone.jar ]; then
+  echo "Generating proguarded JAR..." 1>&2
+  sbt cli/proguard:proguard
 fi
 
-echo -n > coursier.pro
-
-for i in cli/target/pack/lib/*.jar; do
-  echo "-injars $i" >> coursier.pro
-done
-
-cat >> coursier.pro << EOF
--outjars coursier-standalone.jar
--libraryjars <java.home>/lib/rt.jar
-
--dontwarn
-
--keep class coursier.cli.Coursier {
-  public static void main(java.lang.String[]);
-}
-
--keep class coursier.cli.IsolatedClassLoader {
-  public java.lang.String[] getIsolationTargets();
-}
-EOF
-
-# -noverify added in launcher below because of errors like
-# http://sourceforge.net/p/proguard/bugs/567/
-
-# These options don't fix it:
-# -dontshrink
-# -dontoptimize
-# -dontobfuscate
-
-./coursier launch \
-  net.sf.proguard:proguard-base:5.2.1 -M proguard.ProGuard -- -- \
-    @coursier.pro
 cat > coursier-standalone << EOF
 #!/bin/sh
 exec java -noverify -cp "\$0" coursier.cli.Coursier "\$@"
 EOF
-cat coursier-standalone.jar >> coursier-standalone
+cat cli/target/scala-2.11/proguard/coursier-standalone.jar >> coursier-standalone
 chmod +x coursier-standalone
-rm -f coursier-standalone.jar
-rm -f coursier.pro