From 0a1303d118be110f5eae21733a85149672286858 Mon Sep 17 00:00:00 2001 From: Leonid Shalupov Date: Tue, 12 Feb 2013 16:06:15 +0400 Subject: [PATCH] build: no classes rename in jarjar build: fixed proguard shrinking --- build.xml | 44 +++++++------------ .../doc/highlighter/HtmlKotlinVisitor.kt | 8 ++-- .../doc/highlighter/SyntaxHighlighter.kt | 6 +-- .../doc/highlighter2/Html2CompilerPlugin.kt | 8 ++-- .../kotlin/doc/highlighter2/psiUtils.kt | 2 +- .../jetbrains/kotlin/doc/model/KotlinModel.kt | 10 ++--- .../test/kotlin/test/kotlin/psiUtilsTest.kt | 12 ++--- .../kotlin/maven/K2JSCompilerMojo.java | 2 +- .../kotlin/maven/KotlinCompileMojoBase.java | 2 +- 9 files changed, 42 insertions(+), 52 deletions(-) diff --git a/build.xml b/build.xml index 44f7e0988f1..94cae8a489b 100644 --- a/build.xml +++ b/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 * { (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(); } ]]> @@ -466,6 +450,10 @@ + + + + @@ -476,6 +464,7 @@ + diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt index ca78f358752..e923d6682b9 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlKotlinVisitor.kt +++ b/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() { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt index 0b0161dc3ec..db94b4b7516 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/SyntaxHighlighter.kt +++ b/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) { diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt index 7db9c2cd415..12e5fb22db3 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt +++ b/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 diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt index 174b65bf915..c3c4d2f43d2 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/psiUtils.kt +++ b/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() diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt index 3e04fbb7fb1..95e55797415 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt +++ b/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 diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt index bb1a65585eb..1987e184638 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt +++ b/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 diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java index 5e125592727..a732b03db6b 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java +++ b/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.*; diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java index fbf969cd934..474461602ba 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java +++ b/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 {