build: no classes rename in jarjar

build: fixed proguard shrinking

build.xml

@@ -269,9 +269,8 @@
                     -injars '${output}/kotlin-compiler-before-proguard.jar'
                     -outjars '${kotlin-home}/lib/kotlin-compiler.jar'
 
-                    -dontwarn org.jetbrains.jet.internal.com.intellij.util.**
-                    -dontwarn org.jetbrains.jet.internal.com.intellij.codeInsight.**
-                    -dontwarn org.jetbrains.jet.internal.com.thoughtworks.xstream.**
+                    -dontwarn com.intellij.util.ui.IsRetina*
+                    -dontwarn com.intellij.util.RetinaImage*
                     -dontwarn org.fusesource.**
 
                     -libraryjars '${rtjar}'
@@ -281,10 +280,7 @@
                     -dontobfuscate
 
                     -keep class org.fusesource.** { *; }
-
-                    -keepclasseswithmembers public class * {
-                        public static void main(java.lang.String[]);
-                    }
+                    -keep class org.jdom.input.JAXPParserFactory { *; }
 
                     -keep class org.jetbrains.annotations.** {
                         public protected *;
@@ -302,27 +298,12 @@
                         public protected *;
                     }
 
-                    -keepclasseswithmembers class * { void start(); }
+                    -keep class com.intellij.psi.** {
+                        public protected *;
+                    }
 
-                    -keepclasseswithmembers class * { void stop(); }
-                    -keepclasseswithmembers class * { void dispose(); }
-
-                    -keepclasseswithmembers class * { ** getFileSystem(); }
-                    -keepclasseswithmembers class * { ** isVarArgs(); }
-                    -keepclasseswithmembers class * { ** getApplication(); }
-                    -keepclasseswithmembers class * { ** finalizeReferent(); }
-                    -keepclasseswithmembers class * { ** newBuilder(); }
-                    -keepclasseswithmembers class * { ** startFinalizer(java.lang.Class,java.lang.Object); }
-                    -keepclasseswithmembers class * { ** executeOnPooledThread(java.lang.Runnable); }
-                    -keepclasseswithmembers class * { ** getUserData(java.lang.String); }
-                    -keepclasseswithmembers class * { int getBooleanAttributes(java.io.File); }
-
-                    -keepclasseswithmembers class * { ** project(); }
-
-                    -keepclasseswithmembers class * { ** TYPE; }
-                    -keepclasseswithmembers class * { ** ourInstance; }
-
-                    -keepclasseswithmembers class * { <init>(kotlinc.internal.com.intellij.lang.ASTNode); }
+                    # for kdoc
+                    -keep class com.intellij.openapi.util.TextRange { *; }
 
                     -keepclassmembers enum * {
                         public static **[] values();
@@ -332,6 +313,9 @@
                     -keepclassmembers class * {
                         ** toString();
                         ** hashCode();
+                        void start();
+                        void stop();
+                        void dispose();
                     }
                 ]]></proguard>
             </else>
@@ -466,6 +450,10 @@
         <zap pattern="com.thoughtworks.xstream.io.xml.Dom4J*"/>
         <zap pattern="com.thoughtworks.xstream.io.xml.Xom*"/>
         <zap pattern="com.thoughtworks.xstream.mapper.CGLIBMapper*"/>
+        <zap pattern="com.thoughtworks.xstream.io.json.Jettison*"/>
+        <zap pattern="com.thoughtworks.xstream.io.xml.Wstx*"/>
+        <zap pattern="com.thoughtworks.xstream.io.xml.KXml2*"/>
+        <zap pattern="com.thoughtworks.xstream.io.xml.BEAStax*"/>
 
         <zap pattern="org.apache.log4j.jmx.Agent"/>
         <zap pattern="org.apache.log4j.net.JMS*"/>
@@ -476,6 +464,7 @@
 
         <zap pattern="org.mozilla.javascript.xml.impl.xmlbeans.**"/>
 
+        <!--
         <rule pattern="com.intellij.**" result="org.jetbrains.jet.internal.com.intellij.@1"/>
         <rule pattern="com.sun.jna.**" result="org.jetbrains.jet.internal.com.sun.jna.@1"/>
         <rule pattern="org.apache.log4j.**" result="org.jetbrains.jet.internal.org.apache.log4j.@1"/>
@@ -493,6 +482,7 @@
         <rule pattern="org.mozilla.**" result="org.jetbrains.jet.internal.org.mozilla.@1"/>
         <rule pattern="org.xmlpull.**" result="org.jetbrains.jet.internal.org.xmlpull.@1"/>
         <rule pattern="org.kohsuke.args4j.**" result="org.jetbrains.jet.internal.org.kohsuke.args4j.@1"/>
+        -->
 
         <manifest>
           <attribute name="Built-By" value="JetBrains"/>

libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt

@@ -1,9 +1,9 @@
 package org.jetbrains.kotlin.doc.highlighter
 
