From 1ce0e6cd3e7d2934f04fba1ddae41657a972484c Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 24 Jun 2014 16:29:00 +0400
Subject: [PATCH] Added exceptions for proguard: constants are used in JPS
 plugin.

---
 build.xml                                              | 10 ++++++++++
 .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index e981cd215a2..0ed757c5698 100644
--- a/build.xml
+++ b/build.xml
@@ -474,6 +474,16 @@
                         void stop();
                         void dispose();
                     }
+
+                    -keepclassmembers class org.jetbrains.org.objectweb.asm.Opcodes {
+                        *** ASM5;
+                    }
+
+                    -keepclassmembers class org.jetbrains.org.objectweb.asm.ClassReader {
+                        *** SKIP_CODE;
+                        *** SKIP_DEBUG;
+                        *** SKIP_FRAMES;
+                    }
                 ]]></proguard>
             </else>
         </if>
diff --git a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
index 853be538fc2..7df7be35870 100644
--- a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+++ b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
@@ -224,7 +224,7 @@ public class KotlinBuilder extends ModuleLevelBuilder {
         IncrementalCacheImpl cache = new IncrementalCacheImpl(KotlinBuilderModuleScriptGenerator.getIncrementalCacheDir(context));
 
         try {
-            List<Pair<String, File>> moduleIdsAndFiles = Lists.newArrayList();
+            List<Pair<String, File>> moduleIdsAndFiles = new ArrayList<Pair<String, File>>();
             Map<String, File> outDirectories = new HashMap<String, File>();
 
             for (ModuleBuildTarget target : chunk.getTargets()) {