From 4b255e0897e837bdce51d4ff4ff2eb9e74654e1f Mon Sep 17 00:00:00 2001
From: Alexey Andreev <konsoletyper@gmail.com>
Date: Sat, 13 Feb 2016 20:41:33 +0300
Subject: [PATCH] Developing IDEA plugin

---
 .idea/compiler.xml                            | 198 ++++++++++++++++++
 .idea/copyright/profiles_settings.xml         |   8 +
 .idea/dictionaries/Alexey_Andreev.xml         |   3 -
 .idea/inspectionProfiles/Project_Default.xml  |   2 +-
 .idea/misc.xml                                |  79 +++++++
 .idea/modules.xml                             |   1 +
 .../java/org/teavm/idea/jps/TeaVMBuilder.java |  93 ++++++++
 .../teavm/idea/jps}/TeaVMBuilderService.java  |  16 +-
 .../idea/jps/model/TeaVMJpsConfiguration.java |  77 +++++++
 .../model/TeaVMModelSerializerService.java    |  38 ++++
 ...g.jetbrains.jps.incremental.BuilderService |   1 +
 ....serialization.JpsModelSerializerExtension |   1 +
 tools/idea/jps-plugin/teavm-jps-plugin.iml    |  15 ++
 .../java/org/teavm/idea/TeaVMBuildTarget.java |  87 --------
 .../org/teavm/idea/TeaVMBuildTargetType.java  |  52 -----
 .../java/org/teavm/idea/TeaVMBuilder.java     |  46 ----
 .../org/teavm/idea/TeaVMModuleExtension.java  |  63 ------
 .../idea/ui/TeaVMConfigurationPanel.java      |  22 +-
 .../src/main/resources/META-INF/plugin.xml    |  10 +-
 ...g.jetbrains.jps.incremental.BuilderService |   1 -
 tools/idea/teavm-idea-plugin.iml              |   6 +-
 21 files changed, 543 insertions(+), 276 deletions(-)
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/copyright/profiles_settings.xml
 delete mode 100644 .idea/dictionaries/Alexey_Andreev.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
 rename tools/idea/{src/main/java/org/teavm/idea => jps-plugin/src/main/java/org/teavm/idea/jps}/TeaVMBuilderService.java (74%)
 create mode 100644 tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/model/TeaVMJpsConfiguration.java
 create mode 100644 tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/model/TeaVMModelSerializerService.java
 create mode 100644 tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService
 create mode 100644 tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
 create mode 100644 tools/idea/jps-plugin/teavm-jps-plugin.iml
 delete mode 100644 tools/idea/src/main/java/org/teavm/idea/TeaVMBuildTarget.java
 delete mode 100644 tools/idea/src/main/java/org/teavm/idea/TeaVMBuildTargetType.java
 delete mode 100644 tools/idea/src/main/java/org/teavm/idea/TeaVMBuilder.java
 delete mode 100644 tools/idea/src/main/java/org/teavm/idea/TeaVMModuleExtension.java
 delete mode 100644 tools/idea/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 000000000..4dc2fa861
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <excludeFromCompile>
+      <directory url="file://$PROJECT_DIR$/tools/maven/webapp/src/main/resources/archetype-resources" includeSubdirectories="true" />
+    </excludeFromCompile>
+    <resourceExtensions />
+    <wildcardResourcePatterns>
+      <entry name="!?*.java" />
+      <entry name="!?*.form" />
+      <entry name="!?*.class" />
+      <entry name="!?*.groovy" />
+      <entry name="!?*.scala" />
+      <entry name="!?*.flex" />
+      <entry name="!?*.kt" />
+      <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
+    </wildcardResourcePatterns>
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="false">
+        <processorPath useClasspath="true" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-cli" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-cli" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-tooling" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-tooling" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-platform" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-platform" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-html4j" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-html4j" />
+      </profile>
+      <profile default="false" name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-maven-webapp" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-jso-impl" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-jso-impl" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-maven-plugin" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-maven-plugin" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-jso-apis" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-jso-apis" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-samples-scala" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-samples-scala" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-jso" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-jso" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-core" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-core" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-samples-kotlin" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-samples-kotlin" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-classlib" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-classlib" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-samples-async" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-samples-async" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-samples-video" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-samples-video" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-samples-storage" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-samples-storage" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-samples-benchmark" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-samples-benchmark" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-samples-hello" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-samples-hello" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-extras-slf4j" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-extras-slf4j" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-chrome-rdp" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-chrome-rdp" />
+      </profile>
+      <profile default="false" name="Annotation profile for teavm-tests" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="teavm-tests" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="teavm" target="1.5" />
+      <module name="teavm-chrome-rdp" target="1.8" />
+      <module name="teavm-classlib" target="1.8" />
+      <module name="teavm-cli" target="1.8" />
+      <module name="teavm-core" target="1.8" />
+      <module name="teavm-extras-slf4j" target="1.8" />
+      <module name="teavm-html4j" target="1.8" />
+      <module name="teavm-jso" target="1.8" />
+      <module name="teavm-jso-apis" target="1.8" />
+      <module name="teavm-jso-impl" target="1.8" />
+      <module name="teavm-maven" target="1.5" />
+      <module name="teavm-maven-plugin" target="1.8" />
+      <module name="teavm-maven-webapp" target="1.5" />
+      <module name="teavm-platform" target="1.8" />
+      <module name="teavm-samples" target="1.5" />
+      <module name="teavm-samples-async" target="1.8" />
+      <module name="teavm-samples-benchmark" target="1.8" />
+      <module name="teavm-samples-hello" target="1.8" />
+      <module name="teavm-samples-kotlin" target="1.8" />
+      <module name="teavm-samples-scala" target="1.8" />
+      <module name="teavm-samples-storage" target="1.8" />
+      <module name="teavm-samples-video" target="1.8" />
+      <module name="teavm-tests" target="1.8" />
+      <module name="teavm-tooling" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 000000000..91ace1aaf
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,8 @@
+<component name="CopyrightManager">
+  <settings default="Apache 2.0">
+    <LanguageOptions name="JAVA">
+      <option name="fileTypeOverride" value="3" />
+      <option name="addBlankAfter" value="false" />
+    </LanguageOptions>
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/dictionaries/Alexey_Andreev.xml b/.idea/dictionaries/Alexey_Andreev.xml
deleted file mode 100644
index 3fb8eccc0..000000000
--- a/.idea/dictionaries/Alexey_Andreev.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="Alexey Andreev" />
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 7f7428a5d..d8a5e0eb2 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -115,7 +115,7 @@
       <option name="SUGGEST_PRIVATE_FOR_INNERS" value="false" />
     </inspection_tool>
     <inspection_tool class="WrongImportPackage" enabled="false" level="ERROR" enabled_by_default="false" />