-import org.jetbrains.jet.internal.com.intellij.psi.PsiComment
-import org.jetbrains.jet.internal.com.intellij.psi.PsiElement
-import org.jetbrains.jet.internal.com.intellij.psi.PsiFile
-import org.jetbrains.jet.internal.com.intellij.psi.PsiWhiteSpace
+import com.intellij.psi.PsiComment
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiFile
+import com.intellij.psi.PsiWhiteSpace
 import org.jetbrains.jet.lang.psi.*
 
 class HtmlKotlinVisitor: JetTreeVisitor<StringBuilder>() {

libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt

@@ -2,9 +2,9 @@ package org.jetbrains.kotlin.doc.highlighter
 
 import java.util.HashMap
 import kotlin.template.HtmlFormatter
-import org.jetbrains.jet.internal.com.intellij.psi.*
-import org.jetbrains.jet.internal.com.intellij.psi.tree.IElementType
-import org.jetbrains.jet.internal.com.intellij.psi.tree.TokenSet
+import com.intellij.psi.*
+import com.intellij.psi.tree.IElementType
+import com.intellij.psi.tree.TokenSet
 import org.jetbrains.jet.lexer.*
 
 fun main(args: Array<String>) {

libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt

@@ -1,10 +1,10 @@
 package org.jetbrains.kotlin.doc.highlighter2
 
 import java.io.File
-import org.jetbrains.jet.internal.com.intellij.openapi.vfs.local.CoreLocalVirtualFile
-import org.jetbrains.jet.internal.com.intellij.psi.PsiElement
-import org.jetbrains.jet.internal.com.intellij.psi.PsiFile
-import org.jetbrains.jet.internal.com.intellij.psi.impl.source.tree.LeafPsiElement
+import com.intellij.openapi.vfs.local.CoreLocalVirtualFile
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiFile
+import com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.jetbrains.jet.lexer.JetTokens
 import org.jetbrains.kotlin.doc.*
 import org.jetbrains.kotlin.doc.model.KModel

libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt

@@ -1,6 +1,6 @@
 package org.jetbrains.kotlin.doc.highlighter2
 
-import org.jetbrains.jet.internal.com.intellij.psi.PsiElement
+import com.intellij.psi.PsiElement
 
 private fun PsiElement.getTextChildRelativeOffset() =
     getTextRange()!!.getStartOffset() - getParent()!!.getTextRange()!!.getStartOffset()

libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt

@@ -2,11 +2,11 @@ package org.jetbrains.kotlin.doc.model
 
 import java.io.File
 import java.util.*
-import org.jetbrains.jet.internal.com.intellij.openapi.vfs.local.CoreLocalVirtualFile
-import org.jetbrains.jet.internal.com.intellij.psi.PsiDirectory
-import org.jetbrains.jet.internal.com.intellij.psi.PsiElement
-import org.jetbrains.jet.internal.com.intellij.psi.PsiFile
-import org.jetbrains.jet.internal.com.intellij.psi.PsiFileSystemItem
+import com.intellij.openapi.vfs.local.CoreLocalVirtualFile
+import com.intellij.psi.PsiDirectory
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiFile
+import com.intellij.psi.PsiFileSystemItem
 import org.jetbrains.jet.lang.descriptors.CallableDescriptor
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor
 import org.jetbrains.jet.lang.descriptors.ClassKind

libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt

@@ -3,12 +3,12 @@ package test.kotlin
 import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
 import org.jetbrains.jet.config.CompilerConfiguration
-import org.jetbrains.jet.internal.com.intellij.openapi.Disposable
-import org.jetbrains.jet.internal.com.intellij.openapi.util.Disposer
-import org.jetbrains.jet.internal.com.intellij.openapi.vfs.CharsetToolkit
-import org.jetbrains.jet.internal.com.intellij.psi.PsiFileFactory
-import org.jetbrains.jet.internal.com.intellij.psi.impl.PsiFileFactoryImpl
-import org.jetbrains.jet.internal.com.intellij.testFramework.LightVirtualFile
+import com.intellij.openapi.Disposable
+import com.intellij.openapi.util.Disposer
+import com.intellij.openapi.vfs.CharsetToolkit
+import com.intellij.psi.PsiFileFactory
+import com.intellij.psi.impl.PsiFileFactoryImpl
+import com.intellij.testFramework.LightVirtualFile
 import org.jetbrains.jet.lang.psi.JetFile
 import org.jetbrains.jet.plugin.JetLanguage
 import org.jetbrains.jet.utils.PathUtil

libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java

@@ -24,7 +24,7 @@ import org.jetbrains.jet.cli.common.CLICompiler;
 import org.jetbrains.jet.cli.common.CompilerArguments;
 import org.jetbrains.jet.cli.js.K2JSCompiler;
 import org.jetbrains.jet.cli.js.K2JSCompilerArguments;
-import org.jetbrains.jet.internal.com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.k2js.config.MetaInfServices;
 
 import java.io.*;

libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java

@@ -38,7 +38,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.jetbrains.jet.internal.com.intellij.openapi.util.text.StringUtil.join;
+import static com.intellij.openapi.util.text.StringUtil.join;
 
 public abstract class KotlinCompileMojoBase extends AbstractMojo {