diff --git a/bin/kotlin b/bin/kotlin deleted file mode 100755 index 933ac6ed261..00000000000 --- a/bin/kotlin +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -e - -die() { - echo "$@" >&2 - exit 1 -} - -root=`cd $(dirname $0)/..; pwd` - -ideaRoot= -for d in $root/ideaSDK /Applications/Nika-*.app; do - if [ -d "$d/lib" ]; then - ideaRoot="$d" - break - fi -done - -test -n "$ideaRoot" || die "Idea root not found" - -classpath="$root/out/production/cli" -classpath="$classpath:$root/out/production/backend:$root/out/production/frontend:$root/out/production/frontend.java:$root/out/production/jet.as.java.psi:$root/out/production/util" -classpath="$classpath:$root/out/production/stdlib" -classpath="$classpath:$root/lib/*:$ideaRoot/lib/*:$ideaRoot/lib/rt/*" - -exec java $JAVA_OPTS \ - -ea \ - -classpath "$classpath" \ - org.jetbrains.jet.cli.jvm.K2JVMCompiler \ - "$@" - -# vim: set ts=4 sw=4 et: diff --git a/bin/run-test b/bin/run-test deleted file mode 100755 index 397695f314a..00000000000 --- a/bin/run-test +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -e - -cd $(dirname $0)/.. - -exec java -classpath 'dist/classes/tests:compiler/frontend/src:dist/classes/runtime:dist/classes/compiler:lib/*:ideaSDL/core/*:ideaSDK/lib/*' "$@" - -# vim: set ts=4 sw=4 et ft=sh: diff --git a/build-tools/Wiki.txt b/build-tools/Wiki.txt deleted file mode 100644 index e6e0577fd5b..00000000000 --- a/build-tools/Wiki.txt +++ /dev/null @@ -1,173 +0,0 @@ -{toc:style=disc|indent=20px} -h1. Ant - - -h2. Defining {{**}} task using local Kotlin setup - -One way to define Ant's {{**}} task is by using your local Kotlin setup and {{*KOTLIN_HOME*}} environment variable: - -{code:xml} - - - - - - -{code} - - -Alternatively, you can copy all jar files from Kotlin distribution to Ant's {{"lib"}} folder. - - -h2. Defining {{**}} task using Ivy - -Another way to define Ant's {{**}} task is by using Ivy: - -{{"ivyconf.xml"}}: - -{code:xml} - - - - - - - - - - - - - - - - - - - - - -{code} - -{{"ivy.xml"}}: - -{code:xml} - - - - - - - - - - - - - - - - -{code} - -{{"build.xml"}}: - -{code:xml} - - - - - - - - - - - -{code} - -h2. {{**}} attributes - - -|| {align:center}Name{align} || {align:center}Description{align} || {align:center}Required{align} || {align:center}Default Value{align} || -| {align:center}{{*src*}}{align} | Kotlin source file or directory to compile | {{"src"}} or {{"module"}} needs to be specified |   | -| {align:center}{{*module*}}{align} | Kotlin [module|http://confluence.jetbrains.net/display/Kotlin/Modules+and+Compilation] to compile | {{"src"}} or {{"module"}} needs to be specified |   | -| {align:center}{{*output*}}{align} | Destination directory | If {{"src"}} is used - {{"output"}} or {{"jar"}} needs to be specified |   | -| {align:center}{{*jar*}}{align} | Destination jar file | If {{"src"}} is used - {{"output"}} or {{"jar"}} needs to be specified -If {{"module"}} is used - only {{"jar"}} can be specified or it can be omitted | {align:center}{{"moduleName.jar"}}{align} | -| {align:center}{{*classpath*}}{align} | Compilation class path | {align:center}{{false}}{align} |   | -| {align:center}{{*classpathref*}}{align} | Compilation class path reference | {align:center}{{false}}{align} |   | -| {align:center}{{*stdlib*}}{align} | Path to {{"kotlin-runtime.jar"}} | {align:center}{{false}}{align} | {align:center}{{""}}{align} | -| {align:center}{{*includeRuntime*}}{align} | If {{"jar"}} is used - whether Kotlin runtime library is included | {align:center}{{false}}{align} | {align:center}{{true}}{align} | - - -{{}} accepts a nested {{}} element, similarly to [{{}}|http://evgeny-goldin.org/javadoc/ant/Tasks/javac.html]. - - -h2. Examples - - -{code:xml} - - - - - - - - => "smoke.jar" -{code} - -{{"Smoke.kts"}}: - -{code} -import kotlin.modules.* - -fun project() { - module("smoke") { - sources += "Smoke.kt" - } -} -{code} -{{"Smoke.kt"}}: - -{code} -package Smoke - -fun main(args: Array) { - print("${args[0]}|${args[1]}|${args[2]}") -} -{code} - - -h3. Classpath examples - - -{code:xml} - - - - - - - - - - - - - - - - - - - -{code} - - -h1. Maven - -See [{{"kotlin-maven-plugin"}}|http://evgeny-goldin.com/wiki/Kotlin-maven-plugin]. - -h1. Gradle \ No newline at end of file diff --git a/build-tools/build-tools.iml b/build-tools/build-tools.iml index d0304c4b431..cd4d3801415 100644 --- a/build-tools/build-tools.iml +++ b/build-tools/build-tools.iml @@ -4,13 +4,31 @@ + - + + + + + + + + + + + + + + + + + + diff --git a/build-tools/build.xml b/build-tools/build.xml deleted file mode 100644 index 50e4caf01d9..00000000000 --- a/build-tools/build.xml +++ /dev/null @@ -1,503 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [@{file}] of type [@{type}] exists - - - - - - - - - - - - - - - - - - - - [${kotlin-home}/lib] jars found, defining "kotlin.classpath" - - - - - - - [${kotlin-home}/lib] jars *not* found, creating distribution zip - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Running [@{classname}], classpath = "@{jar}" - - - - - - - - - Running [@{classname}], classpath = "${tests-dir}" - - - - - - - - - - - - - - - - - - - - ${java-out} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Running JUnit: classpath = "@{classpath}" (Jar) - - - - - - - - - - - - - Running JUnit: classpath = "@{classpath}" (Dir) - - - - - - - - - - - - - - - Running JUnit: test = "@{test}", classpath = "@{classpath}" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "ERROR:" was expected here - - - - - - - - - - - - - - - - - - "ERROR:" was expected here - - - - - - - - - - - - - - - - - - "ERROR:" was expected here - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build-tools/ivy.xml b/build-tools/ivy.xml deleted file mode 100644 index 72a5931b172..00000000000 --- a/build-tools/ivy.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/build-tools/ivyconf.xml b/build-tools/ivyconf.xml deleted file mode 100644 index 2020a9e6114..00000000000 --- a/build-tools/ivyconf.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build-tools/lib/ant-contrib-1.0b3.jar b/build-tools/lib/ant-contrib-1.0b3.jar deleted file mode 100644 index 062537661a5..00000000000 Binary files a/build-tools/lib/ant-contrib-1.0b3.jar and /dev/null differ diff --git a/build.xml b/build.xml index 14ee0976e7c..fee201a1bc5 100644 --- a/build.xml +++ b/build.xml @@ -5,10 +5,6 @@ - - - - @@ -21,115 +17,59 @@ - - - - - - - - - - - - - + + + + + + + + + + + - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -137,48 +77,27 @@ - + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - @@ -198,21 +117,20 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + @@ -222,8 +140,8 @@ - - + + @@ -243,15 +161,15 @@ - + - - + + - + (kotlinc.internal.com.intellij.lang.ASTNode); + -keep class org.jetbrains.annotations.** { + public protected *; } - # Keep the special static methods that are required in enumeration classes. + -keep class org.jetbrains.k2js.** { + public protected *; + } + + -keep class org.jetbrains.jet.** { + public protected *; + } + + -keep class jet.** { + public protected *; + } + + -keepclasseswithmembers class * { void start(); } + + -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); } + -keepclassmembers enum * { public static **[] values(); public static ** valueOf(java.lang.String); @@ -291,52 +227,111 @@ -keepclassmembers class * { ** toString(); ** hashCode(); - ** project(); - - ** TYPE; - ** ourInstance; } ]]> - + - - - - - + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + - + + + + + - - - - diff --git a/compiler/cli/bin/kotlinc b/compiler/cli/bin/kotlinc-jvm similarity index 85% rename from compiler/cli/bin/kotlinc rename to compiler/cli/bin/kotlinc-jvm index 22858259c8b..dc06268ad1a 100644 --- a/compiler/cli/bin/kotlinc +++ b/compiler/cli/bin/kotlinc-jvm @@ -39,18 +39,6 @@ if $cygwin; then KOTLIN_HOME=`cygpath --unix "$KOTLIN_HOME"` fi -# Constructing the extension classpath -TOOL_CLASSPATH="" -if [ -z "$TOOL_CLASSPATH" ] ; then - for ext in "$KOTLIN_HOME"/lib/* ; do - if [ -z "$TOOL_CLASSPATH" ] ; then - TOOL_CLASSPATH="$ext" - else - TOOL_CLASSPATH="$TOOL_CLASSPATH:$ext" - fi - done -fi - [ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx256M -Xms32M" # break out -D and -J options and add them to JAVA_OPTS as well @@ -69,7 +57,7 @@ while [ $# -gt 0 ]; do shift ;; -J*) - # as with -D, pass to scala even though it will almost + # as with -D, pass to kotlin even though it will almost # never be used. java_args=("${java_args[@]}" "${1:2}") kotlin_args=("${kotlin_args[@]}" "$1") @@ -94,5 +82,5 @@ CPSELECT="-cp " "${JAVACMD:=java}" \ $JAVA_OPTS \ "${java_args[@]}" \ - ${CPSELECT}${TOOL_CLASSPATH} \ + ${CPSELECT}${KOTLIN_HOME}"/lib/kotlin-compiler.jar" \ org.jetbrains.jet.cli.jvm.K2JVMCompiler "$@" diff --git a/compiler/cli/bin/kotlinc.bat b/compiler/cli/bin/kotlinc-jvm.bat similarity index 70% rename from compiler/cli/bin/kotlinc.bat rename to compiler/cli/bin/kotlinc-jvm.bat index 803309766f0..0f595255e4f 100644 --- a/compiler/cli/bin/kotlinc.bat +++ b/compiler/cli/bin/kotlinc-jvm.bat @@ -21,26 +21,12 @@ if "%_JAVACMD%"=="" set _JAVACMD=java rem We use the value of the JAVA_OPTS environment variable if defined set _JAVA_OPTS=-Xmx256M -Xms32M -set _TOOL_CLASSPATH= -if "%_TOOL_CLASSPATH%"=="" ( - for %%f in ("%_KOTLIN_HOME%\lib\*") do call :add_cpath "%%f" - for /d %%f in ("%_KOTLIN_HOME%\lib\*") do call :add_cpath "%%f" -) - -"%_JAVACMD%" %_JAVA_OPTS% -cp "%_TOOL_CLASSPATH%" org.jetbrains.jet.cli.jvm.K2JVMCompiler %* +"%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-compiler.jar" org.jetbrains.jet.cli.jvm.K2JVMCompiler %* goto end rem ########################################################################## rem # subroutines -:add_cpath - if "%_TOOL_CLASSPATH%"=="" ( - set _TOOL_CLASSPATH=%~1 - ) else ( - set _TOOL_CLASSPATH=%_TOOL_CLASSPATH%;%~1 - ) -goto :eof - :set_home set _BIN_DIR= for %%i in (%~sf0) do set _BIN_DIR=%_BIN_DIR%%%~dpsi diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java b/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java index d2656fe31b6..dc76dfe6a58 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java @@ -29,12 +29,11 @@ import com.intellij.openapi.util.Key; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; -import com.intellij.util.Function; +import org.junit.ComparisonFailure; import org.junit.Rule; import org.junit.rules.TestRule; import org.junit.rules.TestWatcher; import org.junit.runner.Description; -import sun.misc.JarFilter; import java.io.File; import java.io.IOException; @@ -74,13 +73,7 @@ public abstract class KotlinIntegrationTestBase { protected int runCompiler(String logName, String... arguments) throws Exception { final File lib = getCompilerLib(); - final File[] jars = lib.listFiles(new JarFilter()); - final String classpath = StringUtil.join(jars, new Function() { - @Override - public String fun(File file) { - return file.getAbsolutePath(); - } - }, File.pathSeparator); + final String classpath = lib.getAbsolutePath() + File.separator + "kotlin-compiler.jar"; Collection javaArgs = new ArrayList(); javaArgs.add("-cp"); @@ -122,10 +115,12 @@ public abstract class KotlinIntegrationTestBase { final String goldContent = Files.toString(expectedFile, UTF_8); try { assertEquals(goldContent, content.toString()); - } - finally { tmpFile.delete(); } + catch (ComparisonFailure e) { + Files.write(content, tmpFile, Charsets.UTF_8); + throw e; + } } } diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/CompilerUtils.java b/idea/src/org/jetbrains/jet/plugin/compiler/CompilerUtils.java index b8a2d62b782..e3e5a24cea0 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/CompilerUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/CompilerUtils.java @@ -17,7 +17,6 @@ package org.jetbrains.jet.plugin.compiler; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; import com.intellij.compiler.impl.javaCompiler.OutputItemImpl; import com.intellij.openapi.compiler.CompileContext; import com.intellij.openapi.compiler.CompilerMessageCategory; @@ -57,21 +56,6 @@ public final class CompilerUtils { private CompilerUtils() { } - private static List getJarsInDirectory(File dir) { - List r = Lists.newArrayList(); - - File[] files = dir.listFiles(); - if (files != null) { - for (File jar : files) { - if (jar.isFile() && jar.getName().endsWith(".jar")) { - r.add(jar); - } - } - } - - return r; - } - public static List kompilerClasspath(File kotlinHome, CompileContext context) { File libs = new File(kotlinHome, "lib"); @@ -81,10 +65,8 @@ public final class CompilerUtils { return Collections.emptyList(); } - ArrayList answer = new ArrayList(); - answer.addAll(getJarsInDirectory(libs)); - answer.addAll(getJarsInDirectory(new File(libs, "guice"))); // TODO: flatten at artifact build + answer.add(new File(libs, "kotlin-compiler.jar")); return answer; } diff --git a/libraries/tools/kdoc-maven-plugin/pom.xml b/libraries/tools/kdoc-maven-plugin/pom.xml index e5022802935..14b98fd1d00 100644 --- a/libraries/tools/kdoc-maven-plugin/pom.xml +++ b/libraries/tools/kdoc-maven-plugin/pom.xml @@ -22,12 +22,12 @@ org.jetbrains.kotlin - kotlin-maven-plugin + kdoc ${project.version} org.jetbrains.kotlin - kdoc + kotlin-maven-plugin ${project.version} @@ -35,8 +35,8 @@ pegdown ${pegdown.version} - + src/main/java src/test/java diff --git a/libraries/tools/kdoc/pom.xml b/libraries/tools/kdoc/pom.xml index 451cad9c400..53cb667da0c 100644 --- a/libraries/tools/kdoc/pom.xml +++ b/libraries/tools/kdoc/pom.xml @@ -23,7 +23,7 @@ org.jetbrains.kotlin - kotlin-maven-plugin + kotlin-compiler ${project.version} diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt index ad2e696fc1b..28306f6a68c 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/JavadocStyleHtmlDoclet.kt @@ -12,7 +12,7 @@ import java.util.List import java.util.HashSet import java.util.* -import com.intellij.psi.PsiElement +import org.jetbrains.jet.internal.com.intellij.psi.PsiElement import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.BindingContext.* import org.jetbrains.jet.cli.common.CompilerPlugin diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt index afdd10c5f1a..2bd2ecf4c53 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDoc.kt @@ -12,7 +12,7 @@ import java.util.List import java.util.HashSet import java.util.Collection -import com.intellij.psi.PsiElement +import org.jetbrains.jet.internal.com.intellij.psi.PsiElement import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.BindingContext.* import org.jetbrains.jet.cli.common.CompilerPlugin 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 bf48c688db9..8a13b2eab09 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,10 +1,10 @@ package org.jetbrains.kotlin.doc.highlighter -import com.intellij.psi.PsiFile +import org.jetbrains.jet.internal.com.intellij.psi.PsiFile import org.jetbrains.jet.lang.psi.* -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiWhiteSpace -import com.intellij.psi.PsiComment +import org.jetbrains.jet.internal.com.intellij.psi.PsiElement +import org.jetbrains.jet.internal.com.intellij.psi.PsiWhiteSpace +import org.jetbrains.jet.internal.com.intellij.psi.PsiComment 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 955d339d670..e334f62bf66 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 @@ -1,8 +1,8 @@ package org.jetbrains.kotlin.doc.highlighter -import com.intellij.psi.* -import com.intellij.psi.tree.IElementType -import com.intellij.psi.tree.TokenSet +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 java.util.HashMap import java.util.Map import kotlin.template.HtmlFormatter 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 6e195ef9dbc..3186ed6f4cb 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 @@ -35,14 +35,15 @@ import org.jetbrains.kotlin.doc.templates.KDocTemplate import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl import org.jetbrains.jet.lang.descriptors.Visibility import org.jetbrains.jet.lang.descriptors.ClassKind -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiFile -import 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.PsiDirectory import org.jetbrains.jet.lang.descriptors.Visibilities import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils.LineAndColumn -import com.intellij.psi.PsiFileSystemItem +import org.jetbrains.jet.internal.com.intellij.psi.PsiFileSystemItem import java.io.File +import org.jetbrains.jet.internal.com.intellij.psi.PsiElement /** diff --git a/libraries/tools/kotlin-install/pom.xml b/libraries/tools/kotlin-install/pom.xml index 2d276556326..045df9583c0 100644 --- a/libraries/tools/kotlin-install/pom.xml +++ b/libraries/tools/kotlin-install/pom.xml @@ -19,7 +19,7 @@ kotlin-install pom - Installs the Kotlin runtime dependencies into the local maven repo + Installs and deploys the Kotlin compiler @@ -43,102 +43,6 @@ true - - org.jetbrains.kotlin:kotlin-build-tools - verify - - install-file - - - org.jetbrains.kotlin - kotlin-build-tools - ${project.version} - jar - ${kotlin-sdk}/lib/kotlin-build-tools.jar - true - true - - - - org.jetbrains.kotlin:intellij-core - verify - - install-file - - - org.jetbrains.kotlin - intellij-core - ${project.version} - jar - ${kotlin-sdk}/lib/intellij-core.jar - true - true - - - - org.jetbrains.kotlin:intellij-annotations - verify - - install-file - - - org.jetbrains.kotlin - intellij-annotations - ${project.version} - jar - ${kotlin-sdk}/lib/annotations.jar - true - true - - - - org.jetbrains.kotlin:trove4j - verify - - install-file - - - org.jetbrains.kotlin - trove4j - ${project.version} - jar - ${kotlin-sdk}/lib/trove4j.jar - true - true - - - - org.jetbrains.kotlin:picocontainer - verify - - install-file - - - org.jetbrains.kotlin - picocontainer - ${project.version} - jar - ${kotlin-sdk}/lib/picocontainer.jar - true - true - - - - org.jetbrains.kotlin:dartc - verify - - install-file - - - org.jetbrains.kotlin - dartc - ${project.version} - jar - ${kotlin-sdk}/lib/js/${dart.name}.jar - true - true - - diff --git a/libraries/tools/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml index 69f0b072965..bc60410e04a 100644 --- a/libraries/tools/kotlin-maven-plugin/pom.xml +++ b/libraries/tools/kotlin-maven-plugin/pom.xml @@ -25,102 +25,13 @@ maven-plugin-api ${maven.version} - - - org.jetbrains.kotlin kotlin-compiler ${project.version} - - org.jetbrains.kotlin - kotlin-runtime - ${project.version} - - - org.jetbrains.kotlin - intellij-core - ${project.version} - - - org.jetbrains.kotlin - intellij-annotations - ${project.version} - - - - - org.jetbrains.kotlin - kotlin-build-tools - ${project.version} - - - - - com.google.guava - guava - ${guava.version} - - - asm - asm - ${asm.version} - - - asm - asm-tree - ${asm.version} - - - asm - asm-commons - ${asm.version} - - - asm - asm-util - ${asm.version} - - - org.jetbrains.kotlin - trove4j - ${project.version} - - - - org.jetbrains.kotlin - picocontainer - ${project.version} - - - - - - - org.jetbrains.kotlin - dartc - ${project.version} - + src/main/java src/test/java @@ -144,31 +55,6 @@ maven-plugin-plugin 2.9 - - - - org.apache.maven.plugins - maven-shade-plugin - 1.6 - - - package - - shade - - - - - org.jetbrains.kotlin:* - - - org.jetbrains.kotlin:stdlib - - - - - - diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerPlugin.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerPlugin.java index 0ecd68f0e9f..ad5f3b2af62 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerPlugin.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerPlugin.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.maven; import com.google.common.io.Files; -import com.intellij.openapi.project.Project; +import org.jetbrains.jet.internal.com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.CompilerPlugin; import org.jetbrains.jet.cli.common.CompilerPluginContext; @@ -28,7 +28,6 @@ import org.jetbrains.k2js.facade.K2JSTranslator; import java.io.File; import java.io.IOException; -import java.lang.Override; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; diff --git a/update_dependencies.xml b/update_dependencies.xml index e7e9c20c8ca..46b0c6dcc83 100644 --- a/update_dependencies.xml +++ b/update_dependencies.xml @@ -32,6 +32,17 @@ + + + + + + + + + +