-    <inspection_tool class="XmlUnboundNsPrefix" enabled="true" level="WARNING" enabled_by_default="true">
+    <inspection_tool class="XmlUnboundNsPrefix" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <scope name="ecipse" level="WARNING" enabled="false" />
     </inspection_tool>
     <inspection_tool class="unused" enabled="true" level="WARNING" enabled_by_default="true">
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 000000000..ec13cf2f5
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ClientPropertiesManager">
+    <properties class="javax.swing.AbstractButton">
+      <property name="hideActionText" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JComponent">
+      <property name="html.disable" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JEditorPane">
+      <property name="JEditorPane.w3cLengthUnits" class="java.lang.Boolean" />
+      <property name="JEditorPane.honorDisplayProperties" class="java.lang.Boolean" />
+      <property name="charset" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.JList">
+      <property name="List.isFileList" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JPasswordField">
+      <property name="JPasswordField.cutCopyAllowed" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JSlider">
+      <property name="Slider.paintThumbArrowShape" class="java.lang.Boolean" />
+      <property name="JSlider.isFilled" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTable">
+      <property name="Table.isFileList" class="java.lang.Boolean" />
+      <property name="JTable.autoStartsEdit" class="java.lang.Boolean" />
+      <property name="terminateEditOnFocusLost" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JToolBar">
+      <property name="JToolBar.isRollover" class="java.lang.Boolean" />
+    </properties>
+    <properties class="javax.swing.JTree">
+      <property name="JTree.lineStyle" class="java.lang.String" />
+    </properties>
+    <properties class="javax.swing.text.JTextComponent">
+      <property name="caretAspectRatio" class="java.lang.Double" />
+      <property name="caretWidth" class="java.lang.Integer" />
+    </properties>
+  </component>
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="gwt" url="file://$PROJECT_DIR$/samples/benchmark" />
+    <file type="Osmorc" url="file://$PROJECT_DIR$/classlib" />
+    <file type="Osmorc" url="file://$PROJECT_DIR$/core" />
+    <file type="Osmorc" url="file://$PROJECT_DIR$/platform" />
+    <file type="Osmorc" url="file://$PROJECT_DIR$/tools/chrome-rdp" />
+    <file type="Osmorc" url="file://$PROJECT_DIR$/tools/core" />
+    <file type="web" url="file://$PROJECT_DIR$/samples/async" />
+    <file type="web" url="file://$PROJECT_DIR$/samples/benchmark" />
+    <file type="web" url="file://$PROJECT_DIR$/samples/hello" />
+    <file type="web" url="file://$PROJECT_DIR$/samples/kotlin" />
+    <file type="web" url="file://$PROJECT_DIR$/samples/scala" />
+    <file type="web" url="file://$PROJECT_DIR$/samples/storage" />
+    <file type="web" url="file://$PROJECT_DIR$/samples/video" />
+  </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 954f431a8..a6391bb86 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -10,6 +10,7 @@
       <module fileurl="file://$PROJECT_DIR$/extras-slf4j/teavm-extras-slf4j.iml" filepath="$PROJECT_DIR$/extras-slf4j/teavm-extras-slf4j.iml" />
       <module fileurl="file://$PROJECT_DIR$/html4j/teavm-html4j.iml" filepath="$PROJECT_DIR$/html4j/teavm-html4j.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/idea/teavm-idea-plugin.iml" filepath="$PROJECT_DIR$/tools/idea/teavm-idea-plugin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/tools/idea/jps-plugin/teavm-jps-plugin.iml" filepath="$PROJECT_DIR$/tools/idea/jps-plugin/teavm-jps-plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/jso/core/teavm-jso.iml" filepath="$PROJECT_DIR$/jso/core/teavm-jso.iml" />
       <module fileurl="file://$PROJECT_DIR$/jso/apis/teavm-jso-apis.iml" filepath="$PROJECT_DIR$/jso/apis/teavm-jso-apis.iml" />
       <module fileurl="file://$PROJECT_DIR$/jso/impl/teavm-jso-impl.iml" filepath="$PROJECT_DIR$/jso/impl/teavm-jso-impl.iml" />
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
new file mode 100644
index 000000000..192dbd313
--- /dev/null
+++ b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java
@@ -0,0 +1,93 @@
+/*
+ *  Copyright 2016 Alexey Andreev.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.teavm.idea.jps;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jps.ModuleChunk;
+import org.jetbrains.jps.builders.DirtyFilesHolder;
+import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor;
+import org.jetbrains.jps.incremental.BuilderCategory;
+import org.jetbrains.jps.incremental.CompileContext;
+import org.jetbrains.jps.incremental.ModuleBuildTarget;
+import org.jetbrains.jps.incremental.ModuleLevelBuilder;
+import org.jetbrains.jps.incremental.ProjectBuildException;
+import org.jetbrains.jps.model.java.JpsJavaExtensionService;
+import org.jetbrains.jps.model.library.JpsLibrary;
+import org.jetbrains.jps.model.library.JpsOrderRootType;
+import org.jetbrains.jps.model.module.JpsDependencyElement;
+import org.jetbrains.jps.model.module.JpsLibraryDependency;
+import org.jetbrains.jps.model.module.JpsModule;
+import org.jetbrains.jps.model.module.JpsModuleDependency;
+import org.teavm.idea.jps.model.TeaVMJpsConfiguration;
+
+public class TeaVMBuilder extends ModuleLevelBuilder {
+    public TeaVMBuilder() {
+        super(BuilderCategory.CLASS_POST_PROCESSOR);
+    }
+
+    @Override
+    public ExitCode build(CompileContext context, ModuleChunk chunk,
+            DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget> dirtyFilesHolder,
+            OutputConsumer outputConsumer) throws ProjectBuildException, IOException {
+        for (JpsModule module : chunk.getModules()) {
+            buildModule(module);
+        }
+        return ExitCode.OK;
+    }
+
+    private void buildModule(JpsModule module) {
+        TeaVMJpsConfiguration config = TeaVMJpsConfiguration.get(module);
+        if (config == null || !config.isEnabled()) {
+            return;
+        }
+        Set<String> classPathEntries = new HashSet<>();
+        buildClassPath(module, new HashSet<>(), classPathEntries);
+        System.out.println(classPathEntries.stream().collect(Collectors.joining(":")));
+    }
+
+    private void buildClassPath(JpsModule module, Set<JpsModule> visited, Set<String> classPathEntries) {
+        if (!visited.add(module)) {
+            return;
+        }
+        File output = JpsJavaExtensionService.getInstance().getOutputDirectory(module, false);
+        if (output != null) {
+            classPathEntries.add(output.getPath());
+        }
+        for (JpsDependencyElement dependency : module.getDependenciesList().getDependencies()) {
+            if (dependency instanceof JpsModuleDependency) {
+                buildClassPath(((JpsModuleDependency) dependency).getModule(), visited, classPathEntries);
+            } else if (dependency instanceof JpsLibraryDependency) {
+                JpsLibrary library = ((JpsLibraryDependency) dependency).getLibrary();
+                if (library == null) {
+                    continue;
+                }
+                classPathEntries.addAll(library.getFiles(JpsOrderRootType.COMPILED).stream().map(File::getPath)
+                        .collect(Collectors.toList()));
+            }
+        }
+    }
+
+    @NotNull
+    @Override
+    public String getPresentableName() {
+        return "TeaVM builder";
+    }
+}
diff --git a/tools/idea/src/main/java/org/teavm/idea/TeaVMBuilderService.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilderService.java
similarity index 74%
rename from tools/idea/src/main/java/org/teavm/idea/TeaVMBuilderService.java
rename to tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilderService.java
index 40b0f98f6..4a8947374 100644
--- a/tools/idea/src/main/java/org/teavm/idea/TeaVMBuilderService.java
+++ b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilderService.java
@@ -13,30 +13,30 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.teavm.idea;
+package org.teavm.idea.jps;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jps.builders.BuildTargetType;
-import org.jetbrains.jps.incremental.BuilderCategory;
 import org.jetbrains.jps.incremental.BuilderService;
 import org.jetbrains.jps.incremental.ModuleLevelBuilder;
+import org.jetbrains.jps.incremental.TargetBuilder;
 
 public class TeaVMBuilderService extends BuilderService {
-    TeaVMBuilderService() {
+    public TeaVMBuilderService() {
         System.out.println("Hello");
     }
 
     @NotNull
     @Override
-    public List<? extends BuildTargetType<?>> getTargetTypes() {
-        return Arrays.asList(TeaVMBuildTargetType.INSTANCE);
+    public List<? extends ModuleLevelBuilder> createModuleLevelBuilders() {
+        return Arrays.asList(new TeaVMBuilder());
     }
 
     @NotNull
     @Override
-    public List<? extends ModuleLevelBuilder> createModuleLevelBuilders() {
-        return Arrays.asList(new TeaVMBuilder(BuilderCategory.CLASS_POST_PROCESSOR));
+    public List<? extends TargetBuilder<?, ?>> createBuilders() {
+        return Collections.emptyList();
     }
 }
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/model/TeaVMJpsConfiguration.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/model/TeaVMJpsConfiguration.java
new file mode 100644
index 000000000..457ff0d80
--- /dev/null
+++ b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/model/TeaVMJpsConfiguration.java
@@ -0,0 +1,77 @@
+/*
+ *  Copyright 2016 Alexey Andreev.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.teavm.idea.jps.model;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jps.model.JpsElementChildRole;
+import org.jetbrains.jps.model.ex.JpsElementBase;
+import org.jetbrains.jps.model.ex.JpsElementChildRoleBase;
+import org.jetbrains.jps.model.module.JpsModule;
+
+public class TeaVMJpsConfiguration extends JpsElementBase<TeaVMJpsConfiguration> {
+    public static final JpsElementChildRole<TeaVMJpsConfiguration> ROLE = JpsElementChildRoleBase.create(
+            "TeaVM configuration");
+    private boolean enabled;
+    private String mainClass;
+    private String targetDirectory;
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public String getMainClass() {
+        return mainClass;
+    }
+
+    public void setMainClass(String mainClass) {
+        this.mainClass = mainClass;
+    }
+
+    public String getTargetDirectory() {
+        return targetDirectory;
+    }
+
+    public void setTargetDirectory(String targetDirectory) {
+        this.targetDirectory = targetDirectory;
+    }
+
+    public static TeaVMJpsConfiguration get(JpsModule module) {
+        return module.getContainer().getChild(ROLE);
+    }
+
+    public void setTo(JpsModule module) {
+        module.getContainer().setChild(ROLE, this);
+    }
+
+    @NotNull
+    @Override
+    public TeaVMJpsConfiguration createCopy() {
+        TeaVMJpsConfiguration copy = new TeaVMJpsConfiguration();
+        copy.applyChanges(this);
+        return copy;
+    }
+
+    @Override
+    public void applyChanges(@NotNull TeaVMJpsConfiguration modified) {
+        enabled = modified.enabled;
+        mainClass = modified.mainClass;
+        targetDirectory = modified.targetDirectory;
+    }
+}
diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/model/TeaVMModelSerializerService.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/model/TeaVMModelSerializerService.java
new file mode 100644
index 000000000..2e870db97
--- /dev/null
+++ b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/model/TeaVMModelSerializerService.java
@@ -0,0 +1,38 @@
+/*
+ *  Copyright 2016 Alexey Andreev.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.teavm.idea.jps.model;
+
+import com.intellij.util.xmlb.XmlSerializer;
+import java.util.Objects;
+import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jps.model.module.JpsModule;
+import org.jetbrains.jps.model.serialization.JpsModelSerializerExtension;
+
+public class TeaVMModelSerializerService extends JpsModelSerializerExtension {
+    @Override
+    public void loadModuleOptions(@NotNull JpsModule module, @NotNull Element rootElement) {
+        rootElement.getChildren("component").stream()
+                .filter(child -> Objects.equals(child.getAttributeValue("name"), "teavm"))
+                .forEach(child -> readConfig(module, child));
+    }
+
+    private void readConfig(@NotNull JpsModule module, @NotNull Element element) {
+        TeaVMJpsConfiguration config = XmlSerializer.deserialize(element, TeaVMJpsConfiguration.class);
+        assert config != null;
+        config.setTo(module);
+    }
+}
diff --git a/tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService b/tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService
new file mode 100644
index 000000000..bd0f40b5d
--- /dev/null
+++ b/tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService
@@ -0,0 +1 @@
+org.teavm.idea.jps.TeaVMBuilderService
\ No newline at end of file
diff --git a/tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension b/tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
new file mode 100644
index 000000000..cebf52ebf
--- /dev/null
+++ b/tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
@@ -0,0 +1 @@
+org.teavm.idea.jps.model.TeaVMModelSerializerService
\ No newline at end of file
diff --git a/tools/idea/jps-plugin/teavm-jps-plugin.iml b/tools/idea/jps-plugin/teavm-jps-plugin.iml
new file mode 100644
index 000000000..1bdcf56fe
--- /dev/null
+++ b/tools/idea/jps-plugin/teavm-jps-plugin.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="jdk" jdkName="IntelliJ IDEA IU-144.3600.7" jdkType="IDEA JDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/tools/idea/src/main/java/org/teavm/idea/TeaVMBuildTarget.java b/tools/idea/src/main/java/org/teavm/idea/TeaVMBuildTarget.java
deleted file mode 100644
index 21a307be4..000000000
--- a/tools/idea/src/main/java/org/teavm/idea/TeaVMBuildTarget.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- *  Copyright 2016 Alexey Andreev.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.teavm.idea;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jps.builders.BuildRootIndex;
-import org.jetbrains.jps.builders.BuildTarget;
-import org.jetbrains.jps.builders.BuildTargetRegistry;
-import org.jetbrains.jps.builders.ModuleBasedTarget;
-import org.jetbrains.jps.builders.TargetOutputIndex;
-import org.jetbrains.jps.builders.storage.BuildDataPaths;
-import org.jetbrains.jps.incremental.CompileContext;
-import org.jetbrains.jps.incremental.artifacts.instructions.ArtifactRootDescriptor;
-import org.jetbrains.jps.indices.IgnoredFileIndex;
-import org.jetbrains.jps.indices.ModuleExcludeIndex;
-import org.jetbrains.jps.model.JpsModel;
-import org.jetbrains.jps.model.module.JpsModule;
-
-public class TeaVMBuildTarget extends ModuleBasedTarget<ArtifactRootDescriptor> {
-    TeaVMBuildTarget(TeaVMBuildTargetType targetType, @NotNull JpsModule module) {
-        super(targetType, module);
-    }
-
-    @Override
-    public boolean isTests() {
-        return false;
-    }
-
-    @Override
-    public String getId() {
-        return getModule().getName() + "_teavm";
-    }
-
-    @Override
-    public Collection<BuildTarget<?>> computeDependencies(BuildTargetRegistry targetRegistry,
-            TargetOutputIndex outputIndex) {
-        return Collections.emptyList();
-    }
-
-    @NotNull
-    @Override
-    public List<ArtifactRootDescriptor> computeRootDescriptors(JpsModel model, ModuleExcludeIndex index,
-            IgnoredFileIndex ignoredFileIndex, BuildDataPaths dataPaths) {
-        return Collections.emptyList();
-    }
-
-    @Nullable
-    @Override
-    public ArtifactRootDescriptor findRootDescriptor(String rootId, BuildRootIndex rootIndex) {
-        return null;
-    }
-
-    @NotNull
-    @Override
-    public String getPresentableName() {
-        return getModule().getName() + " (TeaVM)";
-    }
-
-    @NotNull
-    @Override
-    public Collection<File> getOutputRoots(CompileContext context) {
-        TeaVMModuleExtension extension = getModule().getContainer().getChild(TeaVMModuleExtension.ROLE);
-        if (extension == null) {
-            return Collections.emptyList();
-        }
-        return Arrays.asList(new File(extension.getTargetDirectory()));
-    }
-}
diff --git a/tools/idea/src/main/java/org/teavm/idea/TeaVMBuildTargetType.java b/tools/idea/src/main/java/org/teavm/idea/TeaVMBuildTargetType.java
deleted file mode 100644
index f3b1c7510..000000000
--- a/tools/idea/src/main/java/org/teavm/idea/TeaVMBuildTargetType.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright 2016 Alexey Andreev.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.teavm.idea;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jps.builders.BuildTargetLoader;
-import org.jetbrains.jps.builders.ModuleBasedBuildTargetType;
-import org.jetbrains.jps.incremental.ModuleBuildTarget;
-import org.jetbrains.jps.model.JpsModel;
-import org.jetbrains.jps.model.module.JpsModule;
-
-public class TeaVMBuildTargetType extends ModuleBasedBuildTargetType<TeaVMBuildTarget> {
-    public static final TeaVMBuildTargetType INSTANCE = new TeaVMBuildTargetType("teavm");
-
-    public TeaVMBuildTargetType(String typeId) {
-        super(typeId);
-    }
-
-    @NotNull
-    @Override
-    public List<TeaVMBuildTarget> computeAllTargets(@NotNull JpsModel model) {
-        List<JpsModule> modules = model.getProject().getModules();
-        List<TeaVMBuildTarget> targets = new ArrayList<>(modules.size());
-        for (JpsModule module : modules) {
-            if (module.getContainer().getChild(TeaVMModuleExtension.ROLE) != null) {
-                targets.add(new TeaVMBuildTarget(this, module));
-            }
-        }
-        return targets;
-    }
-
-    @NotNull
-    @Override
-    public BuildTargetLoader<TeaVMBuildTarget> createLoader(@NotNull JpsModel model) {
-        return null;
-    }
-}
diff --git a/tools/idea/src/main/java/org/teavm/idea/TeaVMBuilder.java b/tools/idea/src/main/java/org/teavm/idea/TeaVMBuilder.java
deleted file mode 100644
index 6c75b17f5..000000000
--- a/tools/idea/src/main/java/org/teavm/idea/TeaVMBuilder.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright 2016 Alexey Andreev.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.teavm.idea;
-
-import java.io.IOException;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jps.ModuleChunk;
-import org.jetbrains.jps.builders.DirtyFilesHolder;
-import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor;
-import org.jetbrains.jps.incremental.BuilderCategory;
-import org.jetbrains.jps.incremental.CompileContext;
-import org.jetbrains.jps.incremental.ModuleBuildTarget;
-import org.jetbrains.jps.incremental.ModuleLevelBuilder;
-import org.jetbrains.jps.incremental.ProjectBuildException;
-
-public class TeaVMBuilder extends ModuleLevelBuilder {
-    public TeaVMBuilder(BuilderCategory category) {
-        super(category);
-    }
-
-    @Override
-    public ExitCode build(CompileContext context, ModuleChunk chunk,
-            DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget> dirtyFilesHolder,
-            OutputConsumer outputConsumer) throws ProjectBuildException, IOException {
-        return ExitCode.OK;
-    }
-
-    @NotNull
-    @Override
-    public String getPresentableName() {
-        return "TeaVM builder";
-    }
-}
diff --git a/tools/idea/src/main/java/org/teavm/idea/TeaVMModuleExtension.java b/tools/idea/src/main/java/org/teavm/idea/TeaVMModuleExtension.java
deleted file mode 100644
index b60b0db48..000000000
--- a/tools/idea/src/main/java/org/teavm/idea/TeaVMModuleExtension.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- *  Copyright 2016 Alexey Andreev.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.teavm.idea;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jps.model.JpsElementChildRole;
-import org.jetbrains.jps.model.ex.JpsCompositeElementBase;
-import org.jetbrains.jps.model.ex.JpsElementChildRoleBase;
-
-public class TeaVMModuleExtension extends JpsCompositeElementBase<TeaVMModuleExtension> {
-    public static final JpsElementChildRole<TeaVMModuleExtension> ROLE = JpsElementChildRoleBase
-            .create("TeaVM configuration");
-    private String mainClass;
-    private String targetDirectory;
-
-    public TeaVMModuleExtension(@NotNull String mainClass, @NotNull String targetDirectory) {
-        this.mainClass = mainClass;
-        this.targetDirectory = targetDirectory;
-    }
-
-    public TeaVMModuleExtension(TeaVMModuleExtension original) {
-        super(original);
-        mainClass = original.mainClass;
-        targetDirectory = original.targetDirectory;
-    }
-
-    @NotNull
-    public String getMainClass() {
-        return mainClass;
-    }
-
-    public void setMainClass(@NotNull String mainClass) {
-        this.mainClass = mainClass;
-    }
-
-    @NotNull
-    public String getTargetDirectory() {
-        return targetDirectory;
-    }
-
-    public void setTargetDirectory(@NotNull String targetDirectory) {
-        this.targetDirectory = targetDirectory;
-    }
-
-    @NotNull
-    @Override
-    public TeaVMModuleExtension createCopy() {
-        return new TeaVMModuleExtension(this);
-    }
-}
diff --git a/tools/idea/src/main/java/org/teavm/idea/ui/TeaVMConfigurationPanel.java b/tools/idea/src/main/java/org/teavm/idea/ui/TeaVMConfigurationPanel.java
index 096677dba..a4f9b6f5a 100644
--- a/tools/idea/src/main/java/org/teavm/idea/ui/TeaVMConfigurationPanel.java
+++ b/tools/idea/src/main/java/org/teavm/idea/ui/TeaVMConfigurationPanel.java
@@ -58,15 +58,21 @@ class TeaVMConfigurationPanel extends JPanel {
         constraints.gridwidth = GridBagConstraints.REMAINDER;
         add(enabledCheckBox, constraints);
 
-        constraints.gridwidth = GridBagConstraints.RELATIVE;
-        add(new JLabel("Main class:"), constraints);
-        constraints.gridwidth = GridBagConstraints.REMAINDER;
-        add(mainClassField, constraints);
+        GridBagConstraints labelConstrains = new GridBagConstraints();
+        labelConstrains.gridwidth = GridBagConstraints.RELATIVE;
+        labelConstrains.anchor = GridBagConstraints.BASELINE_TRAILING;
 
-        constraints.gridwidth = GridBagConstraints.RELATIVE;
-        add(new JLabel("Target directory:"), constraints);
-        constraints.gridwidth = GridBagConstraints.REMAINDER;
-        add(targetDirectoryField, constraints);
+        GridBagConstraints fieldConstrains = new GridBagConstraints();
+        fieldConstrains.gridwidth = GridBagConstraints.REMAINDER;
+        fieldConstrains.fill = GridBagConstraints.HORIZONTAL;
+        labelConstrains.anchor = GridBagConstraints.BASELINE_LEADING;
+        labelConstrains.insets.right = 5;
+
+        add(new JLabel("Main class:"), labelConstrains);
+        add(mainClassField, fieldConstrains);
+
+        add(new JLabel("Target directory:"), labelConstrains);
+        add(targetDirectoryField, fieldConstrains);
     }
 
     public void load(TeaVMConfiguration config) {
diff --git a/tools/idea/src/main/resources/META-INF/plugin.xml b/tools/idea/src/main/resources/META-INF/plugin.xml
index 82d6ef691..a5ffd49d2 100644
--- a/tools/idea/src/main/resources/META-INF/plugin.xml
+++ b/tools/idea/src/main/resources/META-INF/plugin.xml
@@ -1,8 +1,8 @@
 <idea-plugin version="2">
-  <id>com.your.company.unique.plugin.id</id>
-  <name>Plugin display name here</name>
+  <id>org.teavm.idea</id>
+  <name>TeaVM IDEA plugin</name>
   <version>1.0</version>
-  <vendor email="support@yourcompany.com" url="http://www.yourcompany.com">YourCompany</vendor>
+  <vendor email="info@teavm.org" url="http://teavm.org">TeaVM community</vendor>
 
   <description><![CDATA[
       Enter short description for your plugin here.<br>
@@ -21,11 +21,9 @@
     <moduleConfigurable instance="org.teavm.idea.ui.TeaVMConfigurable"/>
     <moduleService serviceInterface="org.teavm.idea.TeaVMConfigurationStorage"
                    serviceImplementation="org.teavm.idea.TeaVMConfigurationStorage"/>
+    <compileServer.plugin classpath="jps-plugin/teavm-jps-plugin.jar"/>
   </extensions>
 
-  <actions>
-  </actions>
-
   <module-components>
     <component>
       <implementation-class>org.teavm.idea.TeaVMConfigurationStorage</implementation-class>
diff --git a/tools/idea/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService b/tools/idea/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService
deleted file mode 100644
index f1072fdb7..000000000
--- a/tools/idea/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService
+++ /dev/null
@@ -1 +0,0 @@
-org.teavm.idea.TeaVMBuilderService
\ No newline at end of file
diff --git a/tools/idea/teavm-idea-plugin.iml b/tools/idea/teavm-idea-plugin.iml
index eacb55867..ea0f494f2 100644
--- a/tools/idea/teavm-idea-plugin.iml
+++ b/tools/idea/teavm-idea-plugin.iml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/src/main/resources/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="jdk" jdkName="IntelliJ IDEA IU-144.3600.7" jdkType="IDEA JDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="teavm-jps-plugin" exported="" scope="RUNTIME" />
   </component>
 </module>
\ No newline at end of file