WIP: Basic support for Kotlin/Native

* Target presets * Compilation into a klib * Compilation into native binraies: framework and executable * Basic dependencies between projects
Add dependency on KN shared in gradle-plugin
2026-04-25 15:52:47 +00:00 · 2018-07-19 19:19:04 +07:00 · 2018-07-19 19:18:45 +07:00 · 2018-07-16 12:31:29 +07:00 · 2018-07-12 17:54:53 +03:00 · 2018-07-12 14:37:11 +03:00
32081 changed files with 425031 additions and 1022932 deletions
--- a/.bunch
+++ b/.bunch
@@ -1,8 +1,6 @@
-191
-192
-183
-182_183
-as33_182_183
-as34_183
-as35
-as36_192
+181
+173
+172_173
+as31_173
+as32
+182
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,14 @@
+Many thanks for your contribution, we genuinely appreciate it. 
+Make sure that you can say "YES" to each point in this short checklist:
+
+  - You do not have merge commits in PR
+  - You made a few changes
+  - You provided the link to related issue from YouTrack
+  - You can describe changes made in PR
+  - You made changes related to only one issue
+  - You are ready to defend your changes on code review
+  - You didn't touch what you don't understand
+  - You ran the build locally, and verified new functionality
+  - You ran related tests locally, and it passed
+
+Thank you for your contribution!
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 .idea/shelf
 /android.tests.dependencies
 /confluence/target
-/dependencies/repo
+/dependencies
 /dist
 /local
 /gh-pages
@@ -15,6 +15,10 @@ workspace.xml
 *.versionsBackup
 /idea/testData/debugger/tinyApp/classes*
 /jps-plugin/testData/kannotator
+/ultimate/dependencies
+/ultimate/ideaSDK
+/ultimate/out
+/ultimate/tmp
 /js/js.translator/testData/out/
 /js/js.translator/testData/out-min/
 .gradle/
@@ -25,30 +29,12 @@ build/
 !**/testData/**/*.iml
 .idea/libraries/Gradle*.xml
 .idea/libraries/Maven*.xml
-.idea/artifacts/PILL_*.xml
+.idea/artifacts
 .idea/modules
 .idea/runConfigurations/JPS_*.xml
-.idea/runConfigurations/PILL_*.xml
 .idea/libraries
 .idea/modules.xml
 .idea/gradle.xml
 .idea/compiler.xml
 .idea/inspectionProfiles/profiles_settings.xml
 .idea/.name
-.idea/artifacts/dist_auto_*
-.idea/artifacts/dist.xml
-.idea/artifacts/ideaPlugin.xml
-.idea/artifacts/kotlinc.xml
-.idea/artifacts/kotlin_compiler_jar.xml
-.idea/artifacts/kotlin_plugin_jar.xml
-.idea/artifacts/kotlin_jps_plugin_jar.xml
-.idea/artifacts/kotlin_daemon_client_jar.xml
-.idea/artifacts/kotlin_imports_dumper_compiler_plugin_jar.xml
-.idea/artifacts/kotlin_main_kts_jar.xml
-.idea/artifacts/kotlin_compiler_client_embeddable_jar.xml
-.idea/artifacts/kotlin_reflect_jar.xml
-kotlin-ultimate/
-node_modules/
-.rpt2_cache/
-libraries/tools/kotlin-test-nodejs-runner/lib/
-local.properties
--- a/.idea/ant.xml
+++ b/.idea/ant.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AntConfiguration">
+    <buildFile url="file://$PROJECT_DIR$/libraries/build-docs.xml">
+      <maximumHeapSize value="1024" />
+    </buildFile>
+  </component>
+</project>
--- a/.idea/artifacts/dist_root.xml
+++ b/.idea/artifacts/dist_root.xml
@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact build-on-make="true" name="dist_root">
-    <output-path>$PROJECT_DIR$/dist</output-path>
-    <root id="root">
-      <element id="artifact" artifact-name="dist" />
-    </root>
-  </artifact>
-</component>
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="OTHER_INDENT_OPTIONS">
+          <value>
+            <option name="INDENT_SIZE" value="4" />
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+            <option name="TAB_SIZE" value="8" />
+            <option name="USE_TAB_CHARACTER" value="false" />
+            <option name="SMART_TABS" value="false" />
+            <option name="LABEL_INDENT_SIZE" value="0" />
+            <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+            <option name="USE_RELATIVE_INDENTS" value="false" />
+          </value>
+        </option>
+        <option name="LINE_SEPARATOR" value="&#10;" />
+        <option name="PREFER_LONGER_NAMES" value="false" />
+        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+          <value>
+            <package name="java.awt" withSubpackages="false" static="false" />
+            <package name="javax.tools" withSubpackages="true" static="false" />
+            <package name="javax.swing" withSubpackages="false" static="false" />
+          </value>
+        </option>
+        <option name="STATIC_METHODS_ORDER_WEIGHT" value="5" />
+        <option name="METHODS_ORDER_WEIGHT" value="4" />
+        <option name="RIGHT_MARGIN" value="140" />
+        <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+        <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+        <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+        <option name="ELSE_ON_NEW_LINE" value="true" />
+        <option name="WHILE_ON_NEW_LINE" value="true" />
+        <option name="CATCH_ON_NEW_LINE" value="true" />
+        <option name="FINALLY_ON_NEW_LINE" value="true" />
+        <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+        <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+        <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+        <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+        <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+        <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+        <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
+        <option name="SPACE_AFTER_TYPE_CAST" value="false" />
+        <option name="CALL_PARAMETERS_WRAP" value="1" />
+        <option name="METHOD_PARAMETERS_WRAP" value="5" />
+        <option name="EXTENDS_LIST_WRAP" value="1" />
+        <option name="THROWS_LIST_WRAP" value="5" />
+        <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+        <option name="THROWS_KEYWORD_WRAP" value="1" />
+        <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+        <option name="BINARY_OPERATION_WRAP" value="5" />
+        <option name="TERNARY_OPERATION_WRAP" value="5" />
+        <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+        <option name="FOR_STATEMENT_WRAP" value="5" />
+        <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+        <option name="ASSIGNMENT_WRAP" value="1" />
+        <option name="IF_BRACE_FORCE" value="1" />
+        <option name="DOWHILE_BRACE_FORCE" value="1" />
+        <option name="WHILE_BRACE_FORCE" value="1" />
+        <option name="FOR_BRACE_FORCE" value="1" />
+        <option name="FIELD_ANNOTATION_WRAP" value="0" />
+        <MarkdownNavigatorCodeStyleSettings>
+          <option name="RIGHT_MARGIN" value="72" />
+        </MarkdownNavigatorCodeStyleSettings>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+        <codeStyleSettings language="CFML">
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="WHILE_ON_NEW_LINE" value="true" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="BINARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_WRAP" value="5" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="CoffeeScript">
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="ECMA Script Level 4">
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="WHILE_ON_NEW_LINE" value="true" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="FINALLY_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+          <option name="BINARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_WRAP" value="5" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="DOWHILE_BRACE_FORCE" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="1" />
+          <option name="FOR_BRACE_FORCE" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="GSP">
+          <indentOptions>
+            <option name="INDENT_SIZE" value="2" />
+          </indentOptions>
+        </codeStyleSettings>
+        <codeStyleSettings language="Groovy">
+          <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="FINALLY_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+          <option name="SPACE_AFTER_TYPE_CAST" value="false" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="THROWS_LIST_WRAP" value="5" />
+          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+          <option name="THROWS_KEYWORD_WRAP" value="1" />
+          <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+          <option name="BINARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
+          <option name="FOR_STATEMENT_WRAP" value="5" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="1" />
+          <option name="FOR_BRACE_FORCE" value="1" />
+          <option name="FIELD_ANNOTATION_WRAP" value="0" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="HTML">
+          <indentOptions>
+            <option name="INDENT_SIZE" value="2" />
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+            <option name="TAB_SIZE" value="8" />
+          </indentOptions>
+        </codeStyleSettings>
+        <codeStyleSettings language="JAVA">
+          <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+          <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+          <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+          <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="WHILE_ON_NEW_LINE" value="true" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="FINALLY_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+          <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
+          <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+          <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+          <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="THROWS_LIST_WRAP" value="5" />
+          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+          <option name="THROWS_KEYWORD_WRAP" value="1" />
+          <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+          <option name="BINARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_WRAP" value="5" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="DOWHILE_BRACE_FORCE" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="1" />
+          <option name="FOR_BRACE_FORCE" value="1" />
+          <option name="FIELD_ANNOTATION_WRAP" value="0" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+          <indentOptions>
+            <option name="TAB_SIZE" value="8" />
+          </indentOptions>
+        </codeStyleSettings>
+        <codeStyleSettings language="JavaScript">
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="WHILE_ON_NEW_LINE" value="true" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="FINALLY_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="BINARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_WRAP" value="5" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="DOWHILE_BRACE_FORCE" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="1" />
+          <option name="FOR_BRACE_FORCE" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="Scala">
+          <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="WHILE_ON_NEW_LINE" value="true" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="FINALLY_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+          <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+          <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+          <option name="BINARY_OPERATION_WRAP" value="5" />
+          <option name="FOR_STATEMENT_WRAP" value="5" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="DOWHILE_BRACE_FORCE" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="1" />
+          <option name="FOR_BRACE_FORCE" value="1" />
+          <option name="FIELD_ANNOTATION_WRAP" value="0" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="TypeScript">
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="WHILE_ON_NEW_LINE" value="true" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="FINALLY_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+          <option name="BINARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_WRAP" value="5" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="DOWHILE_BRACE_FORCE" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="1" />
+          <option name="FOR_BRACE_FORCE" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="XML">
+          <indentOptions>
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+            <option name="TAB_SIZE" value="8" />
+          </indentOptions>
+        </codeStyleSettings>
+        <codeStyleSettings language="kotlin">
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="WHILE_ON_NEW_LINE" value="true" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="FINALLY_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,7 +1,50 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
+    <option name="OTHER_INDENT_OPTIONS">
+      <value>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="8" />
+      </value>
+    </option>
    <option name="LINE_SEPARATOR" value="&#10;" />
    <option name="RIGHT_MARGIN" value="140" />
+    <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+    <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+    <option name="ELSE_ON_NEW_LINE" value="true" />
+    <option name="WHILE_ON_NEW_LINE" value="true" />
+    <option name="CATCH_ON_NEW_LINE" value="true" />
+    <option name="FINALLY_ON_NEW_LINE" value="true" />
+    <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+    <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+    <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+    <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+    <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+    <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+    <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
+    <option name="SPACE_AFTER_TYPE_CAST" value="false" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_WRAP" value="5" />
+    <option name="EXTENDS_LIST_WRAP" value="1" />
+    <option name="THROWS_LIST_WRAP" value="5" />
+    <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+    <option name="THROWS_KEYWORD_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="BINARY_OPERATION_WRAP" value="5" />
+    <option name="TERNARY_OPERATION_WRAP" value="5" />
+    <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+    <option name="FOR_STATEMENT_WRAP" value="5" />
+    <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+    <option name="ASSIGNMENT_WRAP" value="1" />
+    <option name="IF_BRACE_FORCE" value="1" />
+    <option name="DOWHILE_BRACE_FORCE" value="1" />
+    <option name="WHILE_BRACE_FORCE" value="1" />
+    <option name="FOR_BRACE_FORCE" value="1" />
+    <option name="FIELD_ANNOTATION_WRAP" value="0" />
+    <GroovyCodeStyleSettings>
+      <option name="STATIC_METHODS_ORDER_WEIGHT" value="5" />
+      <option name="METHODS_ORDER_WEIGHT" value="4" />
+    </GroovyCodeStyleSettings>
    <JavaCodeStyleSettings>
      <option name="PREFER_LONGER_NAMES" value="false" />
      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
@@ -18,10 +61,90 @@
    <MarkdownNavigatorCodeStyleSettings>
      <option name="RIGHT_MARGIN" value="72" />
    </MarkdownNavigatorCodeStyleSettings>
+    <XML>
+      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+    </XML>
+    <codeStyleSettings language="CFML">
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="WHILE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="BINARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="5" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+    </codeStyleSettings>
+    <codeStyleSettings language="CoffeeScript">
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+    </codeStyleSettings>
+    <codeStyleSettings language="ECMA Script Level 4">
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="WHILE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="5" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="IF_BRACE_FORCE" value="1" />
+      <option name="DOWHILE_BRACE_FORCE" value="1" />
+      <option name="WHILE_BRACE_FORCE" value="1" />
+      <option name="FOR_BRACE_FORCE" value="1" />
+    </codeStyleSettings>
+    <codeStyleSettings language="GSP">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Groovy">
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <option name="SPACE_AFTER_TYPE_CAST" value="false" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="THROWS_LIST_WRAP" value="5" />
+      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="THROWS_KEYWORD_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_WRAP" value="5" />
+      <option name="FOR_STATEMENT_WRAP" value="5" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="IF_BRACE_FORCE" value="1" />
+      <option name="WHILE_BRACE_FORCE" value="1" />
+      <option name="FOR_BRACE_FORCE" value="1" />
+      <option name="FIELD_ANNOTATION_WRAP" value="0" />
+    </codeStyleSettings>
    <codeStyleSettings language="HTML">
      <indentOptions>
        <option name="INDENT_SIZE" value="2" />
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="8" />
      </indentOptions>
    </codeStyleSettings>
    <codeStyleSettings language="JAVA">
@@ -62,6 +185,9 @@
      <option name="WHILE_BRACE_FORCE" value="1" />
      <option name="FOR_BRACE_FORCE" value="1" />
      <option name="FIELD_ANNOTATION_WRAP" value="0" />
+      <indentOptions>
+        <option name="TAB_SIZE" value="8" />
+      </indentOptions>
    </codeStyleSettings>
    <codeStyleSettings language="JavaScript">
      <option name="ELSE_ON_NEW_LINE" value="true" />
@@ -88,12 +214,59 @@
      <indentOptions>
        <option name="INDENT_SIZE" value="2" />
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
      </indentOptions>
    </codeStyleSettings>
+    <codeStyleSettings language="Scala">
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="WHILE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="5" />
+      <option name="FOR_STATEMENT_WRAP" value="5" />
+      <option name="IF_BRACE_FORCE" value="1" />
+      <option name="DOWHILE_BRACE_FORCE" value="1" />
+      <option name="WHILE_BRACE_FORCE" value="1" />
+      <option name="FOR_BRACE_FORCE" value="1" />
+      <option name="FIELD_ANNOTATION_WRAP" value="0" />
+    </codeStyleSettings>
+    <codeStyleSettings language="TypeScript">
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="WHILE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="5" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="IF_BRACE_FORCE" value="1" />
+      <option name="DOWHILE_BRACE_FORCE" value="1" />
+      <option name="WHILE_BRACE_FORCE" value="1" />
+      <option name="FOR_BRACE_FORCE" value="1" />
+    </codeStyleSettings>
    <codeStyleSettings language="XML">
      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="8" />
      </indentOptions>
    </codeStyleSettings>
    <codeStyleSettings language="kotlin">
--- a/.idea/copyright/apache.xml
+++ b/.idea/copyright/apache.xml
@@ -1,7 +1,7 @@
 <component name="CopyrightManager">
  <copyright>
    <option name="allowReplaceRegexp" value="JetBrains" />
-    <option name="notice" value="Copyright 2010-&amp;#36;today.year JetBrains s.r.o. and Kotlin Programming Language contributors.&#10;Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file." />
+    <option name="notice" value="Copyright 2010-&amp;#36;today.year JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license &#10;that can be found in the license/LICENSE.txt file." />
    <option name="myName" value="apache" />
  </copyright>
 </component>
--- a/.idea/dictionaries/4u7.xml
+++ b/.idea/dictionaries/4u7.xml
@@ -3,12 +3,6 @@
    <words>
      <w>cidr</w>
      <w>foldable</w>
-      <w>instrumentator</w>
-      <w>jdks</w>
-      <w>protobuf</w>
-      <w>redirector</w>
-      <w>remapper</w>
-      <w>unpresent</w>
    </words>
  </dictionary>
 </component>
--- a/.idea/dictionaries/Nikolay_Krasko.xml
+++ b/.idea/dictionaries/Nikolay_Krasko.xml
@@ -7,10 +7,9 @@
      <w>fqname</w>
      <w>goto</w>
      <w>gradle</w>
-      <w>infos</w>
      <w>intrinsics</w>
      <w>kdoc</w>
-      <w>lateinit</w>
+      <w>kompiler</w>
      <w>memoize</w>
      <w>memoized</w>
      <w>multiline</w>
@@ -19,15 +18,11 @@
      <w>preloader</w>
      <w>preloading</w>
      <w>preprocess</w>
-      <w>proximities</w>
      <w>redeclarations</w>
-      <w>reparsed</w>
      <w>smap</w>
      <w>subclassed</w>
      <w>subgraph</w>
      <w>substep</w>
-      <w>tailrec</w>
-      <w>typealias</w>
    </words>
  </dictionary>
 </component>
--- a/.idea/dictionaries/dmitriy_dolovov.xml
+++ b/.idea/dictionaries/dmitriy_dolovov.xml
@@ -1,7 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="dmitriy.dolovov">
-    <words>
-      <w>konan</w>
-    </words>
-  </dictionary>
-</component>
--- a/.idea/dictionaries/dzharkov.xml
+++ b/.idea/dictionaries/dzharkov.xml
@@ -7,7 +7,6 @@
      <w>experimentality</w>
      <w>insn</w>
      <w>liveness</w>
-      <w>parameterless</w>
    </words>
  </dictionary>
-</component>
+</component>
--- a/.idea/dictionaries/yan.xml
+++ b/.idea/dictionaries/yan.xml
@@ -1,18 +1,12 @@
 <component name="ProjectDictionaryState">
  <dictionary name="yan">
    <words>
-      <w>debuggee</w>
      <w>deserializes</w>
-      <w>destructured</w>
-      <w>hacky</w>
      <w>impls</w>
      <w>kapt</w>
      <w>parceler</w>
      <w>repl</w>
      <w>uast</w>
-      <w>unbox</w>
-      <w>unboxed</w>
-      <w>unmute</w>
    </words>
  </dictionary>
 </component>
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
    <file url="file://$PROJECT_DIR$/libraries" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/examples/browser-example" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/examples/browser-example-with-library" charset="UTF-8" />
@@ -14,7 +14,6 @@
    <file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-plugin" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-plugin-test" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-sam-with-receiver" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/libraries/tools/kotlin-maven-serialization" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/tools/kotlin-osgi-bundle" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/tools/maven-archetypes" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/libraries/tools/maven-archetypes/kotlin-archetype-js" charset="UTF-8" />
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -21,6 +21,7 @@
    </inspection_tool>
    <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="BusyWait" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="CStyleArrayDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="CastConflictsWithInstanceof" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="CastToIncompatibleInterface" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="ChainedEquality" enabled="false" level="WARNING" enabled_by_default="true" />
@@ -54,6 +55,9 @@
    <inspection_tool class="DoubleCheckedLocking" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="ignoreOnVolatileVariables" value="true" />
    </inspection_tool>
+    <inspection_tool class="DuplicateCondition" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoreSideEffectConditions" value="true" />
+    </inspection_tool>
    <inspection_tool class="EmptyStatementBody" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="m_reportEmptyBlocks" value="false" />
    </inspection_tool>
@@ -75,7 +79,6 @@
      <option name="m_ignoreLoopsWithoutConditions" value="false" />
    </inspection_tool>
    <inspection_tool class="ForLoopThatDoesntUseLoopVariable" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="GrPackage" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="myValues">
        <value>
@@ -98,22 +101,21 @@
    <inspection_tool class="IncompatibleAPI" enabled="true" level="ERROR" enabled_by_default="true">
      <option name="problems">
        <list>
-          <Problem reference="com.intellij.util.JdomKt#element" reason="Removed in 191" />
-          <Problem reference="com.intellij.util.AstLoadingFilter" reason="Absent in 181. Almost all methods were renamed in 183. Use org.jetbrains.kotlin.util.AstLoadingFilter instead." />
-          <Problem reference="com.intellij.codeInspection.reference.RefFile#getPsiElement" reason="Absent in 182. Use psiFile extension instead." />
-          <Problem reference="com.intellij.execution.JavaRunConfigurationExtensionManager#getInstance" reason="Can't be used in Kotlin, because method was replaced with property after J2K in 183. Use JavaRunConfigurationExtensionManagerUtil instead." />
+          <Problem reference="org.jetbrains.plugins.gradle.util.GradleConstants#KOTLIN_DSL_SCRIPT_EXTENSION" reason="Absent in 172. Please inline." />
+          <Problem reference="com.intellij.psi.impl.compiled.ClsClassImpl#getQualifiedName" reason="Nullable in 173, platform in 172. Use qualifiedNameEx instead." />
+          <Problem reference="com.intellij.internal.statistic.utils.StatisticsUtilKt#getEnumUsage" reason="Absent in 172. Use org.jetbrains.kotlin.idea.util.compat.statistic.StatisticKt.getEnumUsage instead." />
+          <Problem reference="com.intellij.internal.statistic.utils.StatisticsUtilKt#getBooleanUsage" reason="Absent in 172 Use org.jetbrains.kotlin.idea.util.compat.statistic.StatisticKt.getBooleanUsage instead." />
+          <Problem reference="com.intellij.internal.statistic.AbstractProjectsUsagesCollector" reason="Absent in 172. Use org.jetbrains.kotlin.idea.util.compat.statistic.AbstractProjectsUsagesCollector instead." />
+          <Problem reference="com.intellij.openapi.progress.ProgressManager#getProgressIndicator" reason="Not null starting from 181. Use getProgressIndicatorNullable instead." />
+          <Problem reference="com.intellij.testFramework.PlatformTestCase#createModuleAt" reason="Not static anymore in 181 after 7dacf096c47d2125e17031c71a037b63ab00ec53" />
+          <Problem reference="com.intellij.testFramework.PlatformTestCase#doCreateRealModuleIn" reason="Not static anymore in 181 after 7dacf096c47d2125e17031c71a037b63ab00ec53" />
+          <Problem reference="com.intellij.openapi.progress.ProgressManager#getProgressIndicator" reason="Nullable in 181. Temporary use progressIndicatorNullable instead." />
+          <Problem reference="com.intellij.testFramework.fixtures.CodeInsightTestFixture#getProjectDisposable" reason="Method was introduced in 173 and absent in 172. Use getProjectDisposableEx instead. (95eaf81e0ea497f8c69263c11fd3202d28a7a1b2)" />
+          <Problem reference="org.jetbrains.org.objectweb.asm.Opcodes#V9" reason="Absent in 172 branch. Use V1_9 while 172 is supported." />
+          <Problem reference="com.intellij.psi.codeStyle.CommonCodeStyleSettings#getSoftMargins" reason="Absent in 172." />
+          <Problem reference="com.intellij.util.xmlb.XmlSerializer#serializeInto(java.lang.Object, org.jdom.Element)" reason="Absent in 172." />
          <Problem reference="org.jetbrains.java.decompiler.main.decompiler.BaseDecompiler#addSpace" reason="Method was replaced with outher methods in 182. Use addSpaceEx instead." />
-          <Problem reference="com.intellij.execution.configurations.RunConfigurationBase" reason="Generalized in 183. Use RunConfigurationBaseAny instead in signatures." />
-          <Problem reference="com.intellij.execution.configurations.LocatableConfigurationBase" reason="Generalized in 183. Use LocatableConfigurationBaseAny instead in signatures." />
-          <Problem reference="com.intellij.execution.configurations.ModuleBasedConfiguration" reason="Generalized in 183. Use ModuleBasedConfigurationElement instead." />
-          <Problem reference="com.intellij.psi.codeStyle.CodeStyleSettingsProvider" reason="Additional method is introduced in 183 instead of deprecated one. Use CodeStyleSettingsProviderCompat instead." />
-          <Problem reference="com.intellij.openapi.ui.popup.PopupChooserBuilder#PopupChooserBuilder(javax.swing.JList)" reason="Generified in 182. Use PopupChooserBuilderWrapper instead." />
-          <Problem reference="com.intellij.openapi.editor.event.EditorFactoryListener" reason="Default implementations were added in 183. Use EditorFactoryListenerWrapper for inheritance instead." />
-          <Problem reference="com.intellij.openapi.diagnostic.LoggerKt#debugOrInfoIfTestMode" reason="Absent in 182." />
-          <Problem reference="com.intellij.psi.search.PsiSearchHelper.SERVICE" reason="Deprecated since 182. Use psiSearchHelperInstance() instead." />
-          <Problem reference="org.jetbrains.kotlin.idea.reporter.ITNReporterCompat#submit" reason="parentComponent is nullable in AS" />
-          <Problem reference="com.intellij.diagnostic.ITNReporter#submit" reason="parentComponent is nullable in AS" />
-          <Problem reference="com.intellij.codeInspection.dataFlow.Nullness" reason="Deprecated since 182. Use org.jetbrains.kotlin.idea.util.compat.Nullability instead." />
+          <Problem reference="com.intellij.psi.util.PsiUtil#canBeOverridden" reason="Absent in 172. Use org.jetbrains.kotlin.idea.core.util.compat.psi.canBeOverridden() instead." />
        </list>
      </option>
    </inspection_tool>
@@ -266,10 +268,6 @@
      <option name="ignoreObjectMethods" value="true" />
      <option name="ignoreAnonymousClassMethods" value="false" />
    </inspection_tool>
-    <inspection_tool class="MissingRecentApi" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="sinceBuildString" value="182.0" />
-      <option name="untilBuildString" value="192.SNAPSHOT" />
-    </inspection_tool>
    <inspection_tool class="MisspelledCompareTo" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="MisspelledEquals" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="MisspelledHashcode" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -298,8 +296,15 @@
    <inspection_tool class="PackageDirectoryMismatch" enabled="true" level="WARNING" enabled_by_default="false">
      <scope name="all except testData" level="WARNING" enabled="true" />
    </inspection_tool>
-    <inspection_tool class="PackageName" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="namePattern" value="[a-z_][a-z\d_]*(\.[a-z_][a-zA-Z\d_]*)*" />
+    <inspection_tool class="ProblematicAPIUsage" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="problems">
+        <list>
+          <Problem reference="com.intellij.testFramework.PlatformTestCase#createModuleAt" reason="Not static anymore in 181 after 7dacf096c47d2125e17031c71a037b63ab00ec53" />
+          <Problem reference="com.intellij.testFramework.PlatformTestCase#doCreateRealModuleIn" reason="Not static anymore in 181 after 7dacf096c47d2125e17031c71a037b63ab00ec53" />
+          <Problem reference="com.intellij.openapi.progress.ProgressManager#getProgressIndicator" reason="Nullable in 181. Temporary use progressIndicatorNullable instead." />
+          <Problem reference="com.intellij.testFramework.fixtures.CodeInsightTestFixture#getProjectDisposable" reason="Method was introduced in 173 and absent in 172. Use getProjectDisposableEx instead. (95eaf81e0ea497f8c69263c11fd3202d28a7a1b2)" />
+        </list>
+      </option>
    </inspection_tool>
    <inspection_tool class="ProtectedMemberInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="PublicFieldAccessedInSynchronizedContext" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -307,20 +312,23 @@
      <option name="fromVersion" value="2.4" />
      <option name="toVersion" value="3.1" />
    </inspection_tool>
-    <inspection_tool class="Reformat" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="processChangedFilesOnly" value="true" />
-    </inspection_tool>
+    <inspection_tool class="Reformat" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
    <inspection_tool class="ReplaceAssignmentWithOperatorAssignment" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="ignoreLazyOperators" value="true" />
      <option name="ignoreObscureOperators" value="true" />
    </inspection_tool>
    <inspection_tool class="SSBasedInspection" enabled="true" level="WARNING" enabled_by_default="true">
      <searchConfiguration name="SwingUtilities.invokeLater" text="SwingUtilities.invokeLater($runnable$)" recursive="false" caseInsensitive="false" type="JAVA">
+        <constraint name="Instance" regexp="SwingUtilities" minCount="0" target="true" within="" contains="" />
+        <constraint name="MethodCall" within="" contains="" />
+        <constraint name="Parameter" minCount="0" maxCount="2147483647" within="" contains="" />
        <constraint name="__context__" within="" contains="" />
        <constraint name="runnable" within="" contains="" />
      </searchConfiguration>
      <replaceConfiguration name="DirectCallOfDispose" text="$Instance$.dispose()" recursive="false" caseInsensitive="false" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="Disposer.dispose($Instance$)">
        <constraint name="Instance" regexp="super" nameOfExprType="Disposable" withinHierarchy="true" exprTypeWithinHierarchy="true" minCount="0" negateName="true" within="" contains="" />
+        <constraint name="MethodCall" target="true" within="" contains="" />
+        <constraint name="Parameter" minCount="0" maxCount="2147483647" within="" contains="" />
        <constraint name="__context__" within="" contains="" />
      </replaceConfiguration>
      <replaceConfiguration name="new Object[0]" text="new Object[0]" recursive="false" caseInsensitive="true" type="JAVA" reformatAccordingToStyle="true" shortenFQN="true" replacement="com.intellij.util.ArrayUtil.EMPTY_OBJECT_ARRAY" />
@@ -384,7 +392,6 @@
    </inspection_tool>
    <inspection_tool class="StringEquality" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="StringEqualsEmptyString" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="StringOperationCanBeSimplifiedMerged" />
    <inspection_tool class="SwitchStatementWithConfusingDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="SynchronizeOnThis" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="SystemOutErr" enabled="true" level="WARNING" enabled_by_default="true">
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
  <settings>
    <option name="PROJECT_PROFILE" value="idea.default" />
+    <option name="USE_PROJECT_PROFILE" value="true" />
    <version value="1.0" />
  </settings>
 </component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,10 +6,8 @@
    </properties>
  </component>
  <component name="EntryPointsManager">
-    <list size="3">
+    <list size="1">
      <item index="0" class="java.lang.String" itemvalue="javax.inject.Inject" />
-      <item index="1" class="java.lang.String" itemvalue="org.gradle.api.tasks.TaskAction" />
-      <item index="2" class="java.lang.String" itemvalue="org.gradle.api.tasks.options.Option" />
    </list>
  </component>
  <component name="FacetAutodetectingManager">
@@ -47,8 +45,6 @@
    </option>
  </component>
  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
-    <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
    <option name="myNullables">
      <value>
        <list size="9">
@@ -86,9 +82,6 @@
  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
-  <component name="PsiViewerSettings">
-    <option name="splitDividerLocation" value="35" />
-  </component>
  <component name="SuppressABINotification">
    <option name="modulesWithSuppressedNotConfigured">
      <set>
@@ -105,7 +98,4 @@
    <option name="autoscroll" value="false" />
    <option name="showOnlyWarnings" value="false" />
  </component>
-  <component name="intellij-api-watcher-check-current-project">
-    <option name="shouldCheckCurrentProject" value="true" />
-  </component>
 </project>
--- a/.idea/projectCodeStyle.xml
+++ b/.idea/projectCodeStyle.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="LINE_SEPARATOR" value="&#10;" />
+        <option name="ELSE_ON_NEW_LINE" value="true" />
+        <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+        <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+        <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+        <option name="TERNARY_OPERATION_WRAP" value="5" />
+        <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+        <option name="IF_BRACE_FORCE" value="1" />
+        <ADDITIONAL_INDENT_OPTIONS fileType="css">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="haml">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="js">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="jsp">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="php">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="py">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="sass">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="scala">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="2" />
+          <option name="TAB_SIZE" value="2" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="sql">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="xml">
+          <option name="INDENT_SIZE" value="4" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <ADDITIONAL_INDENT_OPTIONS fileType="yml">
+          <option name="INDENT_SIZE" value="2" />
+          <option name="CONTINUATION_INDENT_SIZE" value="8" />
+          <option name="TAB_SIZE" value="4" />
+          <option name="USE_TAB_CHARACTER" value="false" />
+          <option name="SMART_TABS" value="false" />
+          <option name="LABEL_INDENT_SIZE" value="0" />
+          <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+          <option name="USE_RELATIVE_INDENTS" value="false" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <codeStyleSettings language="JAVA">
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+          <indentOptions />
+        </codeStyleSettings>
+        <codeStyleSettings language="JavaScript">
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+        <codeStyleSettings language="PHP">
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
+
--- a/.idea/runConfigurations/IDEA.xml
+++ b/.idea/runConfigurations/IDEA.xml
@@ -15,6 +15,6 @@
      </option>
      <option name="vmOptions" value="" />
    </ExternalSystemSettings>
-    <method />
+    <method v="2" />
  </configuration>
 </component>
--- a/.idea/runConfigurations/IDEA__Not_Internal_.xml
+++ b/.idea/runConfigurations/IDEA__Not_Internal_.xml
@@ -1,19 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA (Not Internal)" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="-Pidea.is.internal=false" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="runIde" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-  </configuration>
-</component>
--- a/.idea/runConfigurations/run_IR_test_in_node_js.xml
+++ b/.idea/runConfigurations/run_IR_test_in_node_js.xml
@@ -1,13 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="run IR test in node.js" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/js/js.translator/testData/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="runIrTestInNode" />
-    </scripts>
-    <arguments value="$FilePath$" />
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>
--- a/.idea/upsource.xml
+++ b/.idea/upsource.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="UpsourceSharedProjectSettings">
-    <option name="upsourceUrl" value="https://upsource.jetbrains.com/" />
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -25,4 +25,5 @@
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
  </component>
-</project>
+</project>
+
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,4 +0,0 @@
-## Code of Conduct
-
-This project and the corresponding community is governed by the [JetBrains Open Source and Community Code of Conduct](https://confluence.jetbrains.com/display/ALL/JetBrains+Open+Source+and+Community+Code+of+Conduct). Please make sure you read it. 
-
--- a/ChangeLog.md
+++ b/ChangeLog.md
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,7 +1,8 @@
-[![official project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
+[![official project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
+<a href="http://slack.kotlinlang.org/"><img src="http://slack.kotlinlang.org/badge.svg" height="20"></a>
 [![TeamCity (simple build status)](https://img.shields.io/teamcity/http/teamcity.jetbrains.com/s/Kotlin_dev_Compiler.svg)](https://teamcity.jetbrains.com/viewType.html?buildTypeId=Kotlin_dev_Compiler&branch_Kotlin_dev=%3Cdefault%3E&tab=buildTypeStatusDiv)
-[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlin/kotlin-maven-plugin.svg)](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.jetbrains.kotlin%22)
-[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
+[![Maven Central](https://img.shields.io/maven-central/v/org.jetbrains.kotlin/kotlin-maven-plugin.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.jetbrains.kotlin%22)
+[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)

 # Kotlin Programming Language

@@ -9,13 +10,13 @@ Welcome to [Kotlin](https://kotlinlang.org/)! Some handy links:

 * [Kotlin Site](https://kotlinlang.org/)
 * [Getting Started Guide](https://kotlinlang.org/docs/tutorials/getting-started.html)
- * [Try Kotlin](https://play.kotlinlang.org/)
+ * [Try Kotlin](https://try.kotlinlang.org/)
 * [Kotlin Standard Library](https://kotlinlang.org/api/latest/jvm/stdlib/index.html)
 * [Issue Tracker](https://youtrack.jetbrains.com/issues/KT)
 * [Forum](https://discuss.kotlinlang.org/)
 * [Kotlin Blog](https://blog.jetbrains.com/kotlin/)
 * [Follow Kotlin on Twitter](https://twitter.com/kotlin)
- * [Public Slack channel](https://slack.kotlinlang.org/)
+ * [Public Slack channel](http://slack.kotlinlang.org/)
 * [TeamCity CI build](https://teamcity.jetbrains.com/project.html?tab=projectOverview&projectId=Kotlin)

 ## Editing Kotlin
@@ -41,11 +42,7 @@ For local development, if you're not working on bytecode generation or the stand

 You also can use [Gradle properties](https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_properties_and_system_properties) to setup JDK_* variables.

-> Note: The JDK 6 for MacOS is not available on Oracle's site. You can [download it here](https://support.apple.com/kb/DL1572).
-
-On Windows you might need to add long paths setting to the repo:
-
-    git config core.longpaths true 
+> Note: The JDK 6 for MacOS is not available on Oracle's site. You can [download it here](https://support.apple.com/kb/DL1572). 

 ## Building

@@ -87,7 +84,7 @@ Refer to [libraries/ReadMe.md](libraries/ReadMe.md) for details.

 ### Building for different versions of IntelliJ IDEA and Android Studio

-Kotlin plugin is intended to work with several recent versions of IntelliJ IDEA and Android Studio. Each platform is allowed to have a different set of features and might provide a slightly different API. Instead of using several parallel Git branches, project stores everything in a single branch, but files may have counterparts with version extensions (\*.as32, \*.172, \*.181). The primary file is expected to be replaced with its counterpart when targeting non-default platform.
+Kotlin plugin is indented to work with several recent versions of IntelliJ IDEA and Android Studio. Each platform is allowed to have a different set of features and might provide a slightly different API. Instead of using several parallel Git branches, project stores everything in a single branch, but files may have counterparts with version extensions (\*.as32, \*.172, \*.181). The primary file is expected to be replaced with its counterpart when targeting non-default platform.

 More detailed description of this scheme can be found at https://github.com/JetBrains/bunches/blob/master/ReadMe.md.

@@ -104,14 +101,14 @@ bunch switch . 182

 ## <a name="working-in-idea"></a> Working with the project in IntelliJ IDEA

-Working with the Kotlin project requires at least IntelliJ IDEA 2017.3. You can download IntelliJ IDEA 2017.3 [here](https://www.jetbrains.com/idea/download).
+Working with the Kotlin project requires IntelliJ IDEA 2017.3. You can download IntelliJ IDEA 2017.3 [here](https://www.jetbrains.com/idea/download).

-After cloning the project, to import the project in Intellij choose the project directory in the Open project dialog. Then, after project opened, Select 
+To import the project in Intellij choose project directory in Open project dialog. Then, after project opened, Select 
 `File` -> `New...` -> `Module from Existing Sources` in the menu, and select `build.gradle.kts` file in the project's root folder.

 In the import dialog, select `use default gradle wrapper`.

-To be able to run tests from IntelliJ easily, check `Delegate IDE build/run actions to Gradle` and choose `Gradle Test Runner` in the Gradle runner settings after importing the project.
+To be able to run tests from IntelliJ easily, check `Delegate IDE build/run actions to Gradle` and choose `Gradle Test Runner` in the Gradle runner settings.

 At this time, you can use the latest released 1.2.x version of the Kotlin plugin for working with the code. To make sure you have the latest version installed, use Tools | Kotlin | Configure Kotlin Plugin Updates and press "Check for updates now".

@@ -135,9 +132,38 @@ includeBuild('/path/to/kotlin') {
 }
 ```

-# License
-Kotlin is distributed under the terms of the Apache License (Version 2.0). See [license folder](license/README.md) for details.
-
 # Contributing

-Please be sure to review Kotlin's [contributing guidelines](docs/contributing.md) to learn how to help the project.
+We love contributions! There's [lots to do on Kotlin](https://youtrack.jetbrains.com/issues/KT) and on the
+[standard library](https://youtrack.jetbrains.com/issues/KT?q=%23Kotlin%20%23Unresolved%20and%20(links:%20KT-2554,%20KT-4089%20or%20%23Libraries)) so why not chat with us
+about what you're interested in doing? Please join the #kontributors channel in [our Slack chat](http://slack.kotlinlang.org/)
+and let us know about your plans.
+
+If you want to find some issues to start off with, try [this query](https://youtrack.jetbrains.com/issues/KT?q=tag:%20%7BUp%20For%20Grabs%7D%20%23Unresolved) which should find all Kotlin issues that marked as "up-for-grabs".
+
+Currently only committers can assign issues to themselves so just add a comment if you're starting work on it.
+
+A nice gentle way to contribute would be to review the [standard library docs](https://kotlinlang.org/api/latest/jvm/stdlib/index.html)
+and find classes or functions which are not documented very well and submit a patch.
+
+In particular it'd be great if all functions included a nice example of how to use it such as for the
+[`hashMapOf()`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin.collections/hash-map-of.html) function.
+This is implemented using the [`@sample`](https://github.com/JetBrains/kotlin/blob/1.1.0/libraries/stdlib/src/kotlin/collections/Maps.kt#L91)
+macro to include code from a test function. The benefits of this approach are twofold; First, the API's documentation is improved via beneficial examples that help new users and second, the code coverage is increased.
+
+Also the [JavaScript translation](https://github.com/JetBrains/kotlin/blob/master/js/ReadMe.md) could really use your help. See the [JavaScript contribution section](https://github.com/JetBrains/kotlin/blob/master/js/ReadMe.md) for more details.
+
+Some of the code in the standard library is created by generating code from templates. See the [README](libraries/stdlib/ReadMe.md) in the stdlib section for how to run the code generator. The existing templates can be used as examples for creating new ones.
+
+## Submitting patches
+
+The best way to submit a patch is to [fork the project on github](https://help.github.com/articles/fork-a-repo/) then send us a
+[pull request](https://help.github.com/articles/creating-a-pull-request/) via [github](https://github.com).
+
+If you create your own fork, it might help to enable rebase by default
+when you pull by executing
+``` bash
+git config --global pull.rebase true
+```
+This will avoid your local repo having too many merge commits
+which will help keep your pull request simple and easy to apply.
--- a/ant/build.gradle.kts
+++ b/ant/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 dependencies {
    compile(commonDep("org.apache.ant", "ant"))
    compile(project(":kotlin-preloader"))
-    compile(kotlinStdlib())
+    compile(projectDist(":kotlin-stdlib"))
 }

 sourceSets {
@@ -17,5 +17,9 @@ sourceSets {
 }

 runtimeJar {
-    manifest.attributes["Class-Path"] = "$compilerManifestClassPath kotlin-preloader.jar"
+    from("$projectDir/src") { include("**/*.xml") }
+    manifest.attributes.put("Class-Path", "kotlin-stdlib.jar kotlin-reflect.jar kotlin-script-runtime.jar kotlin-preloader.jar")
 }
+
+dist()
+
--- a/ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt
+++ b/ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt
@@ -38,7 +38,7 @@ internal object KotlinAntTaskUtil {
    }

    val compilerJar: File by jar("kotlin-compiler.jar")
-    val runtimeJar: File by jar("kotlin-stdlib.jar")
+    val runtimeJar: File by jar("kotlin-runtime.jar")
    val reflectJar: File by jar("kotlin-reflect.jar")

    private fun jar(name: String) = lazy {
--- a/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.kt
+++ b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.kt
@@ -129,7 +129,7 @@ class KotlinCompilerAdapter : Javac13() {
    }

    companion object {
-        private val KOTLIN_EXTENSIONS = listOf("kt", "kts")
+        private val KOTLIN_EXTENSIONS = Arrays.asList("kt", "kts")

        private fun filterOutKotlinSources(files: Array<File>): Array<File> {
            return files.filterNot {
--- a/ant/resources/org/jetbrains/kotlin/ant/antlib.xml
+++ b/ant/resources/org/jetbrains/kotlin/ant/antlib.xml
--- a/build-common/build.gradle.kts
+++ b/build-common/build.gradle.kts
@@ -14,17 +14,17 @@ dependencies {
    compileOnly(project(":js:js.serializer"))
    compileOnly(project(":js:js.frontend"))
    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
-    compileOnly(intellijDep()) { includeJars("asm-all", "trove4j", "util", rootProject = rootProject) }
+    compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "util") }
    compileOnly(project(":kotlin-reflect-api"))

    testCompileOnly(project(":compiler:cli-common"))
    testCompile(projectTests(":compiler:tests-common"))
    testCompile(commonDep("junit:junit"))
    testCompile(protobufFull())
-    testCompile(kotlinStdlib())
+    testCompile(projectDist(":kotlin-stdlib"))
    testCompileOnly(intellijDep()) { includeJars("openapi") }

-    testRuntime(project(":kotlin-reflect"))
+    testRuntime(projectDist(":kotlin-reflect"))
 }

 sourceSets {
@@ -32,12 +32,12 @@ sourceSets {
    "test" { projectDefault() }
 }

-publish()
-
 runtimeJar()
 sourcesJar()
 javadocJar()

 testsJar()

-projectTest(parallel = true)
+projectTest()
+
+publish()
--- a/build-common/src/com/intellij/util/io/JpsPersistentHashMap.java.192
+++ b/build-common/src/com/intellij/util/io/JpsPersistentHashMap.java.192
--- a/build-common/src/org/jetbrains/kotlin/build/BuildMetaInfo.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/BuildMetaInfo.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
 */

 package org.jetbrains.kotlin.build
@@ -9,7 +9,6 @@ import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.config.isPreRelease
-import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
 import kotlin.reflect.KClass

 interface BuildMetaInfo {
@@ -41,8 +40,7 @@ abstract class BuildMetaInfoFactory<T : BuildMetaInfo>(private val metaInfoClass
        multiplatformEnable: Boolean,
        ownVersion: Int,
        coroutinesVersion: Int,
-        multiplatformVersion: Int,
-        metadataVersionArray: IntArray?
+        multiplatformVersion: Int
    ): T

    fun create(args: CommonCompilerArguments): T {
@@ -59,14 +57,10 @@ abstract class BuildMetaInfoFactory<T : BuildMetaInfo>(private val metaInfoClass
            multiplatformEnable = args.multiPlatform,
            ownVersion = OWN_VERSION,
            coroutinesVersion = COROUTINES_VERSION,
-            multiplatformVersion = MULTIPLATFORM_VERSION,
-            metadataVersionArray = args.metadataVersion?.let((BinaryVersion)::parseVersionArray)
+            multiplatformVersion = MULTIPLATFORM_VERSION
        )
    }

-    fun serializeToString(args: CommonCompilerArguments): String =
-        serializeToString(create(args))
-
    fun serializeToString(info: T): String =
        serializeToPlainText(info, metaInfoClass)

@@ -78,4 +72,4 @@ abstract class BuildMetaInfoFactory<T : BuildMetaInfo>(private val metaInfoClass
        const val COROUTINES_VERSION: Int = 0
        const val MULTIPLATFORM_VERSION: Int = 0
    }
-}
+}
--- a/build-common/src/org/jetbrains/kotlin/build/CommonBuildMetaInfo.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/CommonBuildMetaInfo.kt
@@ -1,11 +1,12 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
 */

 package org.jetbrains.kotlin.build

 import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
+import org.jetbrains.kotlin.utils.JsMetadataVersion

 /**
 * If you want to add a new field, check its type is supported by [serializeToPlainText], [deserializeFromPlainText]
@@ -38,26 +39,22 @@ data class CommonBuildMetaInfo(
            multiplatformEnable: Boolean,
            ownVersion: Int,
            coroutinesVersion: Int,
-            multiplatformVersion: Int,
-            metadataVersionArray: IntArray?
-        ): CommonBuildMetaInfo {
-            val metadataVersion = metadataVersionArray?.let(::JvmMetadataVersion) ?: JvmMetadataVersion.INSTANCE
-            return CommonBuildMetaInfo(
-                isEAP = isEAP,
-                compilerBuildVersion = compilerBuildVersion,
-                languageVersionString = languageVersionString,
-                apiVersionString = apiVersionString,
-                coroutinesEnable = coroutinesEnable,
-                coroutinesWarn = coroutinesWarn,
-                coroutinesError = coroutinesError,
-                multiplatformEnable = multiplatformEnable,
-                metadataVersionMajor = metadataVersion.major,
-                metadataVersionMinor = metadataVersion.minor,
-                metadataVersionPatch = metadataVersion.patch,
-                ownVersion = ownVersion,
-                coroutinesVersion = coroutinesVersion,
-                multiplatformVersion = multiplatformVersion
-            )
-        }
+            multiplatformVersion: Int
+        ) = CommonBuildMetaInfo(
+            isEAP = isEAP,
+            compilerBuildVersion = compilerBuildVersion,
+            languageVersionString = languageVersionString,
+            apiVersionString = apiVersionString,
+            coroutinesEnable = coroutinesEnable,
+            coroutinesWarn = coroutinesWarn,
+            coroutinesError = coroutinesError,
+            multiplatformEnable = multiplatformEnable,
+            metadataVersionMajor = JvmMetadataVersion.INSTANCE.major,
+            metadataVersionMinor = JvmMetadataVersion.INSTANCE.minor,
+            metadataVersionPatch = JvmMetadataVersion.INSTANCE.patch,
+            ownVersion = ownVersion,
+            coroutinesVersion = coroutinesVersion,
+            multiplatformVersion = multiplatformVersion
+        )
    }
-}
+}
--- a/build-common/src/org/jetbrains/kotlin/build/JsBuildMetaInfo.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/JsBuildMetaInfo.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
 */

 package org.jetbrains.kotlin.build
@@ -38,26 +38,22 @@ data class JsBuildMetaInfo(
            multiplatformEnable: Boolean,
            ownVersion: Int,
            coroutinesVersion: Int,
-            multiplatformVersion: Int,
-            metadataVersionArray: IntArray?
-        ): JsBuildMetaInfo {
-            val metadataVersion = metadataVersionArray?.let(::JsMetadataVersion) ?: JsMetadataVersion.INSTANCE
-            return JsBuildMetaInfo(
-                isEAP = isEAP,
-                compilerBuildVersion = compilerBuildVersion,
-                languageVersionString = languageVersionString,
-                apiVersionString = apiVersionString,
-                coroutinesEnable = coroutinesEnable,
-                coroutinesWarn = coroutinesWarn,
-                coroutinesError = coroutinesError,
-                multiplatformEnable = multiplatformEnable,
-                metadataVersionMajor = metadataVersion.major,
-                metadataVersionMinor = metadataVersion.minor,
-                metadataVersionPatch = metadataVersion.patch,
-                ownVersion = ownVersion,
-                coroutinesVersion = coroutinesVersion,
-                multiplatformVersion = multiplatformVersion
-            )
-        }
+            multiplatformVersion: Int
+        ) = JsBuildMetaInfo(
+            isEAP = isEAP,
+            compilerBuildVersion = compilerBuildVersion,
+            languageVersionString = languageVersionString,
+            apiVersionString = apiVersionString,
+            coroutinesEnable = coroutinesEnable,
+            coroutinesWarn = coroutinesWarn,
+            coroutinesError = coroutinesError,
+            multiplatformEnable = multiplatformEnable,
+            metadataVersionMajor = JsMetadataVersion.INSTANCE.major,
+            metadataVersionMinor = JsMetadataVersion.INSTANCE.minor,
+            metadataVersionPatch = JsMetadataVersion.INSTANCE.patch,
+            ownVersion = ownVersion,
+            coroutinesVersion = coroutinesVersion,
+            multiplatformVersion = multiplatformVersion
+        )
    }
-}
+}
--- a/build-common/src/org/jetbrains/kotlin/build/JvmBuildMetaInfo.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/JvmBuildMetaInfo.kt
@@ -53,29 +53,25 @@ data class JvmBuildMetaInfo(
            multiplatformEnable: Boolean,
            ownVersion: Int,
            coroutinesVersion: Int,
-            multiplatformVersion: Int,
-            metadataVersionArray: IntArray?
-        ): JvmBuildMetaInfo {
-            val metadataVersion = metadataVersionArray?.let(::JvmMetadataVersion) ?: JvmMetadataVersion.INSTANCE
-            return JvmBuildMetaInfo(
-                isEAP = isEAP,
-                compilerBuildVersion = compilerBuildVersion,
-                languageVersionString = languageVersionString,
-                apiVersionString = apiVersionString,
-                coroutinesEnable = coroutinesEnable,
-                coroutinesWarn = coroutinesWarn,
-                coroutinesError = coroutinesError,
-                multiplatformEnable = multiplatformEnable,
-                metadataVersionMajor = metadataVersion.major,
-                metadataVersionMinor = metadataVersion.minor,
-                metadataVersionPatch = metadataVersion.patch,
-                bytecodeVersionMajor = JvmBytecodeBinaryVersion.INSTANCE.major,
-                bytecodeVersionMinor = JvmBytecodeBinaryVersion.INSTANCE.minor,
-                bytecodeVersionPatch = JvmBytecodeBinaryVersion.INSTANCE.patch,
-                ownVersion = ownVersion,
-                coroutinesVersion = coroutinesVersion,
-                multiplatformVersion = multiplatformVersion
-            )
-        }
+            multiplatformVersion: Int
+        ) = JvmBuildMetaInfo(
+            isEAP = isEAP,
+            compilerBuildVersion = compilerBuildVersion,
+            languageVersionString = languageVersionString,
+            apiVersionString = apiVersionString,
+            coroutinesEnable = coroutinesEnable,
+            coroutinesWarn = coroutinesWarn,
+            coroutinesError = coroutinesError,
+            multiplatformEnable = multiplatformEnable,
+            metadataVersionMajor = JvmMetadataVersion.INSTANCE.major,
+            metadataVersionMinor = JvmMetadataVersion.INSTANCE.minor,
+            metadataVersionPatch = JvmMetadataVersion.INSTANCE.patch,
+            bytecodeVersionMajor = JvmBytecodeBinaryVersion.INSTANCE.major,
+            bytecodeVersionMinor = JvmBytecodeBinaryVersion.INSTANCE.minor,
+            bytecodeVersionPatch = JvmBytecodeBinaryVersion.INSTANCE.patch,
+            ownVersion = ownVersion,
+            coroutinesVersion = coroutinesVersion,
+            multiplatformVersion = multiplatformVersion
+        )
    }
 }
--- a/build-common/src/org/jetbrains/kotlin/build/generatedFiles.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/generatedFiles.kt
@@ -22,11 +22,9 @@ import org.jetbrains.kotlin.utils.sure
 import java.io.File

 open class GeneratedFile(
-    sourceFiles: Collection<File>,
+    val sourceFiles: Collection<File>,
    val outputFile: File
-) {
-    val sourceFiles = sourceFiles.sortedBy { it.path }
-}
+)

 class GeneratedJvmClass (
        sourceFiles: Collection<File>,
--- a/build-common/src/org/jetbrains/kotlin/build/sourcesUtils.kt
+++ b/build-common/src/org/jetbrains/kotlin/build/sourcesUtils.kt
@@ -1,9 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.build
-
-val DEFAULT_KOTLIN_SOURCE_FILES_EXTENSIONS = listOf("kt", "kts")
-
--- a/build-common/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java
+++ b/build-common/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java
@@ -16,7 +16,7 @@

 package org.jetbrains.kotlin.compilerRunner;

-import kotlin.collections.CollectionsKt;
+import com.intellij.util.containers.ContainerUtil;
 import kotlin.jvm.JvmClassMappingKt;
 import kotlin.reflect.KClass;
 import kotlin.reflect.KProperty1;
@@ -24,10 +24,8 @@ import kotlin.reflect.KVisibility;
 import kotlin.reflect.full.KClasses;
 import kotlin.reflect.jvm.ReflectJvmMapping;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.cli.common.arguments.Argument;
 import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments;
-import org.jetbrains.kotlin.cli.common.arguments.InternalArgument;
 import org.jetbrains.kotlin.cli.common.arguments.ParseCommandLineArgumentsKt;
 import org.jetbrains.kotlin.utils.StringsKt;

@@ -48,7 +46,7 @@ public class ArgumentUtils {
        Class<? extends CommonToolArguments> argumentsClass = arguments.getClass();
        convertArgumentsToStringList(arguments, argumentsClass.newInstance(), JvmClassMappingKt.getKotlinClass(argumentsClass), result);
        result.addAll(arguments.getFreeArgs());
-        result.addAll(CollectionsKt.map(arguments.getInternalArguments(), InternalArgument::getStringRepresentation));
+        result.addAll(arguments.getInternalArguments());
        return result;
    }

@@ -60,7 +58,7 @@ public class ArgumentUtils {
            @NotNull List<String> result
    ) throws IllegalAccessException, InstantiationException, InvocationTargetException {
        for (KProperty1 property : KClasses.getMemberProperties(clazz)) {
-            Argument argument = findInstance(property.getAnnotations(), Argument.class);
+            Argument argument = ContainerUtil.findInstance(property.getAnnotations(), Argument.class);
            if (argument == null) continue;

            if (property.getVisibility() != KVisibility.PUBLIC) continue;
@@ -90,14 +88,4 @@ public class ArgumentUtils {
            }
        }
    }
-
-    @Nullable
-    private static <T> T findInstance(Iterable<? super T> iterable, Class<T> clazz) {
-        for (Object item : iterable) {
-            if (clazz.isInstance(item)) {
-                return clazz.cast(item);
-            }
-        }
-        return null;
-    }
 }
--- a/build-common/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java
+++ b/build-common/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java
@@ -16,15 +16,15 @@

 package org.jetbrains.kotlin.compilerRunner;

+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 import java.io.File;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

 public class OutputItemsCollectorImpl implements OutputItemsCollector {
-    private final List<SimpleOutputItem> outputs = new ArrayList<>();
+    private final List<SimpleOutputItem> outputs = ContainerUtil.newArrayList();

    @Override
    public void add(Collection<File> sourceFiles, File outputFile) {
--- a/build-common/src/org/jetbrains/kotlin/incremental/AbstractIncrementalCache.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/AbstractIncrementalCache.kt
@@ -37,34 +37,28 @@ interface IncrementalCacheCommon {
    fun getSourceFileIfClass(fqName: FqName): File?
    fun markDirty(removedAndCompiledSources: Collection<File>)
    fun clearCacheForRemovedClasses(changesCollector: ChangesCollector)
-    fun getComplementaryFilesRecursive(dirtyFiles: Collection<File>): Collection<File>
-    fun updateComplementaryFiles(dirtyFiles: Collection<File>, expectActualTracker: ExpectActualTrackerImpl)
+    fun clearComplementaryFilesMapping(dirtyFiles: Collection<File>): Collection<File>
+    fun registerComplementaryFiles(expectActualTracker: ExpectActualTrackerImpl)
    fun dump(): String
 }

 /**
 * Incremental cache common for JVM and JS for specifit ClassName type
 */
-abstract class AbstractIncrementalCache<ClassName>(
-    workingDir: File,
-    protected val pathConverter: FileToPathConverter
-) : BasicMapsOwner(workingDir), IncrementalCacheCommon {
+abstract class AbstractIncrementalCache<ClassName>(workingDir: File) : BasicMapsOwner(workingDir), IncrementalCacheCommon {
    companion object {
        private val SUBTYPES = "subtypes"
        private val SUPERTYPES = "supertypes"
        private val CLASS_FQ_NAME_TO_SOURCE = "class-fq-name-to-source"
        private val COMPLEMENTARY_FILES = "complementary-files"
-        @JvmStatic
-        protected val SOURCE_TO_CLASSES = "source-to-classes"
-        @JvmStatic
-        protected val DIRTY_OUTPUT_CLASSES = "dirty-output-classes"
+        @JvmStatic protected val SOURCE_TO_CLASSES = "source-to-classes"
+        @JvmStatic protected val DIRTY_OUTPUT_CLASSES = "dirty-output-classes"
    }

    private val dependents = arrayListOf<AbstractIncrementalCache<ClassName>>()
    fun addDependentCache(cache: AbstractIncrementalCache<ClassName>) {
        dependents.add(cache)
    }
-
    override val thisWithDependentCaches: Iterable<AbstractIncrementalCache<ClassName>> by lazy {
        val result = arrayListOf(this)
        result.addAll(dependents)
@@ -73,25 +67,26 @@ abstract class AbstractIncrementalCache<ClassName>(

    private val subtypesMap = registerMap(SubtypesMap(SUBTYPES.storageFile))
    private val supertypesMap = registerMap(SupertypesMap(SUPERTYPES.storageFile))
-    protected val classFqNameToSourceMap = registerMap(ClassFqNameToSourceMap(CLASS_FQ_NAME_TO_SOURCE.storageFile, pathConverter))
+    protected val classFqNameToSourceMap = registerMap(ClassFqNameToSourceMap(CLASS_FQ_NAME_TO_SOURCE.storageFile))
    internal abstract val sourceToClassesMap: AbstractSourceToOutputMap<ClassName>
    internal abstract val dirtyOutputClassesMap: AbstractDirtyClassesMap<ClassName>
+
    /**
     * A file X is a complementary to a file Y if they contain corresponding expect/actual declarations.
     * Complementary files should be compiled together during IC so the compiler does not complain
     * about missing parts.
     * TODO: provide a better solution (maintain an index of expect/actual declarations akin to IncrementalPackagePartProvider)
     */
-    private val complementaryFilesMap = registerMap(ComplementarySourceFilesMap(COMPLEMENTARY_FILES.storageFile, pathConverter))
+    private val complementaryFilesMap = registerMap(FilesMap(COMPLEMENTARY_FILES.storageFile))

    override fun classesFqNamesBySources(files: Iterable<File>): Collection<FqName> =
        files.flatMapTo(HashSet()) { sourceToClassesMap.getFqNames(it) }

    override fun getSubtypesOf(className: FqName): Sequence<FqName> =
-        subtypesMap[className].asSequence()
+            subtypesMap[className].asSequence()

    override fun getSourceFileIfClass(fqName: FqName): File? =
-        classFqNameToSourceMap[fqName]
+            classFqNameToSourceMap[fqName]

    override fun markDirty(removedAndCompiledSources: Collection<File>) {
        for (sourceFile in removedAndCompiledSources) {
@@ -107,8 +102,8 @@ abstract class AbstractIncrementalCache<ClassName>(
    protected fun addToClassStorage(proto: ProtoBuf.Class, nameResolver: NameResolver, srcFile: File) {
        val supertypes = proto.supertypes(TypeTable(proto.typeTable))
        val parents = supertypes.map { nameResolver.getClassId(it.className).asSingleFqName() }
-            .filter { it.asString() != "kotlin.Any" }
-            .toSet()
+                .filter { it.asString() != "kotlin.Any" }
+                .toSet()
        val child = nameResolver.getClassId(proto.fqName).asSingleFqName()

        parents.forEach { subtypesMap.add(it, child) }
@@ -155,17 +150,13 @@ abstract class AbstractIncrementalCache<ClassName>(
        removedFqNames.forEach { classFqNameToSourceMap.remove(it) }
    }

-    protected class ClassFqNameToSourceMap(
-        storageFile: File,
-        private val pathConverter: FileToPathConverter
-    ) :
-        BasicStringMap<String>(storageFile, EnumeratorStringDescriptor(), PathStringDescriptor) {
+    protected class ClassFqNameToSourceMap(storageFile: File) : BasicStringMap<String>(storageFile, EnumeratorStringDescriptor(), PathStringDescriptor) {
        operator fun set(fqName: FqName, sourceFile: File) {
-            storage[fqName.asString()] = pathConverter.toPath(sourceFile)
+            storage[fqName.asString()] = sourceFile.canonicalPath
        }

        operator fun get(fqName: FqName): File? =
-            storage[fqName.asString()]?.let(pathConverter::toFile)
+                storage[fqName.asString()]?.let(::File)

        fun remove(fqName: FqName) {
            storage.remove(fqName.asString())
@@ -174,24 +165,18 @@ abstract class AbstractIncrementalCache<ClassName>(
        override fun dumpValue(value: String) = value
    }

-    override fun getComplementaryFilesRecursive(dirtyFiles: Collection<File>): Collection<File> {
+    override fun clearComplementaryFilesMapping(dirtyFiles: Collection<File>): Collection<File> {
        val complementaryFiles = HashSet<File>()
        val filesQueue = ArrayDeque(dirtyFiles)
        while (filesQueue.isNotEmpty()) {
            val file = filesQueue.pollFirst()
-            complementaryFilesMap[file].forEach {
-                if (complementaryFiles.add(it)) filesQueue.add(it)
-            }
+            complementaryFilesMap.remove(file).filterTo(filesQueue) { complementaryFiles.add(it) }
        }
        complementaryFiles.removeAll(dirtyFiles)
        return complementaryFiles
    }

-    override fun updateComplementaryFiles(dirtyFiles: Collection<File>, expectActualTracker: ExpectActualTrackerImpl) {
-        dirtyFiles.forEach {
-            complementaryFilesMap.remove(it)
-        }
-
+    override fun registerComplementaryFiles(expectActualTracker: ExpectActualTrackerImpl) {
        val actualToExpect = hashMapOf<File, MutableSet<File>>()
        for ((expect, actuals) in expectActualTracker.expectToActualMap) {
            for (actual in actuals) {
--- a/build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/CacheVersion.kt
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * 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.jetbrains.kotlin.incremental
+
+import org.jetbrains.annotations.TestOnly
+import org.jetbrains.kotlin.config.IncrementalCompilation
+import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmBytecodeBinaryVersion
+import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
+import java.io.File
+import java.io.IOException
+
+private val NORMAL_VERSION = 9
+private val DATA_CONTAINER_VERSION = 3
+
+private val NORMAL_VERSION_FILE_NAME = "format-version.txt"
+private val DATA_CONTAINER_VERSION_FILE_NAME = "data-container-format-version.txt"
+
+class CacheVersion(
+        private val ownVersion: Int,
+        private val versionFile: File,
+        private val whenVersionChanged: CacheVersion.Action,
+        private val whenTurnedOn: CacheVersion.Action,
+        private val whenTurnedOff: CacheVersion.Action,
+        isEnabled: ()->Boolean
+) {
+    private val isEnabled by lazy(isEnabled)
+
+    private val actualVersion: Int?
+        get() = try {
+            versionFile.readText().toInt()
+        }
+        catch (e: NumberFormatException) {
+            null
+        }
+        catch (e: IOException) {
+            null
+        }
+
+    private val expectedVersion: Int
+        get() {
+            val metadata = JvmMetadataVersion.INSTANCE
+            val bytecode = JvmBytecodeBinaryVersion.INSTANCE
+            return ownVersion * 1000000 +
+                   bytecode.major * 10000 + bytecode.minor * 100 +
+                   metadata.major * 1000 + metadata.minor
+        }
+
+    fun checkVersion(): Action =
+            when (versionFile.exists() to isEnabled) {
+                true  to true -> if (actualVersion != expectedVersion) whenVersionChanged else Action.DO_NOTHING
+                false to true -> whenTurnedOn
+                true  to false -> whenTurnedOff
+                else -> Action.DO_NOTHING
+            }
+
+    fun saveIfNeeded() {
+        if (!isEnabled) return
+
+        if (!versionFile.parentFile.exists()) {
+            versionFile.parentFile.mkdirs()
+        }
+
+        versionFile.writeText(expectedVersion.toString())
+    }
+
+    fun clean() {
+        versionFile.delete()
+    }
+
+    @get:TestOnly
+    val formatVersionFile: File
+        get() = versionFile
+
+    // Order of entries is important, because actions are sorted in KotlinBuilder::checkVersions
+    enum class Action {
+        REBUILD_ALL_KOTLIN,
+        REBUILD_CHUNK,
+        CLEAN_NORMAL_CACHES,
+        CLEAN_DATA_CONTAINER,
+        DO_NOTHING
+    }
+}
+
+fun normalCacheVersion(dataRoot: File, enabled: Boolean? = null): CacheVersion =
+        CacheVersion(ownVersion = NORMAL_VERSION,
+                     versionFile = File(dataRoot, NORMAL_VERSION_FILE_NAME),
+                     whenVersionChanged = CacheVersion.Action.REBUILD_CHUNK,
+                     whenTurnedOn = CacheVersion.Action.REBUILD_CHUNK,
+                     whenTurnedOff = CacheVersion.Action.CLEAN_NORMAL_CACHES,
+                     isEnabled = { enabled ?: IncrementalCompilation.isEnabled() })
+
+fun dataContainerCacheVersion(dataRoot: File, enabled: Boolean? = null): CacheVersion =
+        CacheVersion(ownVersion = DATA_CONTAINER_VERSION,
+                     versionFile = File(dataRoot, DATA_CONTAINER_VERSION_FILE_NAME),
+                     whenVersionChanged = CacheVersion.Action.REBUILD_ALL_KOTLIN,
+                     whenTurnedOn = CacheVersion.Action.REBUILD_ALL_KOTLIN,
+                     whenTurnedOff = CacheVersion.Action.CLEAN_DATA_CONTAINER,
+                     isEnabled = { enabled ?: IncrementalCompilation.isEnabled() })
--- a/build-common/src/org/jetbrains/kotlin/incremental/ExpectActualTrackerImpl.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/ExpectActualTrackerImpl.kt
@@ -1,6 +1,6 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
 */

 package org.jetbrains.kotlin.incremental
--- a/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt
@@ -1,6 +1,17 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * 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.jetbrains.kotlin.incremental
@@ -10,10 +21,14 @@ import java.io.File

 interface ICReporter {
    fun report(message: () -> String)
-    fun reportVerbose(message: () -> String)

-    fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection<File>, exitCode: ExitCode)
-    fun reportMarkDirtyClass(affectedFiles: Iterable<File>, classFqName: String)
-    fun reportMarkDirtyMember(affectedFiles: Iterable<File>, scope: String, name: String)
-    fun reportMarkDirty(affectedFiles: Iterable<File>, reason: String)
-}
+    // used in Gradle plugin
+    @Suppress("unused")
+    fun reportCompileIteration(sourceFiles: Collection<File>, exitCode: ExitCode) {}
+
+    fun pathsAsString(files: Iterable<File>): String =
+            files.joinToString { it.canonicalPath }
+
+    fun pathsAsString(vararg files: File): String =
+            pathsAsString(files.toList())
+}
--- a/build-common/src/org/jetbrains/kotlin/incremental/ICReporterBase.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/ICReporterBase.kt
@@ -1,36 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.incremental
-
-import java.io.File
-
-abstract class ICReporterBase(private val pathsBase: File? = null) : ICReporter {
-    override fun reportMarkDirtyClass(affectedFiles: Iterable<File>, classFqName: String) {
-        reportMarkDirty(affectedFiles, "dirty class $classFqName")
-    }
-
-    override fun reportMarkDirtyMember(affectedFiles: Iterable<File>, scope: String, name: String) {
-        reportMarkDirty(affectedFiles, "dirty member $scope#$name")
-    }
-
-    override fun reportMarkDirty(affectedFiles: Iterable<File>, reason: String) {
-        affectedFiles.forEach { file ->
-            reportVerbose { "${pathsAsString(file)} is marked dirty: $reason" }
-        }
-    }
-
-    protected fun relativizeIfPossible(files: Iterable<File>): List<File> =
-        files.map { it.relativeOrCanonical() }
-
-    protected fun pathsAsString(files: Iterable<File>): String =
-        relativizeIfPossible(files).map { it.path }.sorted().joinToString()
-
-    protected fun pathsAsString(vararg files: File): String =
-        pathsAsString(files.toList())
-
-    protected fun File.relativeOrCanonical(): File =
-        pathsBase?.let { relativeToOrNull(it) } ?: canonicalFile
-}
--- a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt
@@ -19,7 +19,10 @@ package org.jetbrains.kotlin.incremental
 import com.intellij.util.io.DataExternalizer
 import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumerImpl
 import org.jetbrains.kotlin.incremental.js.TranslationResultValue
-import org.jetbrains.kotlin.incremental.storage.*
+import org.jetbrains.kotlin.incremental.storage.BasicStringMap
+import org.jetbrains.kotlin.incremental.storage.DirtyClassesFqNameMap
+import org.jetbrains.kotlin.incremental.storage.SourceToFqNameMap
+import org.jetbrains.kotlin.incremental.storage.StringToLongMapExternalizer
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.NameResolverImpl
 import org.jetbrains.kotlin.metadata.deserialization.getExtensionOrNull
@@ -27,31 +30,25 @@ import org.jetbrains.kotlin.metadata.js.JsProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.name.parentOrNull
 import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
 import java.io.DataInput
 import java.io.DataOutput
 import java.io.File

-open class IncrementalJsCache(
-    cachesDir: File,
-    pathConverter: FileToPathConverter
-) : AbstractIncrementalCache<FqName>(cachesDir, pathConverter) {
+open class IncrementalJsCache(cachesDir: File) : AbstractIncrementalCache<FqName>(cachesDir) {
    companion object {
-        private const val TRANSLATION_RESULT_MAP = "translation-result"
-        private const val INLINE_FUNCTIONS = "inline-functions"
-        private const val HEADER_FILE_NAME = "header.meta"
-        private const val PACKAGE_META_FILE = "packages-meta"
+        private val TRANSLATION_RESULT_MAP = "translation-result"
+        private val INLINE_FUNCTIONS = "inline-functions"
+        private val HEADER_FILE_NAME = "header.meta"

        fun hasHeaderFile(cachesDir: File) = File(cachesDir, HEADER_FILE_NAME).exists()
    }

-    override val sourceToClassesMap = registerMap(SourceToFqNameMap(SOURCE_TO_CLASSES.storageFile, pathConverter))
+    override val sourceToClassesMap = registerMap(SourceToFqNameMap(SOURCE_TO_CLASSES.storageFile))
    override val dirtyOutputClassesMap = registerMap(DirtyClassesFqNameMap(DIRTY_OUTPUT_CLASSES.storageFile))
-    private val translationResults = registerMap(TranslationResultMap(TRANSLATION_RESULT_MAP.storageFile, pathConverter))
-    private val inlineFunctions = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile, pathConverter))
-    private val packageMetadata = registerMap(PackageMetadataMap(PACKAGE_META_FILE.storageFile))
+    private val translationResults = registerMap(TranslationResultMap(TRANSLATION_RESULT_MAP.storageFile))
+    private val inlineFunctions = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile))

    private val dirtySources = hashSetOf<File>()

@@ -66,12 +63,6 @@ open class IncrementalJsCache(
        }

    override fun markDirty(removedAndCompiledSources: Collection<File>) {
-        removedAndCompiledSources.forEach { sourceFile ->
-            // The common prefix of all FQN parents has to be the file package
-            sourceToClassesMap[sourceFile].map { it.parentOrNull()?.asString() ?: "" }.minBy { it.length }?.let {
-                packageMetadata.remove(it)
-            }
-        }
        super.markDirty(removedAndCompiledSources)
        dirtySources.addAll(removedAndCompiledSources)
    }
@@ -81,7 +72,7 @@ open class IncrementalJsCache(

        for ((srcFile, data) in translatedFiles) {
            dirtySources.remove(srcFile)
-            val (binaryMetadata, binaryAst, inlineData) = data
+            val (binaryMetadata, binaryAst) = data

            val oldProtoMap = translationResults[srcFile]?.metadata?.let { getProtoData(srcFile, it) } ?: emptyMap()
            val newProtoMap = getProtoData(srcFile, binaryMetadata)
@@ -98,16 +89,12 @@ open class IncrementalJsCache(
                changesCollector.collectProtoChanges(oldProtoMap[classId], newProtoMap[classId])
            }

-            translationResults.put(srcFile, binaryMetadata, binaryAst, inlineData)
+            translationResults.put(srcFile, binaryMetadata, binaryAst)
        }

        for ((srcFile, inlineDeclarations) in incrementalResults.inlineFunctions) {
            inlineFunctions.process(srcFile, inlineDeclarations, changesCollector)
        }
-
-        for ((packageName, metadata) in incrementalResults.packageMetadata) {
-            packageMetadata.put(packageName, metadata)
-        }
    }

    private fun registerOutputForFile(srcFile: File, name: FqName) {
@@ -126,20 +113,14 @@ open class IncrementalJsCache(
    }

    fun nonDirtyPackageParts(): Map<File, TranslationResultValue> =
-        hashMapOf<File, TranslationResultValue>().apply {
-            for (file in translationResults.keys()) {
-
-                if (file !in dirtySources) {
-                    put(file, translationResults[file]!!)
+            hashMapOf<File, TranslationResultValue>().apply {
+                for (path in translationResults.keys()) {
+                    val file = File(path)
+                    if (file !in dirtySources) {
+                        put(file, translationResults[path]!!)
+                    }
                }
            }
-        }
-
-    fun packageMetadata(): Map<String, ByteArray> = hashMapOf<String, ByteArray>().apply {
-        for (fqNameString in packageMetadata.keys()) {
-            put(fqNameString, packageMetadata[fqNameString]!!)
-        }
-    }
 }

 private object TranslationResultValueExternalizer : DataExternalizer<TranslationResultValue> {
@@ -149,9 +130,6 @@ private object TranslationResultValueExternalizer : DataExternalizer<Translation

        output.writeInt(value.binaryAst.size)
        output.write(value.binaryAst)
-
-        output.writeInt(value.inlineData.size)
-        output.write(value.inlineData)
    }

    override fun read(input: DataInput): TranslationResultValue {
@@ -163,46 +141,39 @@ private object TranslationResultValueExternalizer : DataExternalizer<Translation
        val binaryAst = ByteArray(binaryAstSize)
        input.readFully(binaryAst)

-        val inlineDataSize = input.readInt()
-        val inlineData = ByteArray(inlineDataSize)
-        input.readFully(inlineData)
-
-        return TranslationResultValue(metadata = metadata, binaryAst = binaryAst, inlineData = inlineData)
+        return TranslationResultValue(metadata = metadata, binaryAst = binaryAst)
    }
 }

-private class TranslationResultMap(
-    storageFile: File,
-    private val pathConverter: FileToPathConverter
-) :
-    BasicStringMap<TranslationResultValue>(storageFile, TranslationResultValueExternalizer) {
+private class TranslationResultMap(storageFile: File) : BasicStringMap<TranslationResultValue>(storageFile, TranslationResultValueExternalizer) {
    override fun dumpValue(value: TranslationResultValue): String =
-        "Metadata: ${value.metadata.md5()}, Binary AST: ${value.binaryAst.md5()}, InlineData: ${value.inlineData.md5()}"
+            "Metadata: ${value.metadata.md5()}, Binary AST: ${value.binaryAst.md5()}"

-    fun put(sourceFile: File, newMetadata: ByteArray, newBinaryAst: ByteArray, newInlineData: ByteArray) {
-        storage[pathConverter.toPath(sourceFile)] =
-            TranslationResultValue(metadata = newMetadata, binaryAst = newBinaryAst, inlineData = newInlineData)
+    fun put(file: File, newMetadata: ByteArray, newBinaryAst: ByteArray) {
+        storage[file.canonicalPath] = TranslationResultValue(metadata = newMetadata, binaryAst = newBinaryAst)
    }

-    operator fun get(sourceFile: File): TranslationResultValue? =
-        storage[pathConverter.toPath(sourceFile)]
+    operator fun get(file: File): TranslationResultValue? =
+            storage[file.canonicalPath]

-    fun keys(): Collection<File> =
-        storage.keys.map { pathConverter.toFile(it) }
+    operator fun get(key: String): TranslationResultValue? =
+            storage[key]

-    fun remove(sourceFile: File, changesCollector: ChangesCollector) {
-        val path = pathConverter.toPath(sourceFile)
-        val protoBytes = storage[path]!!.metadata
-        val protoMap = getProtoData(sourceFile, protoBytes)
+    fun keys(): Collection<String> =
+            storage.keys
+
+    fun remove(file: File, changesCollector: ChangesCollector) {
+        val protoBytes = storage[file.canonicalPath]!!.metadata
+        val protoMap = getProtoData(file, protoBytes)

        for ((_, protoData) in protoMap) {
            changesCollector.collectProtoChanges(oldData = protoData, newData = null)
        }
-        storage.remove(path)
+        storage.remove(file.canonicalPath)
    }
 }

-fun getProtoData(sourceFile: File, metadata: ByteArray): Map<ClassId, ProtoData> {
+fun getProtoData(sourceFile: File, metadata: ByteArray): Map<ClassId, ProtoData>  {
    val classes = hashMapOf<ClassId, ProtoData>()
    val proto = ProtoBuf.PackageFragment.parseFrom(metadata, JsSerializerProtocol.extensionRegistry)
    val nameResolver = NameResolverImpl(proto.strings, proto.qualifiedNames)
@@ -221,17 +192,15 @@ fun getProtoData(sourceFile: File, metadata: ByteArray): Map<ClassId, ProtoData>
    return classes
 }

-private class InlineFunctionsMap(
-    storageFile: File,
-    private val pathConverter: FileToPathConverter
-) : BasicStringMap<Map<String, Long>>(storageFile, StringToLongMapExternalizer) {
+private class InlineFunctionsMap(storageFile: File) : BasicStringMap<Map<String, Long>>(storageFile, StringToLongMapExternalizer) {
    fun process(srcFile: File, newMap: Map<String, Long>, changesCollector: ChangesCollector) {
-        val key = pathConverter.toPath(srcFile)
+        val key = srcFile.canonicalPath
        val oldMap = storage[key] ?: emptyMap()

        if (newMap.isNotEmpty()) {
            storage[key] = newMap
-        } else {
+        }
+        else {
            storage.remove(key)
        }

@@ -243,40 +212,9 @@ private class InlineFunctionsMap(
    }

    fun remove(sourceFile: File) {
-        storage.remove(pathConverter.toPath(sourceFile))
+        storage.remove(sourceFile.canonicalPath)
    }

    override fun dumpValue(value: Map<String, Long>): String =
-        value.dumpMap { java.lang.Long.toHexString(it) }
-}
-
-private object ByteArrayExternalizer : DataExternalizer<ByteArray> {
-    override fun save(output: DataOutput, value: ByteArray) {
-        output.writeInt(value.size)
-        output.write(value)
-    }
-
-    override fun read(input: DataInput): ByteArray {
-        val size = input.readInt()
-        val array = ByteArray(size)
-        input.readFully(array)
-        return array
-    }
-}
-
-
-private class PackageMetadataMap(storageFile: File) : BasicStringMap<ByteArray>(storageFile, ByteArrayExternalizer) {
-    fun put(packageName: String, newMetadata: ByteArray) {
-        storage[packageName] = newMetadata
-    }
-
-    fun remove(packageName: String) {
-        storage.remove(packageName)
-    }
-
-    fun keys() = storage.keys
-
-    operator fun get(packageName: String) = storage[packageName]
-
-    override fun dumpValue(value: ByteArray): String = "Package metadata: ${value.md5()}"
+            value.dumpMap { java.lang.Long.toHexString(it) }
 }
--- a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJvmCache.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJvmCache.kt
@@ -42,13 +42,9 @@ import java.util.*
 val KOTLIN_CACHE_DIRECTORY_NAME = "kotlin"

 open class IncrementalJvmCache(
-    private val targetDataRoot: File,
-    targetOutputDir: File?,
-    pathConverter: FileToPathConverter
-) : AbstractIncrementalCache<JvmClassName>(
-    workingDir = File(targetDataRoot, KOTLIN_CACHE_DIRECTORY_NAME),
-    pathConverter = pathConverter
-), IncrementalCache {
+        private val targetDataRoot: File,
+        targetOutputDir: File?
+) : AbstractIncrementalCache<JvmClassName>(File(targetDataRoot, KOTLIN_CACHE_DIRECTORY_NAME)), IncrementalCache {
    companion object {
        private val PROTO_MAP = "proto"
        private val CONSTANTS_MAP = "constants"
@@ -62,7 +58,7 @@ open class IncrementalJvmCache(
        private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT
    }

-    override val sourceToClassesMap = registerMap(SourceToJvmNameMap(SOURCE_TO_CLASSES.storageFile, pathConverter))
+    override val sourceToClassesMap = registerMap(SourceToJvmNameMap(SOURCE_TO_CLASSES.storageFile))
    override val dirtyOutputClassesMap = registerMap(DirtyClassesJvmNameMap(DIRTY_OUTPUT_CLASSES.storageFile))

    private val protoMap = registerMap(ProtoMap(PROTO_MAP.storageFile))
@@ -72,8 +68,7 @@ open class IncrementalJvmCache(
    private val partToMultifileFacade = registerMap(MultifileClassPartMap(MULTIFILE_CLASS_PARTS.storageFile))
    private val inlineFunctionsMap = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile))
    // todo: try to use internal names only?
-    private val internalNameToSource = registerMap(InternalNameToSourcesMap(INTERNAL_NAME_TO_SOURCE.storageFile, pathConverter))
-    // gradle only
+    private val internalNameToSource = registerMap(InternalNameToSourcesMap(INTERNAL_NAME_TO_SOURCE.storageFile))
    private val javaSourcesProtoMap = registerMap(JavaSourcesProtoMap(JAVA_SOURCES_PROTO_MAP.storageFile))

    private val outputDir by lazy(LazyThreadSafetyMode.NONE) { requireNotNull(targetOutputDir) { "Target is expected to have output directory" } }
@@ -85,16 +80,16 @@ open class IncrementalJvmCache(
    // used in gradle
    @Suppress("unused")
    fun classesBySources(sources: Iterable<File>): Iterable<JvmClassName> =
-        sources.flatMap { sourceToClassesMap[it] }
+            sources.flatMap { sourceToClassesMap[it] }

    fun sourceInCache(file: File): Boolean =
        sourceToClassesMap.contains(file)

    fun sourcesByInternalName(internalName: String): Collection<File> =
-        internalNameToSource[internalName]
+            internalNameToSource[internalName]

    fun isMultifileFacade(className: JvmClassName): Boolean =
-        className in multifileFacadeToParts
+            className in multifileFacadeToParts

    override fun getClassFilePath(internalClassName: String): String {
        return toSystemIndependentName(File(outputDir, "$internalClassName.class").canonicalPath)
@@ -133,7 +128,7 @@ open class IncrementalJvmCache(
            }
            KotlinClassHeader.Kind.MULTIFILE_CLASS -> {
                val partNames = kotlinClass.classHeader.data?.toList()
-                    ?: throw AssertionError("Multifile class has no parts: ${kotlinClass.className}")
+                                ?: throw AssertionError("Multifile class has no parts: ${kotlinClass.className}")
                multifileFacadeToParts[className] = partNames
                // When a class is replaced with a facade with the same name,
                // the class' proto wouldn't ever be deleted,
@@ -181,15 +176,15 @@ open class IncrementalJvmCache(
    }

    fun getObsoleteJavaClasses(): Collection<ClassId> =
-        dirtyOutputClassesMap.getDirtyOutputClasses()
-            .mapNotNull {
-                javaSourcesProtoMap[it]?.classId
-            }
+            dirtyOutputClassesMap.getDirtyOutputClasses()
+                    .mapNotNull {
+                        javaSourcesProtoMap[it]?.classId
+                    }

    fun isJavaClassToTrack(classId: ClassId): Boolean {
        val jvmClassName = JvmClassName.byClassId(classId)
        return dirtyOutputClassesMap.isDirty(jvmClassName) ||
-                jvmClassName !in javaSourcesProtoMap
+               jvmClassName !in javaSourcesProtoMap
    }

    fun isJavaClassAlreadyInCache(classId: ClassId): Boolean {
@@ -214,7 +209,8 @@ open class IncrementalJvmCache(

            if (notRemovedParts.isEmpty()) {
                multifileFacadeToParts.remove(facade)
-            } else {
+            }
+            else {
                multifileFacadeToParts[facade] = notRemovedParts
            }
        }
@@ -266,6 +262,11 @@ open class IncrementalJvmCache(
        return protoMap[JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME)]?.bytes
    }

+    override fun clean() {
+        super.clean()
+        normalCacheVersion(targetDataRoot).clean()
+    }
+
    private inner class ProtoMap(storageFile: File) : BasicStringMap<ProtoMapValue>(storageFile, ProtoMapValueExternalizer) {

        fun process(kotlinClass: LocalFileKotlinClass, changesCollector: ChangesCollector) {
@@ -288,11 +289,9 @@ open class IncrementalJvmCache(

            val key = kotlinClass.className.internalName
            val oldData = storage[key]
-            val newData = ProtoMapValue(
-                header.kind != KotlinClassHeader.Kind.CLASS,
-                BitEncoding.decodeBytes(header.data!!),
-                header.strings!!
-            )
+            val newData = ProtoMapValue(header.kind != KotlinClassHeader.Kind.CLASS,
+                                        BitEncoding.decodeBytes(header.data!!),
+                                        header.strings!!)
            storage[key] = newData

            val packageFqName = kotlinClass.className.packageFqName
@@ -300,10 +299,10 @@ open class IncrementalJvmCache(
        }

        operator fun contains(className: JvmClassName): Boolean =
-            className.internalName in storage
+                className.internalName in storage

        operator fun get(className: JvmClassName): ProtoMapValue? =
-            storage[className.internalName]
+                storage[className.internalName]

        fun remove(className: JvmClassName, changesCollector: ChangesCollector) {
            val key = className.internalName
@@ -319,16 +318,15 @@ open class IncrementalJvmCache(
        }
    }

-    private inner class JavaSourcesProtoMap(storageFile: File) :
-        BasicStringMap<SerializedJavaClass>(storageFile, JavaClassProtoMapValueExternalizer) {
+    private inner class JavaSourcesProtoMap(storageFile: File) : BasicStringMap<SerializedJavaClass>(storageFile, JavaClassProtoMapValueExternalizer) {
        fun process(jvmClassName: JvmClassName, newData: SerializedJavaClass, changesCollector: ChangesCollector) {
            val key = jvmClassName.internalName
            val oldData = storage[key]
            storage[key] = newData

            changesCollector.collectProtoChanges(
-                oldData?.toProtoData(), newData.toProtoData(),
-                collectAllMembersForNewClass = true
+                    oldData?.toProtoData(), newData.toProtoData(),
+                    collectAllMembersForNewClass = true
            )
        }

@@ -341,13 +339,13 @@ open class IncrementalJvmCache(
        }

        operator fun get(className: JvmClassName): SerializedJavaClass? =
-            storage[className.internalName]
+                storage[className.internalName]

        operator fun contains(className: JvmClassName): Boolean =
-            className.internalName in storage
+                className.internalName in storage

        override fun dumpValue(value: SerializedJavaClass): String =
-            java.lang.Long.toHexString(value.proto.toByteArray().md5())
+                java.lang.Long.toHexString(value.proto.toByteArray().md5())
    }

    // todo: reuse code with InlineFunctionsMap?
@@ -355,7 +353,7 @@ open class IncrementalJvmCache(
        private fun getConstantsMap(bytes: ByteArray): Map<String, Any> {
            val result = HashMap<String, Any>()

-            ClassReader(bytes).accept(object : ClassVisitor(Opcodes.API_VERSION) {
+            ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) {
                override fun visitField(access: Int, name: String, desc: String, signature: String?, value: Any?): FieldVisitor? {
                    val staticFinal = Opcodes.ACC_STATIC or Opcodes.ACC_FINAL or Opcodes.ACC_PRIVATE
                    if (value != null && access and staticFinal == Opcodes.ACC_STATIC or Opcodes.ACC_FINAL) {
@@ -369,7 +367,7 @@ open class IncrementalJvmCache(
        }

        operator fun contains(className: JvmClassName): Boolean =
-            className.internalName in storage
+                className.internalName in storage

        fun process(kotlinClass: LocalFileKotlinClass, changesCollector: ChangesCollector) {
            val key = kotlinClass.className.internalName
@@ -378,7 +376,8 @@ open class IncrementalJvmCache(
            val newMap = getConstantsMap(kotlinClass.fileContents)
            if (newMap.isNotEmpty()) {
                storage[key] = newMap
-            } else {
+            }
+            else {
                storage.remove(key)
            }

@@ -392,7 +391,7 @@ open class IncrementalJvmCache(
        }

        override fun dumpValue(value: Map<String, Any>): String =
-            value.dumpMap(Any::toString)
+                value.dumpMap(Any::toString)
    }

    private inner class PackagePartMap(storageFile: File) : BasicStringMap<Boolean>(storageFile, BooleanDataDescriptor.INSTANCE) {
@@ -405,22 +404,21 @@ open class IncrementalJvmCache(
        }

        fun isPackagePart(className: JvmClassName): Boolean =
-            className.internalName in storage
+                className.internalName in storage

        override fun dumpValue(value: Boolean) = ""
    }

-    private inner class MultifileClassFacadeMap(storageFile: File) :
-        BasicStringMap<Collection<String>>(storageFile, StringCollectionExternalizer) {
+    private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap<Collection<String>>(storageFile, StringCollectionExternalizer) {
        operator fun set(className: JvmClassName, partNames: Collection<String>) {
            storage[className.internalName] = partNames
        }

        operator fun get(className: JvmClassName): Collection<String>? =
-            storage[className.internalName]
+                storage[className.internalName]

        operator fun contains(className: JvmClassName): Boolean =
-            className.internalName in storage
+                className.internalName in storage

        fun remove(className: JvmClassName) {
            storage.remove(className.internalName)
@@ -429,14 +427,13 @@ open class IncrementalJvmCache(
        override fun dumpValue(value: Collection<String>): String = value.dumpCollection()
    }

-    private inner class MultifileClassPartMap(storageFile: File) :
-        BasicStringMap<String>(storageFile, EnumeratorStringDescriptor.INSTANCE) {
+    private inner class MultifileClassPartMap(storageFile: File) : BasicStringMap<String>(storageFile, EnumeratorStringDescriptor.INSTANCE) {
        fun set(partName: String, facadeName: String) {
            storage[partName] = facadeName
        }

        fun get(partName: JvmClassName): String? =
-            storage[partName.internalName]
+                storage[partName.internalName]

        fun remove(className: JvmClassName) {
            storage.remove(className.internalName)
@@ -445,23 +442,20 @@ open class IncrementalJvmCache(
        override fun dumpValue(value: String): String = value
    }

-    inner class InternalNameToSourcesMap(
-        storageFile: File,
-        private val pathConverter: FileToPathConverter
-    ) : BasicStringMap<Collection<String>>(storageFile, EnumeratorStringDescriptor(), PathCollectionExternalizer) {
-        operator fun set(internalName: String, sourceFiles: Collection<File>) {
-            storage[internalName] = pathConverter.toPaths(sourceFiles)
+    inner class InternalNameToSourcesMap(storageFile: File) : BasicStringMap<Collection<String>>(storageFile, EnumeratorStringDescriptor(), PathCollectionExternalizer) {
+        operator fun set(internalName: String, sourceFiles: Iterable<File>) {
+            storage[internalName] = sourceFiles.map { it.canonicalPath }
        }

        operator fun get(internalName: String): Collection<File> =
-            pathConverter.toFiles(storage[internalName] ?: emptyList())
+                (storage[internalName] ?: emptyList()).map(::File)

        fun remove(internalName: String) {
            storage.remove(internalName)
        }

        override fun dumpValue(value: Collection<String>): String =
-            value.dumpCollection()
+                value.dumpCollection()
    }

    private fun addToClassStorage(kotlinClass: LocalFileKotlinClass, srcFile: File) {
@@ -469,25 +463,18 @@ open class IncrementalJvmCache(
        addToClassStorage(proto, nameResolver, srcFile)
    }

-    private inner class InlineFunctionsMap(storageFile: File) :
-        BasicStringMap<Map<String, Long>>(storageFile, StringToLongMapExternalizer) {
+    private inner class InlineFunctionsMap(storageFile: File) : BasicStringMap<Map<String, Long>>(storageFile, StringToLongMapExternalizer) {
        private fun getInlineFunctionsMap(header: KotlinClassHeader, bytes: ByteArray): Map<String, Long> {
            val inlineFunctions = inlineFunctionsJvmNames(header)
            if (inlineFunctions.isEmpty()) return emptyMap()

            val result = HashMap<String, Long>()

-            ClassReader(bytes).accept(object : ClassVisitor(Opcodes.API_VERSION) {
-                override fun visitMethod(
-                    access: Int,
-                    name: String,
-                    desc: String,
-                    signature: String?,
-                    exceptions: Array<out String>?
-                ): MethodVisitor? {
-                    val dummyClassWriter = ClassWriter(Opcodes.API_VERSION)
+            ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) {
+                override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array<out String>?): MethodVisitor? {
+                    val dummyClassWriter = ClassWriter(Opcodes.ASM5)

-                    return object : MethodVisitor(Opcodes.API_VERSION, dummyClassWriter.visitMethod(0, name, desc, null, exceptions)) {
+                    return object : MethodVisitor(Opcodes.ASM5, dummyClassWriter.visitMethod(0, name, desc, null, exceptions)) {
                        override fun visitEnd() {
                            val jvmName = name + desc
                            if (jvmName !in inlineFunctions) return
@@ -511,35 +498,30 @@ open class IncrementalJvmCache(
            val newMap = getInlineFunctionsMap(kotlinClass.classHeader, kotlinClass.fileContents)
            if (newMap.isNotEmpty()) {
                storage[key] = newMap
-            } else {
+            }
+            else {
                storage.remove(key)
            }

            for (fn in oldMap.keys + newMap.keys) {
-                changesCollector.collectMemberIfValueWasChanged(
-                    kotlinClass.scopeFqName(),
-                    functionNameBySignature(fn),
-                    oldMap[fn],
-                    newMap[fn]
-                )
+                changesCollector.collectMemberIfValueWasChanged(kotlinClass.scopeFqName(), functionNameBySignature(fn), oldMap[fn], newMap[fn])
            }
        }

        // TODO get name in better way instead of using substringBefore
        private fun functionNameBySignature(signature: String): String =
-            signature.substringBefore("(")
+                signature.substringBefore("(")

        fun remove(className: JvmClassName) {
            storage.remove(className.internalName)
        }

        override fun dumpValue(value: Map<String, Long>): String =
-            value.dumpMap { java.lang.Long.toHexString(it) }
+                value.dumpMap { java.lang.Long.toHexString(it) }
    }
 }

-private object PathCollectionExternalizer :
-    CollectionExternalizer<String>(PathStringDescriptor, { THashSet(FileUtil.PATH_HASHING_STRATEGY) })
+private object PathCollectionExternalizer : CollectionExternalizer<String>(PathStringDescriptor, { THashSet(FileUtil.PATH_HASHING_STRATEGY) })

 sealed class ChangeInfo(val fqName: FqName) {
    open class MembersChanged(fqName: FqName, val names: Collection<String>) : ChangeInfo(fqName) {
@@ -559,10 +541,10 @@ sealed class ChangeInfo(val fqName: FqName) {
 }

 private fun LocalFileKotlinClass.scopeFqName() =
-    when (classHeader.kind) {
-        KotlinClassHeader.Kind.CLASS -> className.fqNameForClassNameWithoutDollars
-        else -> className.packageFqName
-    }
+        when (classHeader.kind) {
+            KotlinClassHeader.Kind.CLASS -> className.fqNameForClassNameWithoutDollars
+            else -> className.packageFqName
+        }

 fun ByteArray.md5(): Long {
    val d = MessageDigest.getInstance("MD5").digest(this)!!
@@ -574,24 +556,23 @@ fun ByteArray.md5(): Long {
            or ((d[5].toLong() and 0xFFL) shl 40)
            or ((d[6].toLong() and 0xFFL) shl 48)
            or ((d[7].toLong() and 0xFFL) shl 56)
-            )
+           )
 }

@TestOnly
-fun <K : Comparable<K>, V> Map<K, V>.dumpMap(dumpValue: (V) -> String): String =
-    buildString {
-        append("{")
-        for (key in keys.sorted()) {
-            if (length != 1) {
-                append(", ")
+fun <K : Comparable<K>, V> Map<K, V>.dumpMap(dumpValue: (V)->String): String =
+        buildString {
+            append("{")
+            for (key in keys.sorted()) {
+                if (length != 1) {
+                    append(", ")
+                }
+
+                val value = get(key)?.let(dumpValue) ?: "null"
+                append("$key -> $value")
            }
-
-            val value = get(key)?.let(dumpValue) ?: "null"
-            append("$key -> $value")
+            append("}")
        }
-        append("}")
-    }

-@TestOnly
-fun <T : Comparable<T>> Collection<T>.dumpCollection(): String =
-    "[${sorted().joinToString(", ", transform = Any::toString)}]"
+@TestOnly fun <T : Comparable<T>> Collection<T>.dumpCollection(): String =
+        "[${sorted().joinToString(", ", transform = Any::toString)}]"
--- a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalModuleInfo.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalModuleInfo.kt
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.incremental
-
-import java.io.File
-import java.io.Serializable
-
-data class IncrementalModuleEntry(
-    private val projectPath: String,
-    val name: String,
-    val buildDir: File,
-    val buildHistoryFile: File
-) : Serializable {
-    companion object {
-        private const val serialVersionUID = 0L
-    }
-}
-
-class IncrementalModuleInfo(
-    val projectRoot: File,
-    val dirToModule: Map<File, IncrementalModuleEntry>,
-    val nameToModules: Map<String, Set<IncrementalModuleEntry>>,
-    val jarToClassListFile: Map<File, File>,
-    // only for js and mpp
-    val jarToModule: Map<File, IncrementalModuleEntry>
-) : Serializable {
-    companion object {
-        private const val serialVersionUID = 0L
-    }
-}
--- a/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt
@@ -16,49 +16,34 @@

 package org.jetbrains.kotlin.incremental

+import org.jetbrains.kotlin.builtins.BuiltInSerializerProtocol
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.load.java.JavaVisibilities
 import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion
 import org.jetbrains.kotlin.metadata.java.JavaClassProtoBuf
-import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
-import org.jetbrains.kotlin.metadata.serialization.MutableVersionRequirementTable
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.serialization.DescriptorSerializer
 import org.jetbrains.kotlin.serialization.KotlinSerializerExtensionBase
-import org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInSerializerProtocol

 // It uses BuiltInSerializerProtocol for annotations serialization
 class JavaClassesSerializerExtension : KotlinSerializerExtensionBase(BuiltInSerializerProtocol) {
-    override val metadataVersion: BinaryVersion
-        get() = JvmMetadataVersion.INVALID_VERSION
-
-    override fun serializeClass(
-            descriptor: ClassDescriptor,
-            proto: ProtoBuf.Class.Builder,
-            versionRequirementTable: MutableVersionRequirementTable,
-            childSerializer: DescriptorSerializer
-    ) {
-        super.serializeClass(descriptor, proto, versionRequirementTable, childSerializer)
+    override fun serializeClass(descriptor: ClassDescriptor, proto: ProtoBuf.Class.Builder) {
+        super.serializeClass(descriptor, proto)
        if (descriptor.visibility == JavaVisibilities.PACKAGE_VISIBILITY) {
            proto.setExtension(JavaClassProtoBuf.isPackagePrivateClass, true)
        }
    }

-    override fun serializeConstructor(descriptor: ConstructorDescriptor,
-                                      proto: ProtoBuf.Constructor.Builder,
-                                      childSerializer: DescriptorSerializer) {
-        super.serializeConstructor(descriptor, proto, childSerializer)
+    override fun serializeConstructor(descriptor: ConstructorDescriptor, proto: ProtoBuf.Constructor.Builder) {
+        super.serializeConstructor(descriptor, proto)
        if (descriptor.visibility == JavaVisibilities.PACKAGE_VISIBILITY) {
            proto.setExtension(JavaClassProtoBuf.isPackagePrivateConstructor, true)
        }
    }

-    override fun serializeFunction(descriptor: FunctionDescriptor,
-                                   proto: ProtoBuf.Function.Builder,
-                                   childSerializer: DescriptorSerializer) {
-        super.serializeFunction(descriptor, proto, childSerializer)
+    override fun serializeFunction(descriptor: FunctionDescriptor, proto: ProtoBuf.Function.Builder) {
+        super.serializeFunction(descriptor, proto)
        if (descriptor.visibility == JavaVisibilities.PACKAGE_VISIBILITY) {
            proto.setExtension(JavaClassProtoBuf.isPackagePrivateMethod, true)
        }
@@ -68,13 +53,8 @@ class JavaClassesSerializerExtension : KotlinSerializerExtensionBase(BuiltInSeri
        }
    }

-    override fun serializeProperty(
-            descriptor: PropertyDescriptor,
-            proto: ProtoBuf.Property.Builder,
-            versionRequirementTable: MutableVersionRequirementTable?,
-            childSerializer: DescriptorSerializer
-    ) {
-        super.serializeProperty(descriptor, proto, versionRequirementTable, childSerializer)
+    override fun serializeProperty(descriptor: PropertyDescriptor, proto: ProtoBuf.Property.Builder) {
+        super.serializeProperty(descriptor, proto)
        if (descriptor.visibility == JavaVisibilities.PACKAGE_VISIBILITY) {
            proto.setExtension(JavaClassProtoBuf.isPackagePrivateField, true)
        }
--- a/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesTrackerImpl.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesTrackerImpl.kt
@@ -96,7 +96,7 @@ fun JavaClassDescriptor.convertToProto(): SerializedJavaClassWithSource {

    val extension = JavaClassesSerializerExtension()
    val classProto = try {
-        DescriptorSerializer.create(this, extension, null).classProto(this).build()
+        DescriptorSerializer.create(this, extension).classProto(this).build()
    } catch (e: Exception) {
        throw IllegalStateException(
            "Error during writing proto for descriptor: ${DescriptorRenderer.DEBUG_TEXT.render(this)}\n" +
--- a/build-common/src/org/jetbrains/kotlin/incremental/LookupStorage.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/LookupStorage.kt
@@ -30,18 +30,15 @@ import java.io.IOException
 import java.util.*


-open class LookupStorage(
-    targetDataDir: File,
-    pathConverter: FileToPathConverter
-) : BasicMapsOwner(targetDataDir) {
+open class LookupStorage(targetDataDir: File) : BasicMapsOwner(targetDataDir) {
    companion object {
        private val DELETED_TO_SIZE_TRESHOLD = 0.5
        private val MINIMUM_GARBAGE_COLLECTIBLE_SIZE = 10000
    }

    private val countersFile = "counters".storageFile
-    private val idToFile = registerMap(IdToFileMap("id-to-file".storageFile, pathConverter))
-    private val fileToId = registerMap(FileToIdMap("file-to-id".storageFile, pathConverter))
+    private val idToFile = registerMap(IdToFileMap("id-to-file".storageFile))
+    private val fileToId = registerMap(FileToIdMap("file-to-id".storageFile))
    private val lookupMap = registerMap(LookupMap("lookups".storageFile))

    @Volatile
@@ -75,13 +72,12 @@ open class LookupStorage(
    }

    @Synchronized
-    fun addAll(lookups: MultiMap<LookupSymbol, String>, allPaths: Set<String>) {
-        val pathToId = allPaths.sorted().keysToMap { addFileIfNeeded(File(it)) }
+    fun addAll(lookups: Set<Map.Entry<LookupSymbol, Collection<String>>>, allPaths: Set<String>) {
+        val pathToId = allPaths.keysToMap { addFileIfNeeded(File(it)) }

-        for (lookupSymbol in lookups.keySet().sorted()) {
+        for ((lookupSymbol, paths) in lookups) {
            val key = LookupSymbolKey(lookupSymbol.name, lookupSymbol.scope)
-            val paths = lookups[lookupSymbol]!!
-            val fileIds = paths.mapTo(TreeSet()) { pathToId[it]!! }
+            val fileIds = paths.mapTo(HashSet<Int>()) { pathToId[it]!! }
            fileIds.addAll(lookupMap[key] ?: emptySet())
            lookupMap[key] = fileIds
        }
@@ -156,7 +152,7 @@ open class LookupStorage(
        size = 0
        deletedCount = 0

-        for ((file, oldId) in oldFileToId.entries.sortedBy { it.key.path }) {
+        for ((file, oldId) in oldFileToId.entries) {
            val newId = addFileIfNeeded(file)
            oldIdToNewId[oldId] = newId
        }
@@ -178,19 +174,11 @@ open class LookupStorage(
        flush(false)
    }

-    @TestOnly
-    fun dump(lookupSymbols: Set<LookupSymbol>): String {
+    @TestOnly fun dump(lookupSymbols: Set<LookupSymbol>, basePath: File? = null): String {
        flush(false)

        val sb = StringBuilder()
        val p = Printer(sb)
-
-        p.println("====== File to id map")
-        p.println(fileToId.dump())
-
-        p.println("====== Id to file map")
-        p.println(idToFile.dump())
-
        val lookupsStrings = lookupSymbols.groupBy { LookupSymbolKey(it.name, it.scope) }

        for (lookup in lookupMap.keys.sorted()) {
@@ -198,11 +186,12 @@ open class LookupStorage(

            val key = if (lookup in lookupsStrings) {
                lookupsStrings[lookup]!!.map { "${it.scope}#${it.name}" }.sorted().joinToString(", ")
-            } else {
+            }
+            else {
                lookup.toString()
            }

-            val value = fileIds.map { it.toString() }.sorted().joinToString(", ")
+            val value = fileIds.map { idToFile[it]?.let { if (basePath == null) it.absolutePath else it.toRelativeString(basePath) } ?: it.toString() }.sorted().joinToString(", ")
            p.println("$key -> $value")
        }

@@ -228,11 +217,4 @@ class LookupTrackerImpl(private val delegate: LookupTracker) : LookupTracker {
    }
 }

-data class LookupSymbol(val name: String, val scope: String) : Comparable<LookupSymbol> {
-    override fun compareTo(other: LookupSymbol): Int {
-        val scopeCompare = scope.compareTo(other.scope)
-        if (scopeCompare != 0) return scopeCompare
-
-        return name.compareTo(other.name)
-    }
-}
+data class LookupSymbol(val name: String, val scope: String)
--- a/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt
@@ -177,7 +177,10 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
            if (!checkEquals(old.typeTable, new.typeTable)) return false
        }

-        if (!checkEqualsClassVersionRequirement(old, new)) return false
+        if (old.hasVersionRequirement() != new.hasVersionRequirement()) return false
+        if (old.hasVersionRequirement()) {
+            if (old.versionRequirement != new.versionRequirement) return false
+        }

        if (old.hasVersionRequirementTable() != new.hasVersionRequirementTable()) return false
        if (old.hasVersionRequirementTable()) {
@@ -248,7 +251,7 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
        ENUM_ENTRY_LIST,
        SEALED_SUBCLASS_FQ_NAME_LIST,
        TYPE_TABLE,
-        VERSION_REQUIREMENT_LIST,
+        VERSION_REQUIREMENT,
        VERSION_REQUIREMENT_TABLE,
        JVM_EXT_CLASS_MODULE_NAME,
        JVM_EXT_CLASS_LOCAL_VARIABLE_LIST,
@@ -299,7 +302,10 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
            if (!checkEquals(old.typeTable, new.typeTable)) result.add(ProtoBufClassKind.TYPE_TABLE)
        }

-        if (!checkEqualsClassVersionRequirement(old, new)) result.add(ProtoBufClassKind.VERSION_REQUIREMENT_LIST)
+        if (old.hasVersionRequirement() != new.hasVersionRequirement()) result.add(ProtoBufClassKind.VERSION_REQUIREMENT)
+        if (old.hasVersionRequirement()) {
+            if (old.versionRequirement != new.versionRequirement) result.add(ProtoBufClassKind.VERSION_REQUIREMENT)
+        }

        if (old.hasVersionRequirementTable() != new.hasVersionRequirementTable()) result.add(ProtoBufClassKind.VERSION_REQUIREMENT_TABLE)
        if (old.hasVersionRequirementTable()) {
@@ -398,7 +404,10 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
            if (!checkEquals(old.typeTable, new.typeTable)) return false
        }

-        if (!checkEqualsFunctionVersionRequirement(old, new)) return false
+        if (old.hasVersionRequirement() != new.hasVersionRequirement()) return false
+        if (old.hasVersionRequirement()) {
+            if (old.versionRequirement != new.versionRequirement) return false
+        }

        if (old.hasContract() != new.hasContract()) return false
        if (old.hasContract()) {
@@ -501,18 +510,16 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
            if (old.setterFlags != new.setterFlags) return false
        }

-        if (!checkEqualsPropertyVersionRequirement(old, new)) return false
+        if (old.hasVersionRequirement() != new.hasVersionRequirement()) return false
+        if (old.hasVersionRequirement()) {
+            if (old.versionRequirement != new.versionRequirement) return false
+        }

        if (old.hasExtension(JvmProtoBuf.propertySignature) != new.hasExtension(JvmProtoBuf.propertySignature)) return false
        if (old.hasExtension(JvmProtoBuf.propertySignature)) {
            if (!checkEquals(old.getExtension(JvmProtoBuf.propertySignature), new.getExtension(JvmProtoBuf.propertySignature))) return false
        }

-        if (old.hasExtension(JvmProtoBuf.flags) != new.hasExtension(JvmProtoBuf.flags)) return false
-        if (old.hasExtension(JvmProtoBuf.flags)) {
-            if (old.getExtension(JvmProtoBuf.flags) != new.getExtension(JvmProtoBuf.flags)) return false
-        }
-
        if (old.getExtensionCount(JsProtoBuf.propertyAnnotation) != new.getExtensionCount(JsProtoBuf.propertyAnnotation)) {
            return false
        }
@@ -522,24 +529,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
            }
        }

-        if (old.getExtensionCount(JsProtoBuf.propertyGetterAnnotation) != new.getExtensionCount(JsProtoBuf.propertyGetterAnnotation)) {
-            return false
-        }
-        else {
-            for(i in 0..old.getExtensionCount(JsProtoBuf.propertyGetterAnnotation) - 1) {
-                if (!checkEquals(old.getExtension(JsProtoBuf.propertyGetterAnnotation, i), new.getExtension(JsProtoBuf.propertyGetterAnnotation, i))) return false
-            }
-        }
-
-        if (old.getExtensionCount(JsProtoBuf.propertySetterAnnotation) != new.getExtensionCount(JsProtoBuf.propertySetterAnnotation)) {
-            return false
-        }
-        else {
-            for(i in 0..old.getExtensionCount(JsProtoBuf.propertySetterAnnotation) - 1) {
-                if (!checkEquals(old.getExtension(JsProtoBuf.propertySetterAnnotation, i), new.getExtension(JsProtoBuf.propertySetterAnnotation, i))) return false
-            }
-        }
-
        if (old.hasExtension(JsProtoBuf.compileTimeValue) != new.hasExtension(JsProtoBuf.compileTimeValue)) return false
        if (old.hasExtension(JsProtoBuf.compileTimeValue)) {
            if (!checkEquals(old.getExtension(JsProtoBuf.compileTimeValue), new.getExtension(JsProtoBuf.compileTimeValue))) return false
@@ -569,24 +558,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
            }
        }

-        if (old.getExtensionCount(BuiltInsProtoBuf.propertyGetterAnnotation) != new.getExtensionCount(BuiltInsProtoBuf.propertyGetterAnnotation)) {
-            return false
-        }
-        else {
-            for(i in 0..old.getExtensionCount(BuiltInsProtoBuf.propertyGetterAnnotation) - 1) {
-                if (!checkEquals(old.getExtension(BuiltInsProtoBuf.propertyGetterAnnotation, i), new.getExtension(BuiltInsProtoBuf.propertyGetterAnnotation, i))) return false
-            }
-        }
-
-        if (old.getExtensionCount(BuiltInsProtoBuf.propertySetterAnnotation) != new.getExtensionCount(BuiltInsProtoBuf.propertySetterAnnotation)) {
-            return false
-        }
-        else {
-            for(i in 0..old.getExtensionCount(BuiltInsProtoBuf.propertySetterAnnotation) - 1) {
-                if (!checkEquals(old.getExtension(BuiltInsProtoBuf.propertySetterAnnotation, i), new.getExtension(BuiltInsProtoBuf.propertySetterAnnotation, i))) return false
-            }
-        }
-
        if (old.hasExtension(BuiltInsProtoBuf.compileTimeValue) != new.hasExtension(BuiltInsProtoBuf.compileTimeValue)) return false
        if (old.hasExtension(BuiltInsProtoBuf.compileTimeValue)) {
            if (!checkEquals(old.getExtension(BuiltInsProtoBuf.compileTimeValue), new.getExtension(BuiltInsProtoBuf.compileTimeValue))) return false
@@ -627,7 +598,10 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR

        if (!checkEqualsTypeAliasAnnotation(old, new)) return false

-        if (!checkEqualsTypeAliasVersionRequirement(old, new)) return false
+        if (old.hasVersionRequirement() != new.hasVersionRequirement()) return false
+        if (old.hasVersionRequirement()) {
+            if (old.versionRequirement != new.versionRequirement) return false
+        }

        return true
    }
@@ -809,7 +783,10 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR

        if (!checkEqualsConstructorValueParameter(old, new)) return false

-        if (!checkEqualsConstructorVersionRequirement(old, new)) return false
+        if (old.hasVersionRequirement() != new.hasVersionRequirement()) return false
+        if (old.hasVersionRequirement()) {
+            if (old.versionRequirement != new.versionRequirement) return false
+        }

        if (old.hasExtension(JvmProtoBuf.constructorSignature) != new.hasExtension(JvmProtoBuf.constructorSignature)) return false
        if (old.hasExtension(JvmProtoBuf.constructorSignature)) {
@@ -1013,16 +990,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR

        if (!checkEqualsAnnotationArgumentValueArrayElement(old, new)) return false

-        if (old.hasArrayDimensionCount() != new.hasArrayDimensionCount()) return false
-        if (old.hasArrayDimensionCount()) {
-            if (old.arrayDimensionCount != new.arrayDimensionCount) return false
-        }
-
-        if (old.hasFlags() != new.hasFlags()) return false
-        if (old.hasFlags()) {
-            if (old.flags != new.flags) return false
-        }
-
        return true
    }

@@ -1285,16 +1252,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
        return true
    }

-    open fun checkEqualsClassVersionRequirement(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean {
-        if (old.versionRequirementCount != new.versionRequirementCount) return false
-
-        for(i in 0..old.versionRequirementCount - 1) {
-            if (old.getVersionRequirement(i) != new.getVersionRequirement(i)) return false
-        }
-
-        return true
-    }
-
    open fun checkEqualsFunctionTypeParameter(old: ProtoBuf.Function, new: ProtoBuf.Function): Boolean {
        if (old.typeParameterCount != new.typeParameterCount) return false

@@ -1315,16 +1272,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
        return true
    }

-    open fun checkEqualsFunctionVersionRequirement(old: ProtoBuf.Function, new: ProtoBuf.Function): Boolean {
-        if (old.versionRequirementCount != new.versionRequirementCount) return false
-
-        for(i in 0..old.versionRequirementCount - 1) {
-            if (old.getVersionRequirement(i) != new.getVersionRequirement(i)) return false
-        }
-
-        return true
-    }
-
    open fun checkEqualsPropertyTypeParameter(old: ProtoBuf.Property, new: ProtoBuf.Property): Boolean {
        if (old.typeParameterCount != new.typeParameterCount) return false

@@ -1335,16 +1282,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
        return true
    }

-    open fun checkEqualsPropertyVersionRequirement(old: ProtoBuf.Property, new: ProtoBuf.Property): Boolean {
-        if (old.versionRequirementCount != new.versionRequirementCount) return false
-
-        for(i in 0..old.versionRequirementCount - 1) {
-            if (old.getVersionRequirement(i) != new.getVersionRequirement(i)) return false
-        }
-
-        return true
-    }
-
    open fun checkEqualsTypeAliasTypeParameter(old: ProtoBuf.TypeAlias, new: ProtoBuf.TypeAlias): Boolean {
        if (old.typeParameterCount != new.typeParameterCount) return false

@@ -1365,16 +1302,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
        return true
    }

-    open fun checkEqualsTypeAliasVersionRequirement(old: ProtoBuf.TypeAlias, new: ProtoBuf.TypeAlias): Boolean {
-        if (old.versionRequirementCount != new.versionRequirementCount) return false
-
-        for(i in 0..old.versionRequirementCount - 1) {
-            if (old.getVersionRequirement(i) != new.getVersionRequirement(i)) return false
-        }
-
-        return true
-    }
-
    open fun checkEqualsTypeTableType(old: ProtoBuf.TypeTable, new: ProtoBuf.TypeTable): Boolean {
        if (old.typeCount != new.typeCount) return false

@@ -1435,16 +1362,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR
        return true
    }

-    open fun checkEqualsConstructorVersionRequirement(old: ProtoBuf.Constructor, new: ProtoBuf.Constructor): Boolean {
-        if (old.versionRequirementCount != new.versionRequirementCount) return false
-
-        for(i in 0..old.versionRequirementCount - 1) {
-            if (old.getVersionRequirement(i) != new.getVersionRequirement(i)) return false
-        }
-
-        return true
-    }
-
    open fun checkEqualsAnnotationArgument(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean {
        if (old.argumentCount != new.argumentCount) return false

@@ -1635,8 +1552,8 @@ fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) ->
        hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes)
    }

-    for(i in 0..versionRequirementCount - 1) {
-        hashCode = 31 * hashCode + getVersionRequirement(i)
+    if (hasVersionRequirement()) {
+        hashCode = 31 * hashCode + versionRequirement
    }

    if (hasVersionRequirementTable()) {
@@ -1715,8 +1632,8 @@ fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int)
        hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes)
    }

-    for(i in 0..versionRequirementCount - 1) {
-        hashCode = 31 * hashCode + getVersionRequirement(i)
+    if (hasVersionRequirement()) {
+        hashCode = 31 * hashCode + versionRequirement
    }

    if (hasContract()) {
@@ -1799,30 +1716,18 @@ fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int)
        hashCode = 31 * hashCode + setterFlags
    }

-    for(i in 0..versionRequirementCount - 1) {
-        hashCode = 31 * hashCode + getVersionRequirement(i)
+    if (hasVersionRequirement()) {
+        hashCode = 31 * hashCode + versionRequirement
    }

    if (hasExtension(JvmProtoBuf.propertySignature)) {
        hashCode = 31 * hashCode + getExtension(JvmProtoBuf.propertySignature).hashCode(stringIndexes, fqNameIndexes)
    }

-    if (hasExtension(JvmProtoBuf.flags)) {
-        hashCode = 31 * hashCode + getExtension(JvmProtoBuf.flags)
-    }
-
    for(i in 0..getExtensionCount(JsProtoBuf.propertyAnnotation) - 1) {
        hashCode = 31 * hashCode + getExtension(JsProtoBuf.propertyAnnotation, i).hashCode(stringIndexes, fqNameIndexes)
    }

-    for(i in 0..getExtensionCount(JsProtoBuf.propertyGetterAnnotation) - 1) {
-        hashCode = 31 * hashCode + getExtension(JsProtoBuf.propertyGetterAnnotation, i).hashCode(stringIndexes, fqNameIndexes)
-    }
-
-    for(i in 0..getExtensionCount(JsProtoBuf.propertySetterAnnotation) - 1) {
-        hashCode = 31 * hashCode + getExtension(JsProtoBuf.propertySetterAnnotation, i).hashCode(stringIndexes, fqNameIndexes)
-    }
-
    if (hasExtension(JsProtoBuf.compileTimeValue)) {
        hashCode = 31 * hashCode + getExtension(JsProtoBuf.compileTimeValue).hashCode(stringIndexes, fqNameIndexes)
    }
@@ -1843,14 +1748,6 @@ fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int)
        hashCode = 31 * hashCode + getExtension(BuiltInsProtoBuf.propertyAnnotation, i).hashCode(stringIndexes, fqNameIndexes)
    }

-    for(i in 0..getExtensionCount(BuiltInsProtoBuf.propertyGetterAnnotation) - 1) {
-        hashCode = 31 * hashCode + getExtension(BuiltInsProtoBuf.propertyGetterAnnotation, i).hashCode(stringIndexes, fqNameIndexes)
-    }
-
-    for(i in 0..getExtensionCount(BuiltInsProtoBuf.propertySetterAnnotation) - 1) {
-        hashCode = 31 * hashCode + getExtension(BuiltInsProtoBuf.propertySetterAnnotation, i).hashCode(stringIndexes, fqNameIndexes)
-    }
-
    if (hasExtension(BuiltInsProtoBuf.compileTimeValue)) {
        hashCode = 31 * hashCode + getExtension(BuiltInsProtoBuf.compileTimeValue).hashCode(stringIndexes, fqNameIndexes)
    }
@@ -1891,8 +1788,8 @@ fun ProtoBuf.TypeAlias.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int
        hashCode = 31 * hashCode + getAnnotation(i).hashCode(stringIndexes, fqNameIndexes)
    }

-    for(i in 0..versionRequirementCount - 1) {
-        hashCode = 31 * hashCode + getVersionRequirement(i)
+    if (hasVersionRequirement()) {
+        hashCode = 31 * hashCode + versionRequirement
    }

    return hashCode
@@ -2049,8 +1946,8 @@ fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I
        hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes)
    }

-    for(i in 0..versionRequirementCount - 1) {
-        hashCode = 31 * hashCode + getVersionRequirement(i)
+    if (hasVersionRequirement()) {
+        hashCode = 31 * hashCode + versionRequirement
    }

    if (hasExtension(JvmProtoBuf.constructorSignature)) {
@@ -2223,14 +2120,6 @@ fun ProtoBuf.Annotation.Argument.Value.hashCode(stringIndexes: (Int) -> Int, fqN
        hashCode = 31 * hashCode + getArrayElement(i).hashCode(stringIndexes, fqNameIndexes)
    }

-    if (hasArrayDimensionCount()) {
-        hashCode = 31 * hashCode + arrayDimensionCount
-    }
-
-    if (hasFlags()) {
-        hashCode = 31 * hashCode + flags
-    }
-
    return hashCode
 }

--- a/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt
@@ -16,6 +16,8 @@

 package org.jetbrains.kotlin.incremental

+import com.intellij.openapi.util.io.FileUtil
+import com.intellij.openapi.util.text.StringUtil
 import org.jetbrains.kotlin.build.GeneratedFile
 import org.jetbrains.kotlin.build.GeneratedJvmClass
 import org.jetbrains.kotlin.build.JvmSourceRoot
@@ -29,20 +31,14 @@ import org.jetbrains.kotlin.modules.TargetId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.progress.CompilationCanceledStatus
 import org.jetbrains.kotlin.synthetic.SAM_LOOKUP_NAME
-import org.jetbrains.kotlin.utils.addToStdlib.flattenTo
-import org.jetbrains.kotlin.utils.keysToMap
 import java.io.File
 import java.util.*
-import kotlin.collections.HashSet
-
-const val DELETE_MODULE_FILE_PROPERTY = "kotlin.delete.module.file.after.build"

 fun makeModuleFile(
        name: String,
        isTest: Boolean,
        outputDir: File,
        sourcesToCompile: Iterable<File>,
-        commonSources: Iterable<File>,
        javaSourceRoots: Iterable<JvmSourceRoot>,
        classpath: Iterable<File>,
        friendDirs: Iterable<File>
@@ -57,7 +53,6 @@ fun makeModuleFile(
            sourcesToCompile.map { it.absoluteFile },
            javaSourceRoots,
            classpath,
-            commonSources.map { it.absoluteFile },
            null,
            "java-production",
            isTest,
@@ -66,23 +61,11 @@ fun makeModuleFile(
            friendDirs
    )

-    val scriptFile = File.createTempFile("kjps", sanitizeJavaIdentifier(name) + ".script.xml")
-    scriptFile.writeText(builder.asText().toString())
+    val scriptFile = File.createTempFile("kjps", StringUtil.sanitizeJavaIdentifier(name) + ".script.xml")
+    FileUtil.writeToFile(scriptFile, builder.asText().toString())
    return scriptFile
 }

-private fun sanitizeJavaIdentifier(string: String) =
-    buildString {
-        for (char in string) {
-            if (char.isJavaIdentifierPart()) {
-                if (length == 0 && !char.isJavaIdentifierStart()) {
-                    append('_')
-                }
-                append(char)
-            }
-        }
-    }
-
 fun makeCompileServices(
        incrementalCaches: Map<TargetId, IncrementalCache>,
        lookupTracker: LookupTracker,
@@ -127,7 +110,7 @@ fun LookupStorage.update(

    removeLookupsFrom(filesToCompile.asSequence() + removedFiles.asSequence())

-    addAll(lookupTracker.lookups, lookupTracker.pathInterner.values)
+    addAll(lookupTracker.lookups.entrySet(), lookupTracker.pathInterner.values)
 }

 data class DirtyData(
@@ -143,11 +126,10 @@ fun ChangesCollector.getDirtyData(
    val dirtyClassesFqNames = HashSet<FqName>()

    for (change in changes()) {
-        reporter.reportVerbose { "Process $change" }
+        reporter.report { "Process $change" }

        if (change is ChangeInfo.SignatureChanged) {
            val fqNames = if (!change.areSubclassesAffected) listOf(change.fqName) else withSubtypes(change.fqName, caches)
-            dirtyClassesFqNames.addAll(fqNames)

            for (classFqName in fqNames) {
                assert(!classFqName.isRoot) { "$classFqName is root when processing $change" }
@@ -156,7 +138,8 @@ fun ChangesCollector.getDirtyData(
                val name = classFqName.shortName().identifier
                dirtyLookupSymbols.add(LookupSymbol(name, scope))
            }
-        } else if (change is ChangeInfo.MembersChanged) {
+        }
+        else if (change is ChangeInfo.MembersChanged) {
            val fqNames = withSubtypes(change.fqName, caches)
            // need to recompile subtypes because changed member might break override
            dirtyClassesFqNames.addAll(fqNames)
@@ -173,16 +156,16 @@ fun ChangesCollector.getDirtyData(
 }

 fun mapLookupSymbolsToFiles(
-    lookupStorage: LookupStorage,
-    lookupSymbols: Iterable<LookupSymbol>,
-    reporter: ICReporter,
-    excludes: Set<File> = emptySet()
+        lookupStorage: LookupStorage,
+        lookupSymbols: Iterable<LookupSymbol>,
+        reporter: ICReporter,
+        excludes: Set<File> = emptySet()
 ): Set<File> {
    val dirtyFiles = HashSet<File>()

    for (lookup in lookupSymbols) {
        val affectedFiles = lookupStorage.get(lookup).map(::File).filter { it !in excludes }
-        reporter.reportMarkDirtyMember(affectedFiles, scope = lookup.scope, name = lookup.name)
+        reporter.report { "${lookup.scope}#${lookup.name} caused recompilation of: ${reporter.pathsAsString(affectedFiles)}" }
        dirtyFiles.addAll(affectedFiles)
    }

@@ -195,22 +178,19 @@ fun mapClassesFqNamesToFiles(
    reporter: ICReporter,
    excludes: Set<File> = emptySet()
 ): Set<File> {
-    val fqNameToAffectedFiles = HashMap<FqName, MutableSet<File>>()
+    val dirtyFiles = HashSet<File>()

    for (cache in caches) {
-        for (classFqName in classesFqNames) {
-            val srcFile = cache.getSourceFileIfClass(classFqName)
+        for (dirtyClassFqName in classesFqNames) {
+            val srcFile = cache.getSourceFileIfClass(dirtyClassFqName)
            if (srcFile == null || srcFile in excludes || srcFile.isJavaFile()) continue

-            fqNameToAffectedFiles.getOrPut(classFqName) { HashSet() }.add(srcFile)
+            reporter.report { ("Class $dirtyClassFqName caused recompilation of: ${reporter.pathsAsString(srcFile)}") }
+            dirtyFiles.add(srcFile)
        }
    }

-    for ((classFqName, affectedFiles) in fqNameToAffectedFiles) {
-        reporter.reportMarkDirtyClass(affectedFiles, classFqName.asString())
-    }
-
-    return fqNameToAffectedFiles.values.flattenTo(HashSet())
+    return dirtyFiles
 }

 fun withSubtypes(
--- a/build-common/src/org/jetbrains/kotlin/incremental/fileUtils.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/fileUtils.kt
@@ -21,8 +21,11 @@ import java.io.File
 fun File.isJavaFile() =
        extension.equals("java", ignoreCase = true)

-fun File.isKotlinFile(sourceFilesExtensions: List<String>): Boolean =
-    !isJavaFile() && sourceFilesExtensions.any { it.equals(extension, ignoreCase = true) }
+fun File.isKotlinFile(): Boolean =
+    extension.let {
+        "kt".equals(it, ignoreCase = true) ||
+        "kts".equals(it, ignoreCase = true)
+    }

 fun File.isClassFile(): Boolean =
        extension.equals("class", ignoreCase = true)
--- a/build-common/src/org/jetbrains/kotlin/incremental/js/IncrementalDataProviderFromCache.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/js/IncrementalDataProviderFromCache.kt
@@ -1,12 +1,11 @@
 /*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
 */

 package org.jetbrains.kotlin.incremental.js

 import org.jetbrains.kotlin.incremental.IncrementalJsCache
-import org.jetbrains.kotlin.utils.JsMetadataVersion
 import java.io.File

 class IncrementalDataProviderFromCache(private val cache: IncrementalJsCache) : IncrementalDataProvider {
@@ -15,10 +14,4 @@ class IncrementalDataProviderFromCache(private val cache: IncrementalJsCache) :

    override val compiledPackageParts: Map<File, TranslationResultValue>
        get() = cache.nonDirtyPackageParts()
-
-    override val metadataVersion: IntArray
-        get() = JsMetadataVersion.INSTANCE.toArray() // TODO: store and load correct metadata version
-
-    override val packageMetadata: Map<String, ByteArray>
-        get() = cache.packageMetadata()
-}
+}
--- a/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt
@@ -223,7 +223,7 @@ class DifferenceCalculatorForClass(
                ProtoBufClassKind.TYPE_TABLE -> {
                    // TODO
                }
-                ProtoCompareGenerated.ProtoBufClassKind.VERSION_REQUIREMENT_LIST,
+                ProtoCompareGenerated.ProtoBufClassKind.VERSION_REQUIREMENT,
                ProtoCompareGenerated.ProtoBufClassKind.VERSION_REQUIREMENT_TABLE -> {
                    // TODO
                }
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/BasicMap.kt.192
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/BasicMap.kt.192
@@ -1,90 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * 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.jetbrains.kotlin.incremental.storage
-
-import com.intellij.util.io.DataExternalizer
-import com.intellij.util.io.EnumeratorStringDescriptor
-import com.intellij.util.io.KeyDescriptor
-import org.jetbrains.annotations.TestOnly
-import org.jetbrains.kotlin.utils.Printer
-import java.io.File
-
-abstract class BasicMap<K : Comparable<K>, V>(
-        storageFile: File,
-        keyDescriptor: KeyDescriptor<K>,
-        valueExternalizer: DataExternalizer<V>
-) {
-    protected val storage: LazyStorage<K, V>
-    private val nonCachingStorage = System.getProperty("kotlin.jps.non.caching.storage")?.toBoolean() ?: false
-
-    init {
-        storage = if (nonCachingStorage) {
-            NonCachingLazyStorage(storageFile, keyDescriptor, valueExternalizer)
-        } else {
-            CachingLazyStorage(storageFile, keyDescriptor, valueExternalizer)
-        }
-    }
-
-    fun clean() {
-        storage.clean()
-    }
-
-    fun flush(memoryCachesOnly: Boolean) {
-        storage.flush(memoryCachesOnly)
-    }
-
-    fun close() {
-        storage.close()
-    }
-
-    @TestOnly
-    fun dump(): String {
-        return with(StringBuilder()) {
-            with(Printer(this)) {
-                println(this@BasicMap::class.java.simpleName)
-                pushIndent()
-
-                for (key in storage.keys.sorted()) {
-                    println("${dumpKey(key)} -> ${dumpValue(storage[key]!!)}")
-                }
-
-                popIndent()
-            }
-
-            this
-        }.toString()
-    }
-
-    @TestOnly
-    protected abstract fun dumpKey(key: K): String
-
-    @TestOnly
-    protected abstract fun dumpValue(value: V): String
-}
-
-abstract class BasicStringMap<V>(
-        storageFile: File,
-        keyDescriptor: KeyDescriptor<String>,
-        valueExternalizer: DataExternalizer<V>
-) : BasicMap<String, V>(storageFile, keyDescriptor, valueExternalizer) {
-    constructor(
-            storageFile: File,
-            valueExternalizer: DataExternalizer<V>
-    ) : this(storageFile, EnumeratorStringDescriptor.INSTANCE, valueExternalizer)
-
-    override fun dumpKey(key: String): String = key
-}
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/CachingLazyStorage.kt.192
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/CachingLazyStorage.kt.192
@@ -1,108 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * 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.jetbrains.kotlin.incremental.storage
-
-import com.intellij.util.io.DataExternalizer
-import com.intellij.util.io.KeyDescriptor
-import com.intellij.util.io.PersistentHashMap
-import java.io.File
-
-
-/**
- * It's lazy in a sense that PersistentHashMap is created only on write
- */
-class CachingLazyStorage<K, V>(
-    private val storageFile: File,
-    private val keyDescriptor: KeyDescriptor<K>,
-    private val valueExternalizer: DataExternalizer<V>
-) : LazyStorage<K, V> {
-    @Volatile
-    private var storage: PersistentHashMap<K, V>? = null
-
-    @Synchronized
-    private fun getStorageIfExists(): PersistentHashMap<K, V>? {
-        if (storage != null) return storage
-
-        if (storageFile.exists()) {
-            storage = createMap()
-            return storage
-        }
-
-        return null
-    }
-
-    @Synchronized
-    private fun getStorageOrCreateNew(): PersistentHashMap<K, V> {
-        if (storage == null) {
-            storage = createMap()
-        }
-
-        return storage!!
-    }
-
-    override val keys: Collection<K>
-        get() = getStorageIfExists()?.allKeysWithExistingMapping ?: listOf()
-
-    override operator fun contains(key: K): Boolean =
-        getStorageIfExists()?.containsMapping(key) ?: false
-
-    override operator fun get(key: K): V? =
-        getStorageIfExists()?.get(key)
-
-    override operator fun set(key: K, value: V) {
-        getStorageOrCreateNew().put(key, value)
-    }
-
-    override fun remove(key: K) {
-        getStorageIfExists()?.remove(key)
-    }
-
-    override fun append(key: K, value: V) {
-        getStorageOrCreateNew().appendData(key, { valueExternalizer.save(it, value) })
-    }
-
-    @Synchronized
-    override fun clean() {
-        try {
-            storage?.close()
-        } catch (ignored: Throwable) {
-        }
-
-        PersistentHashMap.deleteFilesStartingWith(storageFile)
-        storage = null
-    }
-
-    @Synchronized
-    override fun flush(memoryCachesOnly: Boolean) {
-        val existingStorage = storage ?: return
-
-        if (memoryCachesOnly) {
-            if (existingStorage.isDirty) {
-                existingStorage.dropMemoryCaches()
-            }
-        } else {
-            existingStorage.force()
-        }
-    }
-
-    @Synchronized
-    override fun close() {
-        storage?.close()
-    }
-
-    private fun createMap(): PersistentHashMap<K, V> = PersistentHashMap(storageFile, keyDescriptor, valueExternalizer)
-}
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/ClassOneToManyMap.kt.192
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/ClassOneToManyMap.kt.192
@@ -1,55 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * 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.jetbrains.kotlin.incremental.storage
-
-import org.jetbrains.kotlin.incremental.dumpCollection
-import org.jetbrains.kotlin.name.FqName
-import java.io.File
-
-internal open class ClassOneToManyMap(
-        storageFile: File
-) : BasicStringMap<Collection<String>>(storageFile, StringCollectionExternalizer) {
-    override fun dumpValue(value: Collection<String>): String = value.dumpCollection()
-
-    fun add(key: FqName, value: FqName) {
-        storage.append(key.asString(), listOf(value.asString()))
-    }
-
-    operator fun get(key: FqName): Collection<FqName> =
-            storage[key.asString()]?.map(::FqName) ?: setOf()
-
-    operator fun set(key: FqName, values: Collection<FqName>) {
-        if (values.isEmpty()) {
-            remove(key)
-            return
-        }
-
-        storage[key.asString()] = values.map(FqName::asString)
-    }
-
-    fun remove(key: FqName) {
-        storage.remove(key.asString())
-    }
-
-    fun removeValues(key: FqName, removed: Set<FqName>) {
-        val notRemoved = this[key].filter { it !in removed }
-        this[key] = notRemoved
-    }
-}
-
-internal class SubtypesMap(storageFile: File) : ClassOneToManyMap(storageFile)
-internal class SupertypesMap(storageFile: File) : ClassOneToManyMap(storageFile)
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/ComplementarySourceFilesMap.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/ComplementarySourceFilesMap.kt
@@ -1,30 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.incremental.storage
-
-import org.jetbrains.kotlin.incremental.dumpCollection
-import java.io.File
-
-class ComplementarySourceFilesMap(
-    storageFile: File,
-    private val pathConverter: FileToPathConverter
-) : BasicStringMap<Collection<String>>(storageFile, PathStringDescriptor, StringCollectionExternalizer) {
-
-    operator fun set(sourceFile: File, complementaryFiles: Collection<File>) {
-        storage[pathConverter.toPath(sourceFile)] = pathConverter.toPaths(complementaryFiles)
-    }
-
-    operator fun get(sourceFile: File): Collection<File> {
-        val paths = storage[pathConverter.toPath(sourceFile)].orEmpty()
-        return pathConverter.toFiles(paths)
-    }
-
-    override fun dumpValue(value: Collection<String>) =
-        value.dumpCollection()
-
-    fun remove(file: File): Collection<File> =
-        get(file).also { storage.remove(pathConverter.toPath(file)) }
-}
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/FileToIdMap.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/FileToIdMap.kt
@@ -18,27 +18,26 @@ package org.jetbrains.kotlin.incremental.storage

 import java.io.File

-internal class FileToIdMap(
-    file: File,
-    private val pathConverter: FileToPathConverter
-) : BasicStringMap<Int>(file, IntExternalizer) {
+internal class FileToIdMap(file: File) : BasicMap<File, Int>(file, FileKeyDescriptor, IntExternalizer) {
+    override fun dumpKey(key: File): String = key.toString()
+
    override fun dumpValue(value: Int): String = value.toString()

-    operator fun get(file: File): Int? = storage[pathConverter.toPath(file)]
+    operator fun get(file: File): Int? = storage[file]

    operator fun set(file: File, id: Int) {
-        storage[pathConverter.toPath(file)] = id
+        storage[file] = id
    }

    fun remove(file: File) {
-        storage.remove(pathConverter.toPath(file))
+        storage.remove(file)
    }

    fun toMap(): Map<File, Int> {
        val result = HashMap<File, Int>()
        for (key in storage.keys) {
            val value = storage[key] ?: continue
-            result[pathConverter.toFile(key)] = value
+            result[key] = value
        }
        return result
    }
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/FileToPathConverter.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/FileToPathConverter.kt
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.incremental.storage
-
-import java.io.File
-
-interface FileToPathConverter {
-    fun toPath(file: File): String
-    fun toFile(path: String): File
-}
-
-fun FileToPathConverter.toPaths(files: Collection<File>): List<String> =
-    files.map { toPath(it) }
-
-fun FileToPathConverter.toFiles(paths: Collection<String>): List<File> =
-    paths.map { toFile(it) }
-
-object FileToCanonicalPathConverter : FileToPathConverter {
-    override fun toPath(file: File): String = file.canonicalPath
-
-    override fun toFile(path: String): File = File(path)
-}
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/FilesMap.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/FilesMap.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.incremental.storage
+
+import org.jetbrains.kotlin.incremental.dumpCollection
+import java.io.File
+
+class FilesMap(storageFile: File)
+    : BasicStringMap<Collection<String>>(storageFile, PathStringDescriptor, StringCollectionExternalizer) {
+
+    operator fun set(sourceFile: File, outputFiles: Collection<File>) {
+        storage[sourceFile.absolutePath] = outputFiles.map { it.absolutePath }
+    }
+
+    operator fun get(sourceFile: File): Collection<File> =
+        storage[sourceFile.absolutePath].orEmpty().map(::File)
+
+    override fun dumpValue(value: Collection<String>) =
+        value.dumpCollection()
+
+    fun remove(file: File): Collection<File> =
+        get(file).also { storage.remove(file.absolutePath) }
+}
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/IdToFileMap.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/IdToFileMap.kt
@@ -16,24 +16,20 @@

 package org.jetbrains.kotlin.incremental.storage

-import com.intellij.util.io.EnumeratorStringDescriptor
 import com.intellij.util.io.ExternalIntegerKeyDescriptor
 import java.io.File

-internal class IdToFileMap(
-    file: File,
-    private val pathConverter: FileToPathConverter
-) : BasicMap<Int, String>(file, ExternalIntegerKeyDescriptor(), EnumeratorStringDescriptor.INSTANCE) {
+internal class IdToFileMap(file: File) : BasicMap<Int, File>(file, ExternalIntegerKeyDescriptor(), FileKeyDescriptor) {
    override fun dumpKey(key: Int): String = key.toString()

-    override fun dumpValue(value: String): String = value
+    override fun dumpValue(value: File): String = value.toString()

-    operator fun get(id: Int): File? = storage[id]?.let { pathConverter.toFile(it) }
+    operator fun get(id: Int): File? = storage[id]

    operator fun contains(id: Int): Boolean = id in storage

    operator fun set(id: Int, file: File) {
-        storage[id] = pathConverter.toPath(file)
+        storage[id] = file
    }

    fun remove(id: Int) {
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/LazyStorage.kt.192
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/LazyStorage.kt.192
@@ -1,29 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * 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.jetbrains.kotlin.incremental.storage
-
-interface LazyStorage<K, V> {
-    val keys: Collection<K>
-    operator fun contains(key: K): Boolean
-    operator fun get(key: K): V?
-    operator fun set(key: K, value: V)
-    fun remove(key: K)
-    fun append(key: K, value: V)
-    fun clean()
-    fun flush(memoryCachesOnly: Boolean)
-    fun close()
-}
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/LookupMap.kt.192
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/LookupMap.kt.192
@@ -1,42 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * 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.jetbrains.kotlin.incremental.storage
-
-import java.io.File
-
-internal class LookupMap(storage: File) : BasicMap<LookupSymbolKey, Collection<Int>>(storage, LookupSymbolKeyDescriptor, IntCollectionExternalizer) {
-    override fun dumpKey(key: LookupSymbolKey): String = key.toString()
-
-    override fun dumpValue(value: Collection<Int>): String = value.toString()
-
-    fun add(name: String, scope: String, fileId: Int) {
-        storage.append(LookupSymbolKey(name, scope), listOf(fileId))
-    }
-
-    operator fun get(key: LookupSymbolKey): Collection<Int>? = storage[key]
-
-    operator fun set(key: LookupSymbolKey, fileIds: Set<Int>) {
-        storage[key] = fileIds
-    }
-
-    fun remove(key: LookupSymbolKey) {
-        storage.remove(key)
-    }
-
-    val keys: Collection<LookupSymbolKey>
-        get() = storage.keys
-}
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/NonCachingLazyStorage.kt.192
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/NonCachingLazyStorage.kt.192
@@ -1,106 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * 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.jetbrains.kotlin.incremental.storage
-
-import com.intellij.util.io.DataExternalizer
-import com.intellij.util.io.KeyDescriptor
-import com.intellij.util.io.JpsPersistentHashMap
-import java.io.File
-
-
-class NonCachingLazyStorage<K, V>(
-    private val storageFile: File,
-    private val keyDescriptor: KeyDescriptor<K>,
-    private val valueExternalizer: DataExternalizer<V>
-) : LazyStorage<K, V> {
-    @Volatile
-    private var storage: JpsPersistentHashMap<K, V>? = null
-
-    @Synchronized
-    private fun getStorageIfExists(): JpsPersistentHashMap<K, V>? {
-        if (storage != null) return storage
-
-        if (storageFile.exists()) {
-            storage = createMap()
-            return storage
-        }
-
-        return null
-    }
-
-    @Synchronized
-    private fun getStorageOrCreateNew(): JpsPersistentHashMap<K, V> {
-        if (storage == null) {
-            storage = createMap()
-        }
-
-        return storage!!
-    }
-
-    override val keys: Collection<K>
-        get() = getStorageIfExists()?.allKeysWithExistingMapping ?: listOf()
-
-    override operator fun contains(key: K): Boolean =
-        getStorageIfExists()?.containsMapping(key) ?: false
-
-    override operator fun get(key: K): V? =
-        getStorageIfExists()?.get(key)
-
-    override operator fun set(key: K, value: V) {
-        getStorageOrCreateNew().put(key, value)
-    }
-
-    override fun remove(key: K) {
-        getStorageIfExists()?.remove(key)
-    }
-
-    override fun append(key: K, value: V) {
-        getStorageOrCreateNew().appendDataWithoutCache(key, value)
-    }
-
-    @Synchronized
-    override fun clean() {
-        try {
-            storage?.close()
-        } catch (ignored: Throwable) {
-        }
-
-        JpsPersistentHashMap.deleteFilesStartingWith(storageFile)
-        storage = null
-    }
-
-    @Synchronized
-    override fun flush(memoryCachesOnly: Boolean) {
-        val existingStorage = storage ?: return
-
-        if (memoryCachesOnly) {
-            if (existingStorage.isDirty) {
-                existingStorage.dropMemoryCaches()
-            }
-        } else {
-            existingStorage.force()
-        }
-    }
-
-    @Synchronized
-    override fun close() {
-        storage?.close()
-    }
-
-    private fun createMap(): JpsPersistentHashMap<K, V> =
-        JpsPersistentHashMap(storageFile, keyDescriptor, valueExternalizer)
-}
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/RelativeFileToPathConverter.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/RelativeFileToPathConverter.kt
@@ -1,34 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.incremental.storage
-
-import java.io.File
-
-open class RelativeFileToPathConverter(baseDirFile: File?) : FileToPathConverter {
-    private val baseDirPath = baseDirFile?.canonicalFile?.invariantSeparatorsPath
-
-    override fun toPath(file: File): String {
-        val path = file.canonicalFile.invariantSeparatorsPath
-        return when {
-            baseDirPath != null && path.startsWith(baseDirPath) ->
-                PROJECT_DIR_PLACEHOLDER + path.substring(baseDirPath.length)
-            else -> path
-        }
-    }
-
-    override fun toFile(path: String): File =
-        when {
-            path.startsWith(PROJECT_DIR_PLACEHOLDER) -> {
-                val basePath = baseDirPath ?: error("Could not get project root dir")
-                File(basePath + path.substring(PROJECT_DIR_PLACEHOLDER.length))
-            }
-            else -> File(path)
-        }
-
-    private companion object {
-        private const val PROJECT_DIR_PLACEHOLDER = "${'$'}PROJECT_DIR$"
-    }
-}
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/SourceToOutputMaps.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/SourceToOutputMaps.kt
@@ -21,40 +21,32 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import java.io.File

-internal class SourceToJvmNameMap(
-    storageFile: File,
-    pathConverter: FileToPathConverter
-) : AbstractSourceToOutputMap<JvmClassName>(JvmClassNameTransformer, storageFile, pathConverter)
-
-internal class SourceToFqNameMap(
-    storageFile: File,
-    pathConverter: FileToPathConverter
-) : AbstractSourceToOutputMap<FqName>(FqNameTransformer, storageFile, pathConverter)
+internal class SourceToJvmNameMap(storageFile: File) : AbstractSourceToOutputMap<JvmClassName>(JvmClassNameTransformer, storageFile)
+internal class SourceToFqNameMap(storageFile: File) : AbstractSourceToOutputMap<FqName>(FqNameTransformer, storageFile)

 internal abstract class AbstractSourceToOutputMap<Name>(
-    private val nameTransformer: NameTransformer<Name>,
-    storageFile: File,
-    private val pathConverter: FileToPathConverter
+        private val nameTransformer: NameTransformer<Name>,
+        storageFile: File
 ) : BasicStringMap<Collection<String>>(storageFile, PathStringDescriptor, StringCollectionExternalizer) {
    fun clearOutputsForSource(sourceFile: File) {
-        remove(pathConverter.toPath(sourceFile))
+        remove(sourceFile.absolutePath)
    }

    fun add(sourceFile: File, className: Name) {
-        storage.append(pathConverter.toPath(sourceFile), nameTransformer.asString(className))
+        storage.append(sourceFile.absolutePath, nameTransformer.asString(className))
    }

    fun contains(sourceFile: File): Boolean =
-        pathConverter.toPath(sourceFile) in storage
+            sourceFile.absolutePath in storage

    operator fun get(sourceFile: File): Collection<Name> =
-        storage[pathConverter.toPath(sourceFile)].orEmpty().map(nameTransformer::asName)
+            storage[sourceFile.absolutePath].orEmpty().map(nameTransformer::asName)

    fun getFqNames(sourceFile: File): Collection<FqName> =
-        storage[pathConverter.toPath(sourceFile)].orEmpty().map(nameTransformer::asFqName)
+        storage[sourceFile.absolutePath].orEmpty().map(nameTransformer::asFqName)

    override fun dumpValue(value: Collection<String>) =
-        value.dumpCollection()
+            value.dumpCollection()

    private fun remove(path: String) {
        storage.remove(path)
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/SourceToOutputMaps.kt.192
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/SourceToOutputMaps.kt.192
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * 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.jetbrains.kotlin.incremental.storage
-
-import org.jetbrains.kotlin.incremental.dumpCollection
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.resolve.jvm.JvmClassName
-import java.io.File
-
-internal class SourceToJvmNameMap(
-    storageFile: File,
-    pathConverter: FileToPathConverter
-) : AbstractSourceToOutputMap<JvmClassName>(JvmClassNameTransformer, storageFile, pathConverter)
-
-internal class SourceToFqNameMap(
-    storageFile: File,
-    pathConverter: FileToPathConverter
-) : AbstractSourceToOutputMap<FqName>(FqNameTransformer, storageFile, pathConverter)
-
-internal abstract class AbstractSourceToOutputMap<Name>(
-    private val nameTransformer: NameTransformer<Name>,
-    storageFile: File,
-    private val pathConverter: FileToPathConverter
-) : BasicStringMap<Collection<String>>(storageFile, PathStringDescriptor, StringCollectionExternalizer) {
-    fun clearOutputsForSource(sourceFile: File) {
-        remove(pathConverter.toPath(sourceFile))
-    }
-
-    fun add(sourceFile: File, className: Name) {
-        storage.append(pathConverter.toPath(sourceFile), listOf(nameTransformer.asString(className)))
-    }
-
-    fun contains(sourceFile: File): Boolean =
-        pathConverter.toPath(sourceFile) in storage
-
-    operator fun get(sourceFile: File): Collection<Name> =
-        storage[pathConverter.toPath(sourceFile)].orEmpty().map(nameTransformer::asName)
-
-    fun getFqNames(sourceFile: File): Collection<FqName> =
-        storage[pathConverter.toPath(sourceFile)].orEmpty().map(nameTransformer::asFqName)
-
-    override fun dumpValue(value: Collection<String>) =
-        value.dumpCollection()
-
-    private fun remove(path: String) {
-        storage.remove(path)
-    }
-}
--- a/build-common/src/org/jetbrains/kotlin/incremental/storage/externalizers.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/storage/externalizers.kt
@@ -177,6 +177,20 @@ object PathStringDescriptor : EnumeratorStringDescriptor() {
    override fun isEqual(val1: String, val2: String?) = FileUtil.pathsEqual(val1, val2)
 }

+object FileKeyDescriptor : KeyDescriptor<File> {
+    override fun read(input: DataInput): File = File(input.readUTF())
+
+    override fun save(output: DataOutput, value: File) {
+        output.writeUTF(value.canonicalPath)
+    }
+
+    override fun getHashCode(value: File?): Int =
+            FileUtil.FILE_HASHING_STRATEGY.computeHashCode(value)
+
+    override fun isEqual(val1: File?, val2: File?): Boolean =
+            FileUtil.FILE_HASHING_STRATEGY.equals(val1, val2)
+}
+
 open class CollectionExternalizer<T>(
        private val elementExternalizer: DataExternalizer<T>,
        private val newCollection: () -> MutableCollection<T>
--- a/build-common/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt
+++ b/build-common/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt
@@ -16,6 +16,8 @@

 package org.jetbrains.kotlin.modules

+import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName
+import com.intellij.openapi.util.text.StringUtil.escapeXml
 import org.jetbrains.kotlin.build.JvmSourceRoot
 import org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser.*
 import org.jetbrains.kotlin.config.IncrementalCompilation
@@ -32,18 +34,16 @@ class KotlinModuleXmlBuilder {
    }

    fun addModule(
-        moduleName: String,
-        outputDir: String,
-        sourceFiles: Iterable<File>,
-        javaSourceRoots: Iterable<JvmSourceRoot>,
-        classpathRoots: Iterable<File>,
-        commonSourceFiles: Iterable<File>,
-        modularJdkRoot: File?,
-        targetTypeId: String,
-        isTests: Boolean,
-        directoriesToFilterOut: Set<File>,
-        friendDirs: Iterable<File>
-    ): KotlinModuleXmlBuilder {
+            moduleName: String,
+            outputDir: String,
+            sourceFiles: Iterable<File>,
+            javaSourceRoots: Iterable<JvmSourceRoot>,
+            classpathRoots: Iterable<File>,
+            modularJdkRoot: File?,
+            targetTypeId: String,
+            isTests: Boolean,
+            directoriesToFilterOut: Set<File>,
+            friendDirs: Iterable<File>): KotlinModuleXmlBuilder {
        assert(!done) { "Already done" }

        p.println("<!-- Module script for ${if (isTests) "tests" else "production"} -->")
@@ -62,10 +62,6 @@ class KotlinModuleXmlBuilder {
            p.println("<", SOURCES, " ", PATH, "=\"", getEscapedPath(sourceFile), "\"/>")
        }

-        for (commonSourceFile in commonSourceFiles) {
-            p.println("<", COMMON_SOURCES, " ", PATH, "=\"", getEscapedPath(commonSourceFile), "\"/>")
-        }
-
        processJavaSourceRoots(javaSourceRoots)
        processClasspath(classpathRoots, directoriesToFilterOut)

@@ -82,7 +78,7 @@ class KotlinModuleXmlBuilder {
            directoriesToFilterOut: Set<File>) {
        p.println("<!-- Classpath -->")
        for (file in files) {
-            val isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.isEnabledForJvm()
+            val isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.isEnabled()
            if (isOutput) {
                // For IDEA's make (incremental compilation) purposes, output directories of the current module and its dependencies
                // appear on the class path, so we are at risk of seeing the results of the previous build, i.e. if some class was
@@ -135,13 +131,6 @@ class KotlinModuleXmlBuilder {
    }

    private fun getEscapedPath(sourceFile: File): String {
-        return escapeXml(sourceFile.invariantSeparatorsPath)
-    }
-
-    private companion object {
-        private val xmlEscapeReplacement = mapOf("<" to "&lt;", ">" to "&gt;", "&" to "&amp;", "'" to "&#39;", "\"" to "&quot;")
-        private val xmlEscapeRegex = Regex(xmlEscapeReplacement.keys.joinToString("|", "(?:", ")") { Regex.escape(it) })
-
-        private fun escapeXml(string: String) = string.replace(xmlEscapeRegex) { xmlEscapeReplacement.getValue(it.value) }
+        return escapeXml(toSystemIndependentName(sourceFile.path))
    }
 }
--- a/build-common/test/org/jetbrains/kotlin/incremental/storage/RelocatableCachesTest.kt
+++ b/build-common/test/org/jetbrains/kotlin/incremental/storage/RelocatableCachesTest.kt
@@ -1,90 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.incremental.storage
-
-import com.intellij.util.containers.MultiMap
-import org.jetbrains.kotlin.TestWithWorkingDir
-import org.jetbrains.kotlin.incremental.LookupStorage
-import org.jetbrains.kotlin.incremental.LookupSymbol
-import org.jetbrains.kotlin.incremental.testingUtils.assertEqualDirectories
-import org.junit.Test
-import java.io.File
-
-class RelocatableCachesTest : TestWithWorkingDir() {
-    @Test
-    fun testLookupStorageAddAllReversedFiles() {
-        val originalRoot = workingDir.resolve("original")
-        fillLookupStorage(originalRoot, reverseFiles = false, reverseLookups = false)
-        val reversedFilesOrderRoot = workingDir.resolve("reversedFiles")
-        fillLookupStorage(reversedFilesOrderRoot, reverseFiles = true, reverseLookups = false)
-        assertEqualDirectories(originalRoot, reversedFilesOrderRoot, forgiveExtraFiles = false)
-    }
-
-    @Test
-    fun testLookupStorageAddAllReversedLookups() {
-        val originalRoot = workingDir.resolve("original")
-        fillLookupStorage(originalRoot, reverseFiles = false, reverseLookups = false)
-        val reversedLookupsOrderRoot = workingDir.resolve("reversedLookups")
-        fillLookupStorage(reversedLookupsOrderRoot, reverseFiles = false, reverseLookups = true)
-        assertEqualDirectories(originalRoot, reversedLookupsOrderRoot, forgiveExtraFiles = false)
-    }
-
-    @Test
-    fun testLookupStorageAddAllReversedFilesReversedLookups() {
-        val originalRoot = workingDir.resolve("original")
-        fillLookupStorage(originalRoot, reverseFiles = false, reverseLookups = false)
-        val reversedFilesReversedLookupsOrderRoot = workingDir.resolve("reversedFilesReversedLookupsOrderRoot")
-        fillLookupStorage(reversedFilesReversedLookupsOrderRoot, reverseFiles = true, reverseLookups = true)
-        assertEqualDirectories(originalRoot, reversedFilesReversedLookupsOrderRoot, forgiveExtraFiles = false)
-    }
-
-    /**
-     * Fills lookup storage in [projectRoot] with N fq-names,
-     * where i_th fq-name myscope_i.MyClass_i has lookups for previous fq-names (from 0 to i-1)
-     */
-    private fun fillLookupStorage(projectRoot: File, reverseFiles: Boolean, reverseLookups: Boolean) {
-        val storageRoot = projectRoot.storageRoot
-        val fileToPathConverter = RelativeFileToPathConverter(projectRoot)
-        val lookupStorage = LookupStorage(storageRoot, fileToPathConverter)
-        val files = LinkedHashSet<String>()
-        val symbols = LinkedHashSet<LookupSymbol>()
-        val lookups = MultiMap.createOrderedSet<LookupSymbol, String>()
-
-        for (i in 0..10) {
-            val newSymbol = LookupSymbol(name = "MyClass_$i", scope = "myscope_$i")
-            val newSourcePath = projectRoot.resolve("src/${newSymbol.asRelativePath()}").canonicalFile.invariantSeparatorsPath
-            symbols.add(newSymbol)
-
-            for (lookedUpSymbol in symbols) {
-                lookups.putValue(lookedUpSymbol, newSourcePath)
-            }
-
-            files.add(newSourcePath)
-        }
-
-        val filesToAdd = if (reverseFiles) files.reversedSet() else files
-        val lookupsToAdd = if (reverseLookups) lookups.reversedMultiMap() else lookups
-        lookupStorage.addAll(lookupsToAdd, filesToAdd)
-        lookupStorage.flush(memoryCachesOnly = false)
-    }
-
-    private val File.storageRoot: File
-        get() = resolve("storage")
-
-    private fun <K, V> MultiMap<K, V>.reversedMultiMap(): MultiMap<K, V> {
-        val newMap = MultiMap.createOrderedSet<K, V>()
-        for ((key, values) in entrySet().reversedSet()) {
-            newMap.putValues(key, values.reversed())
-        }
-        return newMap
-    }
-
-    private fun <T> Set<T>.reversedSet(): LinkedHashSet<T> =
-        reversed().toCollection(LinkedHashSet(size))
-
-    private fun LookupSymbol.asRelativePath(): String =
-        if (scope.isBlank()) name else scope.replace('.', '/') + '/' + name
-}
--- a/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt
+++ b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt
@@ -27,11 +27,10 @@ data class BuildLogFinder(
        private const val JS_LOG = "js-build.log"
        private const val GRADLE_LOG = "gradle-build.log"
        private const val DATA_CONTAINER_LOG = "data-container-version-build.log"
-        const val JS_JPS_LOG = "js-jps-build.log"
        private const val SIMPLE_LOG = "build.log"

        fun isJpsLogFile(file: File): Boolean =
-            file.name in arrayOf(SIMPLE_LOG, JS_JPS_LOG, DATA_CONTAINER_LOG)
+                file.name.let { it == SIMPLE_LOG || it == DATA_CONTAINER_LOG }
    }

    fun findBuildLog(dir: File): File? {
@@ -40,7 +39,6 @@ data class BuildLogFinder(
        val matchedName = when {
            isJsEnabled && JS_LOG in files -> JS_LOG
            isGradleEnabled && GRADLE_LOG in files -> GRADLE_LOG
-            isJsEnabled && JS_JPS_LOG in files -> JS_JPS_LOG
            isDataContainerBuildLogEnabled && DATA_CONTAINER_LOG in files -> DATA_CONTAINER_LOG
            SIMPLE_LOG in files -> SIMPLE_LOG
            else -> null
--- a/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/classFilesComparison.kt
+++ b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/classFilesComparison.kt
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.incremental.testingUtils

 import com.intellij.openapi.util.io.FileUtil
+import com.sun.xml.internal.messaging.saaj.util.ByteOutputStream
 import org.jetbrains.kotlin.incremental.LocalFileKotlinClass
 import org.jetbrains.kotlin.js.parser.sourcemaps.SourceMapError
 import org.jetbrains.kotlin.js.parser.sourcemaps.SourceMapParser
@@ -36,7 +37,6 @@ import org.jetbrains.org.objectweb.asm.ClassReader
 import org.jetbrains.org.objectweb.asm.util.TraceClassVisitor
 import org.junit.Assert
 import org.junit.Assert.assertNotNull
-import org.junit.ComparisonFailure
 import java.io.*
 import java.util.*
 import java.util.zip.CRC32
@@ -72,15 +72,7 @@ fun assertEqualDirectories(expected: File, actual: File, forgiveExtraFiles: Bool
        }
    }

-    if (expectedString != actualString) {
-        val message: String? = null
-        throw ComparisonFailure(
-            message,
-            expectedString.replaceFirst(DIR_ROOT_PLACEHOLDER, expected.canonicalPath),
-            actualString.replaceFirst(DIR_ROOT_PLACEHOLDER, actual.canonicalPath)
-        )
-    }
-
+    Assert.assertEquals(expectedString, actualString)
 }

 private fun File.checksumString(): String {
@@ -89,8 +81,6 @@ private fun File.checksumString(): String {
    return java.lang.Long.toHexString(crc32.value)
 }

-private const val DIR_ROOT_PLACEHOLDER = "<DIR_ROOT_PLACEHOLDER>"
-
 private fun getDirectoryString(dir: File, interestingPaths: List<String>): String {
    val buf = StringBuilder()
    val p = Printer(buf)
@@ -119,7 +109,7 @@ private fun getDirectoryString(dir: File, interestingPaths: List<String>): Strin
    }


-    p.println(DIR_ROOT_PLACEHOLDER)
+    p.println(".")
    addDirContent(dir)

    for (path in interestingPaths) {
@@ -215,7 +205,7 @@ private fun kjsmToString(kjsmFile: File): String {
 }

 private fun sourceMapFileToString(sourceMapFile: File, generatedJsFile: File): String {
-    val sourceMapParseResult = SourceMapParser.parse(sourceMapFile.readText())
+    val sourceMapParseResult = SourceMapParser.parse(StringReader(sourceMapFile.readText()))
    return when (sourceMapParseResult) {
        is SourceMapSuccess -> {
            val bytesOut = ByteArrayOutputStream()
--- a/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/incrementalModificationUtils.kt
+++ b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/incrementalModificationUtils.kt
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.incremental.testingUtils
 import com.intellij.openapi.util.io.FileUtil
 import java.io.File
 import java.util.*
-import kotlin.math.max

 private val COMMANDS = listOf("new", "touch", "delete")
 private val COMMANDS_AS_REGEX_PART = COMMANDS.joinToString("|")
@@ -68,18 +67,12 @@ fun getModificationsToPerform(
            val underscore = fileName.indexOf("_")

            if (underscore != -1) {
-                var moduleName = fileName.substring(0, underscore)
-                var moduleFileName = fileName.substring(underscore + 1)
-                if (moduleName.all { it.isDigit() }) {
-                    val (moduleName1, moduleFileName1) = moduleFileName.split("_")
-                    moduleName = moduleName1
-                    moduleFileName = moduleFileName1
-                }
+                val module = fileName.substring(0, underscore)

                assert(moduleNames != null) { "File name has module prefix, but multi-module environment is absent" }
-                assert(moduleName in moduleNames!!) { "Module not found for file with prefix: $fileName" }
+                assert(module in moduleNames!!) { "Module not found for file with prefix: $fileName" }

-                return Pair(moduleName, moduleFileName)
+                return Pair(module, fileName.substring(underscore + 1))
            }

            assert(moduleNames == null) { "Test is multi-module, but file has no module prefix: $fileName" }
@@ -167,7 +160,7 @@ class TouchFile(path: String, private val touchPolicy: TouchPolicy) : Modificati
            TouchPolicy.TIMESTAMP -> {
                val oldLastModified = file.lastModified()
                //Mac OS and some versions of Linux truncate timestamp to nearest second
-                file.setLastModified(max(System.currentTimeMillis(), oldLastModified + 1000))
+                file.setLastModified(Math.max(System.currentTimeMillis(), oldLastModified + 1000))
            }
            TouchPolicy.CHECKSUM -> {
                file.appendText(" ")
--- a/build-common/test/org/jetbrains/kotlin/ir/backend/js/lower/serialization/metadata/DebugJsKlibMetadataProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/ir/backend/js/lower/serialization/metadata/DebugJsKlibMetadataProtoBuf.java
--- a/build-common/test/org/jetbrains/kotlin/metadata/DebugProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/metadata/DebugProtoBuf.java
--- a/build-common/test/org/jetbrains/kotlin/metadata/builtins/DebugBuiltInsProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/metadata/builtins/DebugBuiltInsProtoBuf.java
@@ -12,8 +12,6 @@ public final class DebugBuiltInsProtoBuf {
    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.constructorAnnotation);
    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.functionAnnotation);
    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.propertyAnnotation);
-    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.propertyGetterAnnotation);
-    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.propertySetterAnnotation);
    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.compileTimeValue);
    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.enumEntryAnnotation);
    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.parameterAnnotation);
@@ -75,28 +73,6 @@ public final class DebugBuiltInsProtoBuf {
          .newFileScopedGeneratedExtension(
        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int PROPERTY_GETTER_ANNOTATION_FIELD_NUMBER = 152;
-  /**
-   * <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
-      java.util.List<org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation>> propertyGetterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int PROPERTY_SETTER_ANNOTATION_FIELD_NUMBER = 153;
-  /**
-   * <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
-      java.util.List<org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation>> propertySetterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
  public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 151;
  /**
   * <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
@@ -177,28 +153,22 @@ public final class DebugBuiltInsProtoBuf {
      "notation:p\n\023property_annotation\022\'.org.je" +
      "tbrains.kotlin.metadata.Property\030\226\001 \003(\0132" +
      ").org.jetbrains.kotlin.metadata.Annotati" +
-      "on:w\n\032property_getter_annotation\022\'.org.j" +
-      "etbrains.kotlin.metadata.Property\030\230\001 \003(\013" +
-      "2).org.jetbrains.kotlin.metadata.Annotat" +
-      "ion:w\n\032property_setter_annotation\022\'.org.",
-      "jetbrains.kotlin.metadata.Property\030\231\001 \003(" +
-      "\0132).org.jetbrains.kotlin.metadata.Annota" +
-      "tion:~\n\022compile_time_value\022\'.org.jetbrai" +
-      "ns.kotlin.metadata.Property\030\227\001 \001(\01328.org" +
-      ".jetbrains.kotlin.metadata.Annotation.Ar" +
-      "gument.Value:s\n\025enum_entry_annotation\022(." +
-      "org.jetbrains.kotlin.metadata.EnumEntry\030" +
-      "\226\001 \003(\0132).org.jetbrains.kotlin.metadata.A" +
-      "nnotation:w\n\024parameter_annotation\022-.org." +
-      "jetbrains.kotlin.metadata.ValueParameter",
-      "\030\226\001 \003(\0132).org.jetbrains.kotlin.metadata." +
-      "Annotation:h\n\017type_annotation\022#.org.jetb" +
-      "rains.kotlin.metadata.Type\030\226\001 \003(\0132).org." +
-      "jetbrains.kotlin.metadata.Annotation:{\n\031" +
-      "type_parameter_annotation\022,.org.jetbrain" +
-      "s.kotlin.metadata.TypeParameter\030\226\001 \003(\0132)" +
-      ".org.jetbrains.kotlin.metadata.Annotatio" +
-      "nB\027B\025DebugBuiltInsProtoBuf"
+      "on:~\n\022compile_time_value\022\'.org.jetbrains" +
+      ".kotlin.metadata.Property\030\227\001 \001(\01328.org.j" +
+      "etbrains.kotlin.metadata.Annotation.Argu" +
+      "ment.Value:s\n\025enum_entry_annotation\022(.or",
+      "g.jetbrains.kotlin.metadata.EnumEntry\030\226\001" +
+      " \003(\0132).org.jetbrains.kotlin.metadata.Ann" +
+      "otation:w\n\024parameter_annotation\022-.org.je" +
+      "tbrains.kotlin.metadata.ValueParameter\030\226" +
+      "\001 \003(\0132).org.jetbrains.kotlin.metadata.An" +
+      "notation:h\n\017type_annotation\022#.org.jetbra" +
+      "ins.kotlin.metadata.Type\030\226\001 \003(\0132).org.je" +
+      "tbrains.kotlin.metadata.Annotation:{\n\031ty" +
+      "pe_parameter_annotation\022,.org.jetbrains." +
+      "kotlin.metadata.TypeParameter\030\226\001 \003(\0132).o",
+      "rg.jetbrains.kotlin.metadata.AnnotationB" +
+      "\027B\025DebugBuiltInsProtoBuf"
    };
    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -218,13 +188,11 @@ public final class DebugBuiltInsProtoBuf {
    constructorAnnotation.internalInit(descriptor.getExtensions().get(2));
    functionAnnotation.internalInit(descriptor.getExtensions().get(3));
    propertyAnnotation.internalInit(descriptor.getExtensions().get(4));
-    propertyGetterAnnotation.internalInit(descriptor.getExtensions().get(5));
-    propertySetterAnnotation.internalInit(descriptor.getExtensions().get(6));
-    compileTimeValue.internalInit(descriptor.getExtensions().get(7));
-    enumEntryAnnotation.internalInit(descriptor.getExtensions().get(8));
-    parameterAnnotation.internalInit(descriptor.getExtensions().get(9));
-    typeAnnotation.internalInit(descriptor.getExtensions().get(10));
-    typeParameterAnnotation.internalInit(descriptor.getExtensions().get(11));
+    compileTimeValue.internalInit(descriptor.getExtensions().get(5));
+    enumEntryAnnotation.internalInit(descriptor.getExtensions().get(6));
+    parameterAnnotation.internalInit(descriptor.getExtensions().get(7));
+    typeAnnotation.internalInit(descriptor.getExtensions().get(8));
+    typeParameterAnnotation.internalInit(descriptor.getExtensions().get(9));
    org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor();
  }

--- a/build-common/test/org/jetbrains/kotlin/metadata/js/DebugJsProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/metadata/js/DebugJsProtoBuf.java
@@ -14,8 +14,6 @@ public final class DebugJsProtoBuf {
    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.functionAnnotation);
    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.functionContainingFileId);
    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.propertyAnnotation);
-    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.propertyGetterAnnotation);
-    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.propertySetterAnnotation);
    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.compileTimeValue);
    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.propertyContainingFileId);
    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.enumEntryAnnotation);
@@ -4754,28 +4752,6 @@ public final class DebugJsProtoBuf {
          .newFileScopedGeneratedExtension(
        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int PROPERTY_GETTER_ANNOTATION_FIELD_NUMBER = 132;
-  /**
-   * <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
-      java.util.List<org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation>> propertyGetterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int PROPERTY_SETTER_ANNOTATION_FIELD_NUMBER = 133;
-  /**
-   * <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
-      java.util.List<org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation>> propertySetterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
  public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 131;
  /**
   * <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
@@ -4924,33 +4900,27 @@ public final class DebugJsProtoBuf {
      "ion\030\207\001 \001(\005:p\n\023property_annotation\022\'.org." +
      "jetbrains.kotlin.metadata.Property\030\202\001 \003(" +
      "\0132).org.jetbrains.kotlin.metadata.Annota" +
-      "tion:w\n\032property_getter_annotation\022\'.org" +
-      ".jetbrains.kotlin.metadata.Property\030\204\001 \003" +
-      "(\0132).org.jetbrains.kotlin.metadata.Annot",
-      "ation:w\n\032property_setter_annotation\022\'.or" +
-      "g.jetbrains.kotlin.metadata.Property\030\205\001 " +
-      "\003(\0132).org.jetbrains.kotlin.metadata.Anno" +
-      "tation:~\n\022compile_time_value\022\'.org.jetbr" +
-      "ains.kotlin.metadata.Property\030\203\001 \001(\01328.o" +
-      "rg.jetbrains.kotlin.metadata.Annotation." +
-      "Argument.Value:M\n\033property_containing_fi" +
-      "le_id\022\'.org.jetbrains.kotlin.metadata.Pr" +
-      "operty\030\207\001 \001(\005:s\n\025enum_entry_annotation\022(" +
-      ".org.jetbrains.kotlin.metadata.EnumEntry",
-      "\030\202\001 \003(\0132).org.jetbrains.kotlin.metadata." +
-      "Annotation:w\n\024parameter_annotation\022-.org" +
-      ".jetbrains.kotlin.metadata.ValueParamete" +
-      "r\030\202\001 \003(\0132).org.jetbrains.kotlin.metadata" +
-      ".Annotation:h\n\017type_annotation\022#.org.jet" +
-      "brains.kotlin.metadata.Type\030\202\001 \003(\0132).org" +
-      ".jetbrains.kotlin.metadata.Annotation:{\n" +
-      "\031type_parameter_annotation\022,.org.jetbrai" +
-      "ns.kotlin.metadata.TypeParameter\030\202\001 \003(\0132" +
-      ").org.jetbrains.kotlin.metadata.Annotati",
-      "on:x\n\026package_fragment_files\022..org.jetbr" +
-      "ains.kotlin.metadata.PackageFragment\030\202\001 " +
-      "\001(\0132\'.org.jetbrains.kotlin.metadata.js.F" +
-      "ilesB\021B\017DebugJsProtoBuf"
+      "tion:~\n\022compile_time_value\022\'.org.jetbrai" +
+      "ns.kotlin.metadata.Property\030\203\001 \001(\01328.org" +
+      ".jetbrains.kotlin.metadata.Annotation.Ar",
+      "gument.Value:M\n\033property_containing_file" +
+      "_id\022\'.org.jetbrains.kotlin.metadata.Prop" +
+      "erty\030\207\001 \001(\005:s\n\025enum_entry_annotation\022(.o" +
+      "rg.jetbrains.kotlin.metadata.EnumEntry\030\202" +
+      "\001 \003(\0132).org.jetbrains.kotlin.metadata.An" +
+      "notation:w\n\024parameter_annotation\022-.org.j" +
+      "etbrains.kotlin.metadata.ValueParameter\030" +
+      "\202\001 \003(\0132).org.jetbrains.kotlin.metadata.A" +
+      "nnotation:h\n\017type_annotation\022#.org.jetbr" +
+      "ains.kotlin.metadata.Type\030\202\001 \003(\0132).org.j",
+      "etbrains.kotlin.metadata.Annotation:{\n\031t" +
+      "ype_parameter_annotation\022,.org.jetbrains" +
+      ".kotlin.metadata.TypeParameter\030\202\001 \003(\0132)." +
+      "org.jetbrains.kotlin.metadata.Annotation" +
+      ":x\n\026package_fragment_files\022..org.jetbrai" +
+      "ns.kotlin.metadata.PackageFragment\030\202\001 \001(" +
+      "\0132\'.org.jetbrains.kotlin.metadata.js.Fil" +
+      "esB\021B\017DebugJsProtoBuf"
    };
    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -5002,15 +4972,13 @@ public final class DebugJsProtoBuf {
    functionAnnotation.internalInit(descriptor.getExtensions().get(4));
    functionContainingFileId.internalInit(descriptor.getExtensions().get(5));
    propertyAnnotation.internalInit(descriptor.getExtensions().get(6));
-    propertyGetterAnnotation.internalInit(descriptor.getExtensions().get(7));
-    propertySetterAnnotation.internalInit(descriptor.getExtensions().get(8));
-    compileTimeValue.internalInit(descriptor.getExtensions().get(9));
-    propertyContainingFileId.internalInit(descriptor.getExtensions().get(10));
-    enumEntryAnnotation.internalInit(descriptor.getExtensions().get(11));
-    parameterAnnotation.internalInit(descriptor.getExtensions().get(12));
-    typeAnnotation.internalInit(descriptor.getExtensions().get(13));
-    typeParameterAnnotation.internalInit(descriptor.getExtensions().get(14));
-    packageFragmentFiles.internalInit(descriptor.getExtensions().get(15));
+    compileTimeValue.internalInit(descriptor.getExtensions().get(7));
+    propertyContainingFileId.internalInit(descriptor.getExtensions().get(8));
+    enumEntryAnnotation.internalInit(descriptor.getExtensions().get(9));
+    parameterAnnotation.internalInit(descriptor.getExtensions().get(10));
+    typeAnnotation.internalInit(descriptor.getExtensions().get(11));
+    typeParameterAnnotation.internalInit(descriptor.getExtensions().get(12));
+    packageFragmentFiles.internalInit(descriptor.getExtensions().get(13));
    org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor();
  }

--- a/build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmModuleProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmModuleProtoBuf.java
--- a/build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmProtoBuf.java
@@ -11,7 +11,6 @@ public final class DebugJvmProtoBuf {
    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.methodSignature);
    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.lambdaClassOriginName);
    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.propertySignature);
-    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.flags);
    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.typeAnnotation);
    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.isRaw);
    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.typeParameterAnnotation);
@@ -4559,22 +4558,6 @@ public final class DebugJvmProtoBuf {
          .newFileScopedGeneratedExtension(
        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature.class,
        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature.getDefaultInstance());
-  public static final int FLAGS_FIELD_NUMBER = 101;
-  /**
-   * <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
-   *
-   * <pre>
-   **
-   *isMovedFromInterfaceCompanion   true if this property is declared in an interface companion, and the field is stored in the interface
-   * </pre>
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
-      java.lang.Integer> flags = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        java.lang.Integer.class,
-        null);
  public static final int TYPE_ANNOTATION_FIELD_NUMBER = 100;
  /**
   * <code>extend .org.jetbrains.kotlin.metadata.Type { ... }</code>
@@ -4613,7 +4596,7 @@ public final class DebugJvmProtoBuf {
   * <code>extend .org.jetbrains.kotlin.metadata.Class { ... }</code>
   *
   * <pre>
-   * If absent, assumed to be "main" (JvmProtoBufUtil.DEFAULT_MODULE_NAME)
+   * If absent, assumed to be JvmAbi.DEFAULT_MODULE_NAME
   * </pre>
   */
  public static final
@@ -4743,27 +4726,25 @@ public final class DebugJvmProtoBuf {
      "perty_signature\022\'.org.jetbrains.kotlin.m" +
      "etadata.Property\030d \001(\01327.org.jetbrains.k" +
      "otlin.metadata.jvm.JvmPropertySignature:" +
-      "9\n\005flags\022\'.org.jetbrains.kotlin.metadata" +
-      ".Property\030e \001(\005:\0010:g\n\017type_annotation\022#." +
-      "org.jetbrains.kotlin.metadata.Type\030d \003(\013",
-      "2).org.jetbrains.kotlin.metadata.Annotat" +
-      "ion:3\n\006is_raw\022#.org.jetbrains.kotlin.met" +
-      "adata.Type\030e \001(\010:z\n\031type_parameter_annot" +
-      "ation\022,.org.jetbrains.kotlin.metadata.Ty" +
-      "peParameter\030d \003(\0132).org.jetbrains.kotlin" +
-      ".metadata.Annotation:E\n\021class_module_nam" +
-      "e\022$.org.jetbrains.kotlin.metadata.Class\030" +
-      "e \001(\005B\004\230\265\030\001:k\n\024class_local_variable\022$.or" +
-      "g.jetbrains.kotlin.metadata.Class\030f \003(\0132" +
-      "\'.org.jetbrains.kotlin.metadata.Property",
-      ":P\n\034anonymous_object_origin_name\022$.org.j" +
-      "etbrains.kotlin.metadata.Class\030g \001(\005B\004\230\265" +
-      "\030\001:I\n\023package_module_name\022&.org.jetbrain" +
-      "s.kotlin.metadata.Package\030e \001(\005B\004\230\265\030\001:o\n" +
-      "\026package_local_variable\022&.org.jetbrains." +
-      "kotlin.metadata.Package\030f \003(\0132\'.org.jetb" +
-      "rains.kotlin.metadata.PropertyB\022B\020DebugJ" +
-      "vmProtoBuf"
+      "g\n\017type_annotation\022#.org.jetbrains.kotli" +
+      "n.metadata.Type\030d \003(\0132).org.jetbrains.ko" +
+      "tlin.metadata.Annotation:3\n\006is_raw\022#.org",
+      ".jetbrains.kotlin.metadata.Type\030e \001(\010:z\n" +
+      "\031type_parameter_annotation\022,.org.jetbrai" +
+      "ns.kotlin.metadata.TypeParameter\030d \003(\0132)" +
+      ".org.jetbrains.kotlin.metadata.Annotatio" +
+      "n:E\n\021class_module_name\022$.org.jetbrains.k" +
+      "otlin.metadata.Class\030e \001(\005B\004\230\265\030\001:k\n\024clas" +
+      "s_local_variable\022$.org.jetbrains.kotlin." +
+      "metadata.Class\030f \003(\0132\'.org.jetbrains.kot" +
+      "lin.metadata.Property:P\n\034anonymous_objec" +
+      "t_origin_name\022$.org.jetbrains.kotlin.met",
+      "adata.Class\030g \001(\005B\004\230\265\030\001:I\n\023package_modul" +
+      "e_name\022&.org.jetbrains.kotlin.metadata.P" +
+      "ackage\030e \001(\005B\004\230\265\030\001:o\n\026package_local_vari" +
+      "able\022&.org.jetbrains.kotlin.metadata.Pac" +
+      "kage\030f \003(\0132\'.org.jetbrains.kotlin.metada" +
+      "ta.PropertyB\022B\020DebugJvmProtoBuf"
    };
    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -4813,15 +4794,14 @@ public final class DebugJvmProtoBuf {
    methodSignature.internalInit(descriptor.getExtensions().get(1));
    lambdaClassOriginName.internalInit(descriptor.getExtensions().get(2));
    propertySignature.internalInit(descriptor.getExtensions().get(3));
-    flags.internalInit(descriptor.getExtensions().get(4));
-    typeAnnotation.internalInit(descriptor.getExtensions().get(5));
-    isRaw.internalInit(descriptor.getExtensions().get(6));
-    typeParameterAnnotation.internalInit(descriptor.getExtensions().get(7));
-    classModuleName.internalInit(descriptor.getExtensions().get(8));
-    classLocalVariable.internalInit(descriptor.getExtensions().get(9));
-    anonymousObjectOriginName.internalInit(descriptor.getExtensions().get(10));
-    packageModuleName.internalInit(descriptor.getExtensions().get(11));
-    packageLocalVariable.internalInit(descriptor.getExtensions().get(12));
+    typeAnnotation.internalInit(descriptor.getExtensions().get(4));
+    isRaw.internalInit(descriptor.getExtensions().get(5));
+    typeParameterAnnotation.internalInit(descriptor.getExtensions().get(6));
+    classModuleName.internalInit(descriptor.getExtensions().get(7));
+    classLocalVariable.internalInit(descriptor.getExtensions().get(8));
+    anonymousObjectOriginName.internalInit(descriptor.getExtensions().get(9));
+    packageModuleName.internalInit(descriptor.getExtensions().get(10));
+    packageLocalVariable.internalInit(descriptor.getExtensions().get(11));
    org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
        org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.stringIdInTable);
--- a/build-common/test/org/jetbrains/kotlin/metadata/konan/DebugKonanProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/metadata/konan/DebugKonanProtoBuf.java
--- a/build-common/test/org/jetbrains/kotlin/serialization/js/ast/DebugJsAstProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/js/ast/DebugJsAstProtoBuf.java
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,24 +1,38 @@
+
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.api.Project
+import java.util.*
+import java.io.File
+import org.gradle.api.tasks.bundling.Jar
 import org.gradle.plugins.ide.idea.model.IdeaModel
-import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 import proguard.gradle.ProGuardTask
-import org.gradle.kotlin.dsl.*

 buildscript {
-    extra["defaultSnapshotVersion"] = "1.3-SNAPSHOT"
+    extra["defaultSnapshotVersion"] = "1.2-SNAPSHOT"

-    // when updating please also update JPS artifacts configuration: https://jetbrains.quip.com/zzGUAYSJ6gv3/JPS-Build-update-bootstrap
-    kotlinBootstrapFrom(BootstrapOption.TeamCity("1.3.50-dev-526", onlySuccessBootstrap = false))
+    kotlinBootstrapFrom(BootstrapOption.TeamCity("1.2.60-dev-980", onlySuccessBootstrap = false))
+
+    val mirrorRepo: String? = findProperty("maven.repository.mirror")?.toString()
+
+    val repos = listOfNotNull(
+            mirrorRepo,
+            bootstrapKotlinRepo,
+            "https://jcenter.bintray.com/",
+            "https://plugins.gradle.org/m2",
+            "http://dl.bintray.com/kotlin/kotlinx",
+            "https://jetbrains.bintray.com/kotlin-native-dependencies",
+            "https://repo.gradle.org/gradle/ext-releases-local", // for native-platform
+            "https://jetbrains.bintray.com/intellij-third-party-dependencies", // for jflex
+            "https://dl.bintray.com/jetbrains/markdown" // for org.jetbrains:markdown
+    )
+
+    extra["repos"] = repos

    repositories {
-        bootstrapKotlinRepo?.let(::maven)
-
-        val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
-        if (cacheRedirectorEnabled) {
-            maven("https://cache-redirector.jetbrains.com/plugins.gradle.org/m2")
-        } else {
-            maven("https://plugins.gradle.org/m2")
+        for (repo in repos) {
+            maven(url = repo)
        }
    }

@@ -28,12 +42,11 @@ buildscript {
    val bootstrapCompilerClasspath by configurations.creating

    dependencies {
-        bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion))
+        bootstrapCompilerClasspath(kotlinDep("compiler-embeddable", bootstrapKotlinVersion))

        classpath("com.gradle.publish:plugin-publish-plugin:0.9.7")
-        classpath(kotlin("gradle-plugin", bootstrapKotlinVersion))
-        classpath("net.sf.proguard:proguard-gradle:6.1.0")
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:0.9.17")
+        classpath(kotlinDep("gradle-plugin", bootstrapKotlinVersion))
+        classpath("net.sf.proguard:proguard-gradle:5.3.3")
    }
 }

@@ -41,7 +54,6 @@ plugins {
    `build-scan`
    idea
    id("jps-compatible")
-    id("org.jetbrains.gradle.plugin.idea-ext")
 }

 pill {
@@ -59,17 +71,17 @@ buildScan {
 }

 val configuredJdks: List<JdkId> =
-    getConfiguredJdks().also {
-        it.forEach { jdkId ->
-            logger.info("Using ${jdkId.majorVersion} home: ${jdkId.homeDir}")
+        getConfiguredJdks().also {
+            it.forEach {
+                logger.info("Using ${it.majorVersion} home: ${it.homeDir}")
+            }
        }
-    }

 val defaultSnapshotVersion: String by extra
 val buildNumber by extra(findProperty("build.number")?.toString() ?: defaultSnapshotVersion)
 val kotlinVersion by extra(findProperty("deployVersion")?.toString() ?: buildNumber)

-val kotlinLanguageVersion by extra("1.3")
+val kotlinLanguageVersion by extra("1.2")

 allprojects {
    group = "org.jetbrains.kotlin"
@@ -78,7 +90,21 @@ allprojects {

 extra["kotlin_root"] = rootDir

-val jpsBootstrap by configurations.creating
+val bootstrapCompileCfg = configurations.create("bootstrapCompile")
+
+repositories {
+    for (repo in (rootProject.extra["repos"] as List<String>)) {
+        maven(url = repo)
+    }
+}
+
+val cidrKotlinPlugin by configurations.creating
+
+dependencies {
+    bootstrapCompileCfg(kotlinDep("compiler-embeddable", bootstrapKotlinVersion))
+
+    cidrKotlinPlugin(project(":prepare:cidr-plugin", "runtimeJar"))
+}

 val commonBuildDir = File(rootDir, "build")
 val distDir by extra("$rootDir/dist")
@@ -87,20 +113,9 @@ val distLibDir = "$distKotlinHomeDir/lib"
 val commonLocalDataDir = "$rootDir/local"
 val ideaSandboxDir = "$commonLocalDataDir/ideaSandbox"
 val ideaUltimateSandboxDir = "$commonLocalDataDir/ideaUltimateSandbox"
-val artifactsDir = "$distDir/artifacts"
-val ideaPluginDir = "$artifactsDir/ideaPlugin/Kotlin"
-val ideaUltimatePluginDir = "$artifactsDir/ideaUltimatePlugin/Kotlin"
-
-extra["ktorExcludesForDaemon"] = listOf(
-    "org.jetbrains.kotlin" to "kotlin-reflect",
-    "org.jetbrains.kotlin" to "kotlin-stdlib",
-    "org.jetbrains.kotlin" to "kotlin-stdlib-common",
-    "org.jetbrains.kotlin" to "kotlin-stdlib-jdk8",
-    "org.jetbrains.kotlin" to "kotlin-stdlib-jdk7",
-    "org.jetbrains.kotlinx" to "kotlinx-coroutines-jdk8",
-    "org.jetbrains.kotlinx" to "kotlinx-coroutines-core",
-    "org.jetbrains.kotlinx" to "kotlinx-coroutines-core-common"
-)
+val ideaPluginDir = "$distDir/artifacts/ideaPlugin/Kotlin"
+val ideaUltimatePluginDir = "$distDir/artifacts/ideaUltimatePlugin/Kotlin"
+val cidrPluginDir = "$distDir/artifacts/cidrPlugin/Kotlin"

 // TODO: use "by extra()" syntax where possible
 extra["distLibDir"] = project.file(distLibDir)
@@ -110,43 +125,21 @@ extra["ideaSandboxDir"] = project.file(ideaSandboxDir)
 extra["ideaUltimateSandboxDir"] = project.file(ideaUltimateSandboxDir)
 extra["ideaPluginDir"] = project.file(ideaPluginDir)
 extra["ideaUltimatePluginDir"] = project.file(ideaUltimatePluginDir)
+extra["cidrPluginDir"] = project.file(cidrPluginDir)
 extra["isSonatypeRelease"] = false

-// Work-around necessary to avoid setting null javaHome. Will be removed after support of lazy task configuration
-val jdkNotFoundConst = "JDK NOT FOUND"
-
 extra["JDK_16"] = jdkPath("1.6")
 extra["JDK_17"] = jdkPath("1.7")
 extra["JDK_18"] = jdkPath("1.8")
 extra["JDK_9"] = jdkPath("9")
-extra["JDK_10"] = jdkPath("10")
-extra["JDK_11"] = jdkPath("11")
-
-// allow opening the project without setting up all env variables (see KT-26413)
-if (!kotlinBuildProperties.isInIdeaSync) {
-    checkJDK()
-}
-
-fun checkJDK() {
-    val missingEnvVars = JdkMajorVersion.values()
-        .filter { it.isMandatory() && extra[it.name] == jdkNotFoundConst }
-        .mapTo(ArrayList()) { it.name }
-
-    if (missingEnvVars.isNotEmpty()) {
-        throw GradleException("Required environment variables are missing: ${missingEnvVars.joinToString()}")
-    }
-}
+extra["JDK_10"] = jdkPathIfFound("10")

 rootProject.apply {
-    from(rootProject.file("gradle/versions.gradle.kts"))
-    from(rootProject.file("gradle/report.gradle.kts"))
-    from(rootProject.file("gradle/javaInstrumentation.gradle.kts"))
-    from(rootProject.file("gradle/jps.gradle.kts"))
+    from(rootProject.file("versions.gradle.kts"))
+    from(rootProject.file("report.gradle.kts"))
 }

-IdeVersionConfigurator.setCurrentIde(this)
-
-extra["versions.protobuf"] = "2.6.1"
+extra["versions.protobuf-java"] = "2.6.1"
 extra["versions.javax.inject"] = "1"
 extra["versions.jsr305"] = "1.3.9"
 extra["versions.jansi"] = "1.16"
@@ -155,9 +148,8 @@ extra["versions.junit"] = "4.12"
 extra["versions.javaslang"] = "2.0.6"
 extra["versions.ant"] = "1.8.2"
 extra["versions.android"] = "2.3.1"
-val coroutinesVersion = if (Platform[192].orHigher()) "1.2.1" else "1.1.1"
-extra["versions.kotlinx-coroutines-core"] = coroutinesVersion
-extra["versions.kotlinx-coroutines-jdk8"] = coroutinesVersion
+extra["versions.kotlinx-coroutines-core"] = "0.20"
+extra["versions.kotlinx-coroutines-jdk8"] = "0.20"
 extra["versions.json"] = "20160807"
 extra["versions.native-platform"] = "0.14"
 extra["versions.ant-launcher"] = "1.8.0"
@@ -165,116 +157,106 @@ extra["versions.robolectric"] = "3.1"
 extra["versions.org.springframework"] = "4.2.0.RELEASE"
 extra["versions.jflex"] = "1.7.0"
 extra["versions.markdown"] = "0.1.25"
-extra["versions.trove4j"] = "1.0.20181211"

-// NOTE: please, also change KTOR_NAME in pathUtil.kt and all versions in corresponding jar names in daemon tests.
-extra["versions.ktor-network"] = "1.0.1"
-
-if (!project.hasProperty("versions.kotlin-native")) {
-    extra["versions.kotlin-native"] = "1.3.50-dev-11052"
-}
-
-val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
-val intellijUltimateEnabled by extra(project.kotlinBuildProperties.intellijUltimateEnabled)
+val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
+val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild
 val effectSystemEnabled by extra(project.getBooleanProperty("kotlin.compiler.effectSystemEnabled") ?: false)
 val newInferenceEnabled by extra(project.getBooleanProperty("kotlin.compiler.newInferenceEnabled") ?: false)

 val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false

+extra["intellijUltimateEnabled"] = intellijUltimateEnabled
 extra["intellijSeparateSdks"] = intellijSeparateSdks

 extra["IntellijCoreDependencies"] =
-    listOf(
-        if (Platform[191].orHigher()) "asm-all-7.0.1" else "asm-all",
-        "guava",
-        "jdom",
-        "jna",
-        "log4j",
-        "picocontainer",
-        "snappy-in-java",
-        "streamex",
-        "trove4j"
-    )
+        listOf("annotations",
+               "asm-all",
+               "guava",
+               "jdom",
+               "jna",
+               "log4j",
+               "picocontainer",
+               "snappy-in-java",
+               "streamex",
+               "trove4j")

+extra["nativePlatformVariants"] =
+        listOf("windows-amd64",
+               "windows-i386",
+               "osx-amd64",
+               "osx-i386",
+               "linux-amd64",
+               "linux-i386",
+               "freebsd-amd64-libcpp",
+               "freebsd-amd64-libstdcpp",
+               "freebsd-i386-libcpp",
+               "freebsd-i386-libstdcpp")

 extra["compilerModules"] = arrayOf(
-    ":compiler:util",
-    ":compiler:container",
-    ":compiler:resolution",
-    ":compiler:serialization",
-    ":compiler:psi",
-    ":compiler:frontend",
-    ":compiler:frontend.common",
-    ":compiler:frontend.java",
-    ":compiler:cli-common",
-    ":compiler:ir.tree",
-    ":compiler:ir.psi2ir",
-    ":compiler:ir.backend.common",
-    ":compiler:backend.jvm",
-    ":compiler:backend.js",
-    ":compiler:ir.serialization.common",
-    ":compiler:ir.serialization.js",
-    ":kotlin-util-io",
-    ":kotlin-util-klib",
-    ":compiler:backend-common",
-    ":compiler:backend",
-    ":compiler:plugin-api",
-    ":compiler:light-classes",
-    ":compiler:cli",
-    ":compiler:cli-js",
-    ":compiler:incremental-compilation-impl",
-    ":js:js.ast",
-    ":js:js.serializer",
-    ":js:js.parser",
-    ":js:js.frontend",
-    ":js:js.translator",
-    ":js:js.dce",
-    ":compiler",
-    ":kotlin-build-common",
-    ":core:metadata",
-    ":core:metadata.jvm",
-    ":core:descriptors",
-    ":core:descriptors.jvm",
-    ":core:deserialization",
-    ":core:util.runtime",
-    ":core:type-system",
-    ":compiler:fir:cones",
-    ":compiler:fir:resolve",
-    ":compiler:fir:tree",
-    ":compiler:fir:psi2fir",
-    ":compiler:fir:fir2ir",
-    ":compiler:fir:java"
+        ":compiler:util",
+        ":compiler:container",
+        ":compiler:resolution",
+        ":compiler:serialization",
+        ":compiler:psi",
+        ":compiler:frontend",
+        ":compiler:frontend.java",
+        ":compiler:frontend.script",
+        ":compiler:cli-common",
+        ":compiler:daemon-common",
+        ":compiler:daemon",
+        ":compiler:ir.tree",
+        ":compiler:ir.psi2ir",
+        ":compiler:backend.js",
+        ":compiler:backend-common",
+        ":compiler:backend",
+        ":compiler:plugin-api",
+        ":compiler:light-classes",
+        ":compiler:cli",
+        ":compiler:incremental-compilation-impl",
+        ":js:js.ast",
+        ":js:js.serializer",
+        ":js:js.parser",
+        ":js:js.frontend",
+        ":js:js.translator",
+        ":js:js.dce",
+        ":compiler",
+        ":kotlin-build-common",
+        ":core:metadata",
+        ":core:metadata.jvm",
+        ":core:descriptors",
+        ":core:descriptors.jvm",
+        ":core:deserialization",
+        ":core:util.runtime"
 )

-val coreLibProjects = listOfNotNull(
-    ":kotlin-stdlib",
-    ":kotlin-stdlib-common",
-    ":kotlin-stdlib-js",
-    // Local builds are disabled at the request of the lib team
-    // TODO: Enable when tests are fixed
-    ":kotlin-stdlib-js-ir".takeIf { isTeamcityBuild },
-    ":kotlin-stdlib-jdk7",
-    ":kotlin-stdlib-jdk8",
-    ":kotlin-test:kotlin-test-common",
-    ":kotlin-test:kotlin-test-jvm",
-    ":kotlin-test:kotlin-test-junit",
-    ":kotlin-test:kotlin-test-junit5",
-    ":kotlin-test:kotlin-test-testng",
-    ":kotlin-test:kotlin-test-js",
-    ":kotlin-reflect"
+val coreLibProjects = listOf(
+        ":kotlin-stdlib",
+        ":kotlin-stdlib-common",
+        ":kotlin-stdlib-js",
+        ":kotlin-stdlib-jre7",
+        ":kotlin-stdlib-jre8",
+        ":kotlin-stdlib-jdk7",
+        ":kotlin-stdlib-jdk8",
+        ":kotlin-test:kotlin-test-common",
+        ":kotlin-test:kotlin-test-jvm",
+        ":kotlin-test:kotlin-test-junit",
+        ":kotlin-test:kotlin-test-junit5",
+        ":kotlin-test:kotlin-test-testng",
+        ":kotlin-test:kotlin-test-js",
+        ":kotlin-reflect"
 )

 val gradlePluginProjects = listOf(
-    ":kotlin-gradle-plugin",
-    ":kotlin-gradle-plugin:plugin-marker",
-    ":kotlin-gradle-plugin-api",
+        ":kotlin-gradle-plugin",
+        ":kotlin-gradle-plugin:plugin-marker",
+        ":kotlin-gradle-plugin-api",
 //        ":kotlin-gradle-plugin-integration-tests",  // TODO: build fails
-    ":kotlin-allopen",
-    ":kotlin-allopen:plugin-marker",
-    ":kotlin-annotation-processing-gradle",
-    ":kotlin-noarg",
-    ":kotlin-noarg:plugin-marker",
-    ":kotlin-sam-with-receiver"
+        ":kotlin-allopen",
+        ":kotlin-allopen:plugin-marker",
+        ":kotlin-annotation-processing-gradle",
+        ":kotlin-noarg",
+        ":kotlin-noarg:plugin-marker",
+        ":kotlin-sam-with-receiver"
 )

 apply {
@@ -298,45 +280,33 @@ fun Task.listConfigurationContents(configName: String) {
 }

 val defaultJvmTarget = "1.8"
-val defaultJavaHome = jdkPath(defaultJvmTarget)
+val defaultJavaHome = jdkPath(defaultJvmTarget!!)
 val ignoreTestFailures by extra(project.findProperty("ignoreTestFailures")?.toString()?.toBoolean() ?: project.hasProperty("teamcity"))

 allprojects {

-    configurations.maybeCreate("embedded")
-
    jvmTarget = defaultJvmTarget
    javaHome = defaultJavaHome

    // There are problems with common build dir:
    //  - some tests (in particular js and binary-compatibility-validator depend on the fixed (default) location
-    //  - idea seems unable to exclude common buildDir from indexing
+    //  - idea seems unable to exclude common builddir from indexing
    // therefore it is disabled by default
    // buildDir = File(commonBuildDir, project.name)

-    val mirrorRepo: String? = findProperty("maven.repository.mirror")?.toString()
-
+    val repos = rootProject.extra["repos"] as List<String>
    repositories {
-        kotlinBuildLocalRepo(project)
-        mirrorRepo?.let(::maven)
-        jcenter()
-        maven(protobufRepo)
-        maven(intellijRepo)
-        maven("https://dl.bintray.com/kotlin/ktor")
-        maven("https://kotlin.bintray.com/kotlin-dependencies")
-        bootstrapKotlinRepo?.let(::maven)
-        internalKotlinRepo?.let(::maven)
+        intellijSdkRepo(project)
+        androidDxJarRepo(project)
+
+        for (repo in repos) {
+            maven(repo)
+        }
    }

    configureJvmProject(javaHome!!, jvmTarget!!)

-    val commonCompilerArgs = listOfNotNull(
-        "-Xuse-experimental=kotlin.Experimental",
-        "-Xallow-kotlin-package",
-        "-Xread-deserialized-contracts",
-        "-Xjvm-default=compatibility",
-        "-Xprogressive".takeIf { hasProperty("test.progressive.mode") } // TODO: change to "-progressive" after bootstrap
-    )
+    val commonCompilerArgs = listOf("-Xallow-kotlin-package", "-Xread-deserialized-contracts")

    tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
        kotlinOptions {
@@ -360,6 +330,10 @@ allprojects {
        enabled = false
    }

+    task<Jar>("javadocJar") {
+        classifier = "javadoc"
+    }
+
    tasks.withType<Jar> {
        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
    }
@@ -371,64 +345,39 @@ allprojects {
    task("listDistJar") { listConfigurationContents("distJar") }

    afterEvaluate {
+        logger.info("configuring project $name to compile to the target jvm version $jvmTarget using jdk: $javaHome")
        if (javaHome != defaultJavaHome || jvmTarget != defaultJvmTarget) {
-            logger.info("configuring project $name to compile to the target jvm version $jvmTarget using jdk: $javaHome")
            configureJvmProject(javaHome!!, jvmTarget!!)
-        } // else we will actually fail during the first task execution. We could not fail before configuration is done due to impact on import in IDE
+        }

        fun File.toProjectRootRelativePathOrSelf() = (relativeToOrNull(rootDir)?.takeUnless { it.startsWith("..") } ?: this).path

        fun FileCollection.printClassPath(role: String) =
-            println("${project.path} $role classpath:\n  ${joinToString("\n  ") { it.toProjectRootRelativePathOrSelf() }}")
+                println("${project.path} $role classpath:\n  ${joinToString("\n  ") { it.toProjectRootRelativePathOrSelf() } }")

-        try {
-            javaPluginConvention()
-        } catch (_: UnknownDomainObjectException) {
-            null
-        }?.let { javaConvention ->
+        try { javaPluginConvention() } catch (_: UnknownDomainObjectException) { null }?.let { javaConvention ->
            task("printCompileClasspath") { doFirst { javaConvention.sourceSets["main"].compileClasspath.printClassPath("compile") } }
            task("printRuntimeClasspath") { doFirst { javaConvention.sourceSets["main"].runtimeClasspath.printClassPath("runtime") } }
            task("printTestCompileClasspath") { doFirst { javaConvention.sourceSets["test"].compileClasspath.printClassPath("test compile") } }
            task("printTestRuntimeClasspath") { doFirst { javaConvention.sourceSets["test"].runtimeClasspath.printClassPath("test runtime") } }
        }

-        run configureCompilerClasspath@{
+        run configureCompilerClasspath@ {
            val bootstrapCompilerClasspath by rootProject.buildscript.configurations
            configurations.findByName("kotlinCompilerClasspath")?.let {
                dependencies.add(it.name, files(bootstrapCompilerClasspath))
            }
        }
-
-        // Aggregate task for build related checks
-        tasks.register("checkBuild")
-        
-        apply(from = "$rootDir/gradle/cacheRedirector.gradle.kts")
    }
 }

-gradle.taskGraph.whenReady {
-    if (isTeamcityBuild) {
-        logger.warn("CI build profile is active (IC is off, proguard is on). Use -Pteamcity=false to reproduce local build")
-        for (task in allTasks) {
-            when (task) {
-                is AbstractKotlinCompile<*> -> task.incremental = false
-                is JavaCompile -> task.options.isIncremental = false
-            }
-        }
-    } else {
-        logger.warn("Local build profile is active (IC is on, proguard is off). Use -Pteamcity=true to reproduce TC build")
-        for (task in allTasks) {
-            when (task) {
-                // todo: remove when Gradle 4.10+ is used (Java IC on by default)
-                is JavaCompile -> task.options.isIncremental = true
-                is org.gradle.jvm.tasks.Jar -> task.entryCompression = ZipEntryCompression.STORED
-            }
-        }
-    }
-}
+val dist by task<Copy> {
+    val childDistTasks = getTasksByName("dist", true) - this@task
+    dependsOn(childDistTasks)

-val dist = tasks.register("dist") {
-    dependsOn(":kotlin-compiler:dist")
+    into(distDir)
+    from(files("compiler/cli/bin")) { into("kotlinc/bin") }
+    from(files("license")) { into("kotlinc/license") }
 }

 val copyCompilerToIdeaPlugin by task<Copy> {
@@ -439,200 +388,155 @@ val copyCompilerToIdeaPlugin by task<Copy> {

 val ideaPlugin by task<Task> {
    dependsOn(copyCompilerToIdeaPlugin)
-    dependsOn(":prepare:idea-plugin:ideaPlugin")
+    val childIdeaPluginTasks = getTasksByName("ideaPlugin", true) - this@task
+    dependsOn(childIdeaPluginTasks)
 }

 tasks {
-    create("clean") {
+    "clean" {
        doLast {
            delete("$buildDir/repo")
            delete(distDir)
        }
    }

-    create("cleanupArtifacts") {
+    "cleanupArtifacts" {
        doLast {
-            delete(artifactsDir)
+            delete(ideaPluginDir)
+            delete(ideaUltimatePluginDir)
+            delete(cidrPluginDir)
        }
    }

-    listOf("clean", "assemble", "install", "dist").forEach { taskName ->
-        create("coreLibs${taskName.capitalize()}") {
-            coreLibProjects.forEach { projectName -> dependsOn("$projectName:$taskName") }
-        }
-    }
-
-    create("coreLibsTest") {
+    "coreLibsTest" {
        (coreLibProjects + listOf(
-            ":kotlin-stdlib:samples",
-            ":kotlin-test:kotlin-test-js:kotlin-test-js-it",
-            ":kotlinx-metadata-jvm",
-            ":tools:binary-compatibility-validator"
+                ":kotlin-stdlib:samples",
+                ":kotlin-test:kotlin-test-js:kotlin-test-js-it",
+                ":kotlinx-metadata-jvm",
+                ":tools:binary-compatibility-validator"
        )).forEach {
-            dependsOn("$it:check")
+            dependsOn(it + ":check")
        }
    }

-    create("gradlePluginTest") {
+    "gradlePluginTest" {
        gradlePluginProjects.forEach {
-            dependsOn("$it:check")
+            dependsOn(it + ":check")
        }
    }

-    create("gradlePluginIntegrationTest") {
+    "gradlePluginIntegrationTest" {
        dependsOn(":kotlin-gradle-plugin-integration-tests:check")
    }

-    create("jvmCompilerTest") {
+    "jvmCompilerTest" {
        dependsOn("dist")
-        dependsOn(
-            ":compiler:test",
-            ":compiler:container:test",
-            ":compiler:tests-java8:test",
-            ":compiler:tests-spec:remoteRunTests"
-        )
-        dependsOn(":plugins:jvm-abi-gen:test")
+        dependsOn(":compiler:test",
+                  ":compiler:container:test",
+                  ":compiler:tests-java8:test")
    }

-    create("jsCompilerTest") {
+    "jsCompilerTest" {
        dependsOn(":js:js.tests:test")
        dependsOn(":js:js.tests:runMocha")
    }

-    create("firCompilerTest") {
-        dependsOn(":compiler:fir:psi2fir:test")
-        dependsOn(":compiler:fir:resolve:test")
-        dependsOn(":compiler:fir:fir2ir:test")
-        dependsOn(":compiler:fir:lightTree:test")
-    }
-
-    create("scriptingTest") {
+    "scriptingTest" {
        dependsOn("dist")
        dependsOn(":kotlin-script-util:test")
-        dependsOn(":kotlin-scripting-compiler:test")
-        dependsOn(":kotlin-scripting-jvm-host-test:test")
-        dependsOn(":kotlin-scripting-jsr223-test:test")
-        dependsOn(":kotlin-scripting-jvm-host-test:embeddableTest")
-        dependsOn(":kotlin-scripting-jsr223-test:embeddableTest")
-        dependsOn(":kotlin-main-kts-test:test")
    }

-    create("compilerTest") {
+    "compilerTest" {
        dependsOn("jvmCompilerTest")
        dependsOn("jsCompilerTest")
-        dependsOn("firCompilerTest")

        dependsOn("scriptingTest")
        dependsOn(":kotlin-build-common:test")
        dependsOn(":compiler:incremental-compilation-impl:test")
-        dependsOn(":core:descriptors.runtime:test")
    }

-    create("toolsTest") {
+    "toolsTest" {
        dependsOn(":tools:kotlinp:test")
    }

-    create("examplesTest") {
+    "examplesTest" {
        dependsOn("dist")
        (project(":examples").subprojects + project(":kotlin-gradle-subplugin-example")).forEach { p ->
            dependsOn("${p.path}:check")
        }
    }

-    create("distTest") {
+    "distTest" {
        dependsOn("compilerTest")
        dependsOn("toolsTest")
        dependsOn("gradlePluginTest")
        dependsOn("examplesTest")
    }

-    create("specTest") {
-        dependsOn("dist")
-        dependsOn(":compiler:tests-spec:test")
-    }
-
-    create("androidCodegenTest") {
+    "androidCodegenTest" {
        dependsOn(":compiler:android-tests:test")
    }

-    create("jps-tests") {
+    "jps-tests" {
        dependsOn("dist")
        dependsOn(":jps-plugin:test")
    }

-    create("idea-plugin-main-tests") {
+    "idea-plugin-main-tests" {
        dependsOn("dist")
        dependsOn(":idea:test")
    }

-    create("idea-plugin-additional-tests") {
+    "idea-plugin-additional-tests" {
        dependsOn("dist")
-        dependsOn(
-            ":idea:idea-gradle:test",
-            ":idea:idea-gradle-native:test",
-            ":idea:idea-maven:test",
-            ":j2k:test",
-            ":nj2k:test",
-            ":idea:jvm-debugger:jvm-debugger-core:test",
-            ":idea:jvm-debugger:jvm-debugger-evaluation:test",
-            ":idea:jvm-debugger:jvm-debugger-sequence:test",
-            ":idea:jvm-debugger:eval4j:test"
-        )
+        dependsOn(":idea:idea-gradle:test",
+                  ":idea:idea-maven:test",
+                  ":j2k:test",
+                  ":eval4j:test")
    }

-    create("idea-plugin-tests") {
+    "idea-plugin-tests" {
        dependsOn("dist")
-        dependsOn(
-            "idea-plugin-main-tests",
-            "idea-plugin-additional-tests"
-        )
+        dependsOn("idea-plugin-main-tests",
+                  "idea-plugin-additional-tests")
    }

-    create("android-ide-tests") {
+    "android-ide-tests" {
        dependsOn("dist")
-        dependsOn(
-            ":plugins:android-extensions-ide:test",
-            ":idea:idea-android:test",
-            ":kotlin-annotation-processing:test"
-        )
+        dependsOn(":plugins:android-extensions-ide:test",
+                  ":idea:idea-android:test",
+                  ":kotlin-annotation-processing:test")
    }

-    create("plugins-tests") {
+    "plugins-tests" {
        dependsOn("dist")
+        dependsOn(":kotlin-annotation-processing:test",
+                  ":kotlin-source-sections-compiler-plugin:test",
+                  ":kotlin-allopen-compiler-plugin:test",
+                  ":kotlin-noarg-compiler-plugin:test",
+                  ":kotlin-sam-with-receiver-compiler-plugin:test",
+                  ":plugins:uast-kotlin:test",
+                  ":kotlin-annotation-processing-gradle:test")
+    }
+
+
+    "ideaPluginTest" {
        dependsOn(
-            ":kotlin-annotation-processing:test",
-            ":kotlin-source-sections-compiler-plugin:test",
-            ":kotlin-allopen-compiler-plugin:test",
-            ":kotlin-noarg-compiler-plugin:test",
-            ":kotlin-sam-with-receiver-compiler-plugin:test",
-            ":plugins:uast-kotlin:test",
-            ":kotlin-annotation-processing-gradle:test",
-            ":kotlinx-serialization-compiler-plugin:test",
-            ":kotlinx-serialization-ide-plugin:test"
+                "idea-plugin-tests",
+                "jps-tests",
+                "plugins-tests",
+                "android-ide-tests",
+                ":generators:test"
        )
    }


-    create("ideaPluginTest") {
-        dependsOn(
-            "idea-plugin-tests",
-            "jps-tests",
-            "plugins-tests",
-            "android-ide-tests",
-            ":generators:test"
-        )
-    }
-
-
-    create("test") {
+    "test" {
        doLast {
            throw GradleException("Don't use directly, use aggregate tasks *-check instead")
        }
    }
-
-    create("check") {
-        dependsOn("test")
-    }
+    "check" { dependsOn("test") }
 }

 fun CopySpec.setExecutablePermissions() {
@@ -654,27 +558,14 @@ val zipCompiler by task<Zip> {
    }
 }

-val zipStdlibTests by task<Zip> {
-    destinationDirectory.set(file(distDir))
-    archiveFileName.set("kotlin-stdlib-tests.zip")
-    from("libraries/stdlib/common/test") { into("common") }
-    from("libraries/stdlib/test") { into("test") }
-    doLast {
-        logger.lifecycle("Stdlib tests are packed to ${archiveFile.get()}")
-    }
-}
-
 val zipTestData by task<Zip> {
-    dependsOn(zipStdlibTests)
-    destinationDirectory.set(file(distDir))
-    archiveFileName.set("kotlin-test-data.zip")
-    isZip64 = true
+    destinationDir = file(distDir)
+    archiveName = "kotlin-test-data.zip"
    from("compiler/testData") { into("compiler") }
    from("idea/testData") { into("ide") }
    from("idea/idea-completion/testData") { into("ide/completion") }
-    from("compiler/tests-common/tests/org/jetbrains/kotlin/coroutineTestUtil.kt") { into("compiler") }
    doLast {
-        logger.lifecycle("Test data packed to ${archiveFile.get()}")
+        logger.lifecycle("Test data packed to $archivePath")
    }
 }

@@ -702,34 +593,68 @@ val zipPlugin by task<Zip> {
    }
 }

+val cidrPlugin by task<Copy> {
+    dependsOn(ideaPlugin)
+    into(cidrPluginDir)
+    from(ideaPluginDir) {
+        exclude("lib/kotlin-plugin.jar")
+
+        exclude("lib/android-lint.jar")
+        exclude("lib/android-ide.jar")
+        exclude("lib/android-output-parser-ide.jar")
+        exclude("lib/android-extensions-ide.jar")
+        exclude("lib/android-extensions-compiler.jar")
+        exclude("lib/kapt3-idea.jar")
+        exclude("lib/jps-ide.jar")
+        exclude("lib/jps/**")
+        exclude("kotlinc/**")
+        exclude("lib/maven-ide.jar")
+    }
+    from(cidrKotlinPlugin) { into("lib") }
+}
+
+val zipCidrPlugin by task<Zip> {
+    val destPath = project.findProperty("pluginZipPath") as String?
+            ?: "$distDir/artifacts/kotlin-plugin-$kotlinVersion-CIDR.zip"
+    val destFile = File(destPath)
+
+    destinationDir = destFile.parentFile
+    archiveName = destFile.name
+
+    from(cidrPlugin)
+    into("Kotlin")
+    setExecutablePermissions()
+
+    doLast {
+        logger.lifecycle("Plugin artifacts packed to $archivePath")
+    }
+}
+
 configure<IdeaModel> {
    module {
        excludeDirs = files(
-            project.buildDir,
-            commonLocalDataDir,
-            ".gradle",
-            "dependencies",
-            "dist"
+                project.buildDir,
+                commonLocalDataDir,
+                ".gradle",
+                "dependencies",
+                "dist"
        ).toSet()
    }
 }

-fun jdkPath(version: String): String {
+fun jdkPathIfFound(version: String): String? {
    val jdkName = "JDK_${version.replace(".", "")}"
    val jdkMajorVersion = JdkMajorVersion.valueOf(jdkName)
-    return configuredJdks.find { it.majorVersion == jdkMajorVersion }?.homeDir?.canonicalPath ?: jdkNotFoundConst
+    return configuredJdks.find { it.majorVersion == jdkMajorVersion }?.homeDir?.canonicalPath
 }

+fun jdkPath(version: String): String = jdkPathIfFound(version)
+        ?: throw GradleException ("Please set environment variable JDK_${version.replace(".", "")} to point to JDK $version installation")

 fun Project.configureJvmProject(javaHome: String, javaVersion: String) {
-    val currentJavaHome = File(System.getProperty("java.home")!!).canonicalPath
-    val shouldFork = !currentJavaHome.startsWith(File(javaHome).canonicalPath)
-
    tasks.withType<JavaCompile> {
        if (name != "compileJava9Java") {
-            sourceCompatibility = javaVersion
-            targetCompatibility = javaVersion
-            options.isFork = shouldFork
+            options.isFork = true
            options.forkOptions.javaHome = file(javaHome)
            options.compilerArgs.add("-proc:none")
            options.encoding = "UTF-8"
@@ -739,34 +664,11 @@ fun Project.configureJvmProject(javaHome: String, javaVersion: String) {
    tasks.withType<KotlinCompile> {
        kotlinOptions.jdkHome = javaHome
        kotlinOptions.jvmTarget = javaVersion
-        kotlinOptions.freeCompilerArgs += "-Xjvm-default=compatibility"
    }

    tasks.withType<Test> {
        executable = File(javaHome, "bin/java").canonicalPath
    }
-
-    plugins.withId("java-base") {
-        configureShadowJarSubstitutionInCompileClasspath()
-    }
-}
-
-fun Project.configureShadowJarSubstitutionInCompileClasspath() {
-    val substitutionMap = mapOf(":kotlin-reflect" to ":kotlin-reflect-api")
-
-    fun configureSubstitution(substitution: DependencySubstitution) {
-        val requestedProject = (substitution.requested as? ProjectComponentSelector)?.projectPath ?: return
-        val replacementProject = substitutionMap[requestedProject] ?: return
-        substitution.useTarget(project(replacementProject), "Non-default shadow jars should not be used in compile classpath")
-    }
-
-    sourceSets.all {
-        for (configName in listOf(compileOnlyConfigurationName, compileClasspathConfigurationName)) {
-            configurations.getByName(configName).resolutionStrategy.dependencySubstitution {
-                all(::configureSubstitution)
-            }
-        }
-    }
 }

 tasks.create("findShadowJarsInClasspath").doLast {
@@ -774,19 +676,12 @@ tasks.create("findShadowJarsInClasspath").doLast {
        sortedBy { it.path }.forEach { println(indent + it.relativeTo(rootProject.projectDir)) }
    }

-    val mainJars = hashSetOf<File>()
    val shadowJars = hashSetOf<File>()
    for (project in rootProject.allprojects) {
-        project.withJavaPlugin {
-            project.sourceSets.forEach { sourceSet ->
-                val jarTask = project.tasks.findByPath(sourceSet.jarTaskName) as? Jar
-                jarTask?.outputFile?.let { mainJars.add(it) }
-            }
-        }
        for (task in project.tasks) {
            when (task) {
                is ShadowJar -> {
-                    shadowJars.add(fileFrom(task.outputFile))
+                    shadowJars.add(fileFrom(task.archivePath))
                }
                is ProGuardTask -> {
                    shadowJars.addAll(task.outputs.files.toList())
@@ -795,8 +690,7 @@ tasks.create("findShadowJarsInClasspath").doLast {
        }
    }

-    shadowJars.removeAll(mainJars)
-    println("Shadow jars that might break incremental compilation:")
+    println("Shadow jars:")
    shadowJars.printSorted()

    fun Project.checkConfig(configName: String) {
@@ -810,14 +704,7 @@ tasks.create("findShadowJarsInClasspath").doLast {
    }

    for (project in rootProject.allprojects) {
-        project.sourceSetsOrNull?.forEach { sourceSet ->
-            project.checkConfig(sourceSet.compileClasspathConfigurationName)
-        }
+        project.checkConfig("compileClasspath")
+        project.checkConfig("testCompileClasspath")
    }
 }
-
-val Jar.outputFile: File
-    get() = archiveFile.get().asFile
-
-val Project.sourceSetsOrNull: SourceSetContainer?
-    get() = convention.findPlugin(JavaPluginConvention::class.java)?.sourceSets
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,21 +1,11 @@
-import java.util.Properties
-
-extra["versions.shadow"] = "4.0.3"
-extra["versions.native-platform"] = "0.14"

 buildscript {
-    val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
-
    val buildSrcKotlinVersion: String by extra(findProperty("buildSrc.kotlin.version")?.toString() ?: embeddedKotlinVersion)
    val buildSrcKotlinRepo: String? by extra(findProperty("buildSrc.kotlin.repo") as String?)
+    extra["versions.shadow"] = "2.0.2"
+    extra["versions.native-platform"] = "0.14"

    repositories {
-        if (cacheRedirectorEnabled) {
-            maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com")
-        } else {
-            jcenter()
-        }
-
        buildSrcKotlinRepo?.let {
            maven(url = it)
        }
@@ -27,8 +17,6 @@ buildscript {
    }
 }

-val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
-
 logger.info("buildSrcKotlinVersion: " + extra["buildSrcKotlinVersion"])
 logger.info("buildSrc kotlin compiler version: " + org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
 logger.info("buildSrc stdlib version: " + KotlinVersion.CURRENT)
@@ -44,12 +32,12 @@ plugins {
 }

 gradlePlugin {
-    plugins {
-        register("pill-configurable") {
+    (plugins) {
+        "pill-configurable" {
            id = "pill-configurable"
            implementationClass = "org.jetbrains.kotlin.pill.PillConfigurablePlugin"
        }
-        register("jps-compatible") {
+        "jps-compatible" {
            id = "jps-compatible"
            implementationClass = "org.jetbrains.kotlin.pill.JpsCompatiblePlugin"
        }
@@ -63,46 +51,37 @@ fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)
 }

 rootProject.apply {
-    from(rootProject.file("../gradle/versions.gradle.kts"))
+    from(rootProject.file("../versions.gradle.kts"))
 }

-val flags = LocalBuildProperties(project)
-
-val isTeamcityBuild = flags.isTeamcityBuild
-val intellijUltimateEnabled by extra(flags.intellijUltimateEnabled)
+val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
+val intellijUltimateEnabled by extra(project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild)
 val intellijSeparateSdks by extra(project.getBooleanProperty("intellijSeparateSdks") ?: false)
-val verifyDependencyOutput by extra( getBooleanProperty("kotlin.build.dependency.output.verification") ?: isTeamcityBuild)
-
-extra["intellijReleaseType"] = if (extra["versions.intellijSdk"]?.toString()?.endsWith("SNAPSHOT") == true)
-    "snapshots"
-else
-    "releases"

+extra["intellijRepo"] = "https://www.jetbrains.com/intellij-repository"
+extra["intellijReleaseType"] = "releases" // or "snapshots"
 extra["versions.androidDxSources"] = "5.0.0_r2"

-extra["customDepsOrg"] = "kotlin.build"
+extra["customDepsOrg"] = "kotlin.build.custom.deps"

 repositories {
-    maven("https://jetbrains.bintray.com/intellij-third-party-dependencies/")
-    maven("https://plugins.gradle.org/m2/")
-    jcenter()
-
    extra["buildSrcKotlinRepo"]?.let {
        maven(url = it)
    }
+    maven(url = "https://repo.gradle.org/gradle/ext-releases-local") // for native-platform
+    jcenter()
 }

 dependencies {
-    compile(kotlin("stdlib", embeddedKotlinVersion))
    compile("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
    compile("net.rubygrapefruit:native-platform-windows-amd64:${property("versions.native-platform")}")
    compile("net.rubygrapefruit:native-platform-windows-i386:${property("versions.native-platform")}")
    compile("com.jakewharton.dex:dex-method-list:3.0.0")
-
+    // TODO: adding the dep to the plugin breaks the build unexpectedly, resolve and uncomment
+//    compile("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["bootstrap_kotlin_version"]}")
+    // Shadow plugin is used in many projects of the main build. Once it's no longer used in buildSrc, please move this dependency to the root project
    compile("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}")
-    compile("org.jetbrains.intellij.deps:asm-all:7.0.1")
-
-    compile("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.5")
+    compile("org.ow2.asm:asm-all:6.0_BETA")
 }

 samWithReceiver {
@@ -112,44 +91,4 @@ samWithReceiver {
 fun Project.`samWithReceiver`(configure: org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverExtension.() -> Unit): Unit =
        extensions.configure("samWithReceiver", configure)

-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-tasks["build"].dependsOn(":prepare-deps:build")
-
-allprojects {
-    tasks.register("checkBuild")
-
-    afterEvaluate {
-        apply(from = "$rootDir/../gradle/cacheRedirector.gradle.kts")
-    }
-}
-
-// TODO: hide these classes in special gradle plugin for kotlin-ultimate which will support local.properties
-class LocalBuildPropertiesProvider(private val project: Project) {
-    private val localProperties: Properties = Properties()
-
-    val rootProjectDir: File = project.rootProject.rootDir.parentFile
-
-    init {
-        rootProjectDir.resolve("local.properties").takeIf { it.isFile }?.let {
-            it.reader().use(localProperties::load)
-        }
-    }
-
-    fun getString(name: String): String? = project.findProperty(name)?.toString() ?: localProperties[name]?.toString()
-
-    fun getBoolean(name: String): Boolean = getString(name)?.toBoolean() == true
-}
-
-class LocalBuildProperties(project: Project) {
-    val propertiesProvider = LocalBuildPropertiesProvider(project)
-
-    val isTeamcityBuild = propertiesProvider.getString("teamcity") != null || System.getenv("TEAMCITY_VERSION") != null
-
-    val intellijUltimateEnabled =
-        (propertiesProvider.getBoolean("intellijUltimateEnabled") || isTeamcityBuild)
-                && propertiesProvider.rootProjectDir.resolve("kotlin-ultimate").exists()
-}
+tasks["build"].dependsOn(":prepare-deps:android-dx:build", ":prepare-deps:intellij-sdk:build")
--- a/buildSrc/build.gradle.kts.182
+++ b/buildSrc/build.gradle.kts.182
@@ -0,0 +1,94 @@
+
+buildscript {
+    val buildSrcKotlinVersion: String by extra(findProperty("buildSrc.kotlin.version")?.toString() ?: embeddedKotlinVersion)
+    val buildSrcKotlinRepo: String? by extra(findProperty("buildSrc.kotlin.repo") as String?)
+    extra["versions.shadow"] = "2.0.2"
+    extra["versions.native-platform"] = "0.14"
+
+    repositories {
+        buildSrcKotlinRepo?.let {
+            maven(url = it)
+        }
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$buildSrcKotlinVersion")
+        classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:$buildSrcKotlinVersion")
+    }
+}
+
+logger.info("buildSrcKotlinVersion: " + extra["buildSrcKotlinVersion"])
+logger.info("buildSrc kotlin compiler version: " + org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
+logger.info("buildSrc stdlib version: " + KotlinVersion.CURRENT)
+
+apply {
+    plugin("kotlin")
+    plugin("kotlin-sam-with-receiver")
+}
+
+plugins {
+    `kotlin-dsl`
+    `java-gradle-plugin`
+}
+
+gradlePlugin {
+    (plugins) {
+        "pill-configurable" {
+            id = "pill-configurable"
+            implementationClass = "org.jetbrains.kotlin.pill.PillConfigurablePlugin"
+        }
+        "jps-compatible" {
+            id = "jps-compatible"
+            implementationClass = "org.jetbrains.kotlin.pill.JpsCompatiblePlugin"
+        }
+    }
+}
+
+fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)?.let {
+    val v = it.toString()
+    if (v.isBlank()) true
+    else v.toBoolean()
+}
+
+rootProject.apply {
+    from(rootProject.file("../versions.gradle.kts"))
+}
+
+val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
+val intellijUltimateEnabled by extra(project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild)
+val intellijSeparateSdks by extra(project.getBooleanProperty("intellijSeparateSdks") ?: false)
+
+extra["intellijRepo"] = "https://www.jetbrains.com/intellij-repository"
+extra["intellijReleaseType"] = "snapshots" // or "snapshots"
+extra["versions.androidDxSources"] = "5.0.0_r2"
+
+extra["customDepsOrg"] = "kotlin.build.custom.deps"
+
+repositories {
+    extra["buildSrcKotlinRepo"]?.let {
+        maven(url = it)
+    }
+    maven(url = "https://repo.gradle.org/gradle/ext-releases-local") // for native-platform
+    jcenter()
+}
+
+dependencies {
+    compile("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
+    compile("net.rubygrapefruit:native-platform-windows-amd64:${property("versions.native-platform")}")
+    compile("net.rubygrapefruit:native-platform-windows-i386:${property("versions.native-platform")}")
+    compile("com.jakewharton.dex:dex-method-list:3.0.0")
+    // TODO: adding the dep to the plugin breaks the build unexpectedly, resolve and uncomment
+//    compile("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["bootstrap_kotlin_version"]}")
+    // Shadow plugin is used in many projects of the main build. Once it's no longer used in buildSrc, please move this dependency to the root project
+    compile("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}")
+    compile("org.ow2.asm:asm-all:6.0_BETA")
+}
+
+samWithReceiver {
+    annotation("org.gradle.api.HasImplicitReceiver")
+}
+
+fun Project.`samWithReceiver`(configure: org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverExtension.() -> Unit): Unit =
+        extensions.configure("samWithReceiver", configure)
+
+tasks["build"].dependsOn(":prepare-deps:android-dx:build", ":prepare-deps:intellij-sdk:build")
--- a/buildSrc/gradle.properties
+++ b/buildSrc/gradle.properties
@@ -1,6 +1,7 @@
-org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m -Dfile.encoding=UTF-8
-
-cacheRedirectorEnabled=true
+org.gradle.daemon=true
+org.gradle.parallel=false
+org.gradle.configureondemand=false
+org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m

 #buildSrc.kotlin.repo=https://jcenter.bintray.com
 #buildSrc.kotlin.version=1.1.50
--- a/buildSrc/gradle.properties.as31
+++ b/buildSrc/gradle.properties.as31
@@ -0,0 +1,9 @@
+org.gradle.daemon=true
+org.gradle.parallel=false
+org.gradle.configureondemand=false
+org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m
+
+#buildSrc.kotlin.repo=https://jcenter.bintray.com
+#buildSrc.kotlin.version=1.1.50
+
+intellijUltimateEnabled=false
--- a/buildSrc/gradle.properties.as32
+++ b/buildSrc/gradle.properties.as32
@@ -0,0 +1,9 @@
+org.gradle.daemon=true
+org.gradle.parallel=false
+org.gradle.configureondemand=false
+org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m
+
+#buildSrc.kotlin.repo=https://jcenter.bintray.com
+#buildSrc.kotlin.version=1.1.50
+
+intellijUltimateEnabled=false
--- a/buildSrc/gradle.properties.as33
+++ b/buildSrc/gradle.properties.as33
@@ -1,8 +0,0 @@
-org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m -Dfile.encoding=UTF-8
-
-cacheRedirectorEnabled=true
-
-#buildSrc.kotlin.repo=https://jcenter.bintray.com
-#buildSrc.kotlin.version=1.1.50
-
-intellijUltimateEnabled=false
--- a/buildSrc/gradle.properties.as34
+++ b/buildSrc/gradle.properties.as34
@@ -1,8 +0,0 @@
-org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m -Dfile.encoding=UTF-8
-
-cacheRedirectorEnabled=true
-
-#buildSrc.kotlin.repo=https://jcenter.bintray.com
-#buildSrc.kotlin.version=1.1.50
-
-intellijUltimateEnabled=false
--- a/buildSrc/gradle.properties.as35
+++ b/buildSrc/gradle.properties.as35
@@ -1,8 +0,0 @@
-org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m -Dfile.encoding=UTF-8
-
-cacheRedirectorEnabled=true
-
-#buildSrc.kotlin.repo=https://jcenter.bintray.com
-#buildSrc.kotlin.version=1.1.50
-
-intellijUltimateEnabled=false
--- a/buildSrc/gradle.properties.as36
+++ b/buildSrc/gradle.properties.as36
@@ -1,8 +0,0 @@
-org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx1600m -Dfile.encoding=UTF-8
-
-cacheRedirectorEnabled=true
-
-#buildSrc.kotlin.repo=https://jcenter.bintray.com
-#buildSrc.kotlin.version=1.1.50
-
-intellijUltimateEnabled=false
--- a/buildSrc/prepare-deps/android-dx/build.gradle.kts
+++ b/buildSrc/prepare-deps/android-dx/build.gradle.kts
@@ -0,0 +1,109 @@
+
+import org.gradle.api.publish.ivy.internal.artifact.DefaultIvyArtifact
+import org.gradle.api.publish.ivy.internal.publication.DefaultIvyConfiguration
+import org.gradle.api.publish.ivy.internal.publication.DefaultIvyPublicationIdentity
+import org.gradle.api.publish.ivy.internal.publisher.IvyDescriptorFileGenerator
+import java.io.File
+import org.gradle.internal.os.OperatingSystem
+import org.gradle.jvm.tasks.Jar
+
+val toolsOs by lazy {
+    when {
+        OperatingSystem.current().isWindows -> "windows"
+        OperatingSystem.current().isMacOsX -> "macosx"
+        OperatingSystem.current().isLinux -> "linux"
+        else -> {
+            logger.error("Unknown operating system for android tools: ${OperatingSystem.current().name}")
+            ""
+        }
+    }
+}
+
+val buildToolsVersion = rootProject.extra["versions.androidBuildTools"] as String
+val dxSourcesVersion = rootProject.extra["versions.androidDxSources"] as String
+
+repositories {
+    ivy {
+        artifactPattern("https://dl-ssl.google.com/android/repository/[artifact]_[revision](-[classifier]).[ext]")
+        artifactPattern("https://android.googlesource.com/platform/dalvik/+archive/android-$dxSourcesVersion/[artifact].[ext]")
+        metadataSources {
+            artifact()
+        }
+    }
+}
+
+val customDepsRepoDir = File(buildDir, "repo")
+val customDepsOrg: String by rootProject.extra
+val dxModuleName = "android-dx"
+val dxRevision = buildToolsVersion
+val dxRepoModuleDir = File(customDepsRepoDir, "$customDepsOrg/$dxModuleName/$dxRevision")
+
+val buildToolsZip by configurations.creating
+val dxSourcesTar by configurations.creating
+
+dependencies {
+    buildToolsZip("google:build-tools:$buildToolsVersion:$toolsOs@zip")
+    dxSourcesTar("google:dx:0@tar.gz")
+}
+
+val unzipDxJar by tasks.creating {
+    dependsOn(buildToolsZip)
+    inputs.files(buildToolsZip)
+    outputs.files(File(dxRepoModuleDir, "dx.jar"))
+    doFirst {
+        project.copy {
+            from(zipTree(buildToolsZip.singleFile).files)
+            include("**/dx.jar")
+            into(dxRepoModuleDir)
+        }
+    }
+}
+
+val dxSourcesTargetDir = File(buildDir, "dx_src")
+
+val untarDxSources by tasks.creating {
+    dependsOn(dxSourcesTar)
+    inputs.files(dxSourcesTar)
+    outputs.dir(dxSourcesTargetDir)
+    doFirst {
+        project.copy {
+            from(tarTree(dxSourcesTar.singleFile))
+            include("src/**")
+            includeEmptyDirs = false
+            into(dxSourcesTargetDir)
+        }
+    }
+}
+
+val prepareDxSourcesJar by tasks.creating(Jar::class) {
+    dependsOn(untarDxSources)
+    from("$dxSourcesTargetDir/src")
+    destinationDir = dxRepoModuleDir
+    baseName = "dx"
+    classifier = "sources"
+}
+
+val prepareIvyXml by tasks.creating {
+    dependsOn(unzipDxJar, prepareDxSourcesJar)
+    inputs.files(unzipDxJar, prepareDxSourcesJar)
+    val ivyFile = File(dxRepoModuleDir, "$dxModuleName.ivy.xml")
+    outputs.file(ivyFile)
+    doLast {
+        with(IvyDescriptorFileGenerator(DefaultIvyPublicationIdentity(customDepsOrg, dxModuleName, dxRevision))) {
+            addConfiguration(DefaultIvyConfiguration("default"))
+            addConfiguration(DefaultIvyConfiguration("sources"))
+            addArtifact(DefaultIvyArtifact(File(dxRepoModuleDir, "dx.jar"), "dx", "jar", "jar", null).also { it.conf = "default" })
+            addArtifact(DefaultIvyArtifact(File(dxRepoModuleDir, "dx-sources.jar"), "dx", "jar", "sources", "sources").also { it.conf = "sources" })
+            writeTo(ivyFile)
+        }
+    }
+}
+
+val build by tasks.creating {
+    dependsOn(unzipDxJar, prepareDxSourcesJar, prepareIvyXml)
+}
+
+val clean by tasks.creating(Delete::class) {
+    delete(dxRepoModuleDir)
+    delete(buildDir)
+}
--- a/buildSrc/prepare-deps/build.gradle.kts
+++ b/buildSrc/prepare-deps/build.gradle.kts
@@ -1,449 +0,0 @@
-@file:Suppress("PropertyName", "HasPlatformType", "UnstableApiUsage")
-
-import org.gradle.internal.os.OperatingSystem
-import java.io.Closeable
-import java.io.FileWriter
-import java.io.OutputStreamWriter
-import java.net.URI
-import java.text.SimpleDateFormat
-import java.util.*
-import javax.xml.stream.XMLOutputFactory
-
-plugins {
-    base
-}
-
-val verifyDependencyOutput: Boolean by rootProject.extra
-val intellijUltimateEnabled: Boolean by rootProject.extra
-val intellijReleaseType: String by rootProject.extra
-val intellijVersion = rootProject.extra["versions.intellijSdk"] as String
-val asmVersion = rootProject.findProperty("versions.jar.asm-all") as String?
-val androidStudioRelease = rootProject.findProperty("versions.androidStudioRelease") as String?
-val androidStudioBuild = rootProject.findProperty("versions.androidStudioBuild") as String?
-val intellijSeparateSdks: Boolean by rootProject.extra
-val installIntellijCommunity = !intellijUltimateEnabled || intellijSeparateSdks
-val installIntellijUltimate = intellijUltimateEnabled
-
-val intellijVersionDelimiterIndex = intellijVersion.indexOfAny(charArrayOf('.', '-'))
-if (intellijVersionDelimiterIndex == -1) {
-    error("Invalid IDEA version $intellijVersion")
-}
-
-val platformBaseVersion = intellijVersion.substring(0, intellijVersionDelimiterIndex)
-
-logger.info("verifyDependencyOutput: $verifyDependencyOutput")
-logger.info("intellijUltimateEnabled: $intellijUltimateEnabled")
-logger.info("intellijVersion: $intellijVersion")
-logger.info("androidStudioRelease: $androidStudioRelease")
-logger.info("androidStudioBuild: $androidStudioBuild")
-logger.info("intellijSeparateSdks: $intellijSeparateSdks")
-logger.info("installIntellijCommunity: $installIntellijCommunity")
-logger.info("installIntellijUltimate: $installIntellijUltimate")
-
-val androidStudioOs by lazy {
-    when {
-        OperatingSystem.current().isWindows -> "windows"
-        OperatingSystem.current().isMacOsX -> "mac"
-        OperatingSystem.current().isLinux -> "linux"
-        else -> {
-            logger.error("Unknown operating system for android tools: ${OperatingSystem.current().name}")
-            ""
-        }
-    }
-}
-
-repositories {
-    if (androidStudioRelease != null) {
-        ivy {
-            url = URI("https://dl.google.com/dl/android/studio/ide-zips/$androidStudioRelease")
-
-            patternLayout {
-                artifact("[artifact]-[revision]-$androidStudioOs.[ext]")
-            }
-
-            metadataSources {
-                artifact()
-            }
-        }
-
-        ivy {
-            url = URI("https://dl.bintray.com/kotlin/as/")
-
-            patternLayout {
-                artifact("[artifact]-[revision]-$androidStudioOs.[ext]")
-            }
-
-            credentials {
-                username = System.getenv("AS_BINTRAY_USER_NAME") ?: findProperty("bintray.user") as String?
-                password = System.getenv("AS_BINTRAY_API_KEY") ?: findProperty("bintray.apikey") as String?
-            }
-
-            metadataSources {
-                artifact()
-            }
-        }
-    }
-
-    maven("https://www.jetbrains.com/intellij-repository/$intellijReleaseType")
-    maven("https://plugins.jetbrains.com/maven")
-    maven("https://jetbrains.bintray.com/intellij-third-party-dependencies/")
-}
-
-val intellij by configurations.creating
-val intellijUltimate by configurations.creating
-val androidStudio by configurations.creating
-val sources by configurations.creating
-val jpsStandalone by configurations.creating
-val intellijCore by configurations.creating
-val nodeJSPlugin by configurations.creating
-
-/**
- * Special repository for annotations.jar required for idea runtime only.
- *
- * See IntellijDependenciesKt.intellijRuntimeAnnotations for more details.
- */
-val intellijRuntimeAnnotations = "intellij-runtime-annotations"
-
-val customDepsRepoDir = rootProject.rootDir.parentFile.resolve("dependencies/repo")
-val customDepsOrg: String by rootProject.extra
-val customDepsRevision = intellijVersion
-val repoDir = File(customDepsRepoDir, customDepsOrg)
-
-dependencies {
-    if (androidStudioRelease != null) {
-        val extension = if (androidStudioOs == "linux" &&
-            (androidStudioRelease.startsWith("3.5") || androidStudioRelease.startsWith("3.6")))
-            "tar.gz"
-        else
-            "zip"
-
-        androidStudio("google:android-studio-ide:$androidStudioBuild@$extension")
-    } else {
-        if (installIntellijCommunity) {
-            intellij("com.jetbrains.intellij.idea:ideaIC:$intellijVersion")
-        }
-        if (installIntellijUltimate) {
-            intellijUltimate("com.jetbrains.intellij.idea:ideaIU:$intellijVersion")
-        }
-    }
-
-    if (asmVersion != null) {
-        sources("org.jetbrains.intellij.deps:asm-all:$asmVersion:sources@jar")
-    }
-
-    sources("com.jetbrains.intellij.idea:ideaIC:$intellijVersion:sources@jar")
-    jpsStandalone("com.jetbrains.intellij.idea:jps-standalone:$intellijVersion")
-    intellijCore("com.jetbrains.intellij.idea:intellij-core:$intellijVersion")
-    if (intellijUltimateEnabled) {
-        nodeJSPlugin("com.jetbrains.plugins:NodeJS:${rootProject.extra["versions.idea.NodeJS"]}@zip")
-    }
-}
-
-val makeIntellijCore = buildIvyRepositoryTask(intellijCore, customDepsOrg, customDepsRepoDir)
-
-val makeIntellijAnnotations by tasks.creating(Copy::class.java) {
-    dependsOn(makeIntellijCore)
-
-    from(repoDir.resolve("intellij-core/$intellijVersion/artifacts/annotations.jar"))
-
-    val targetDir = File(repoDir, "$intellijRuntimeAnnotations/$intellijVersion")
-    into(targetDir)
-
-    val ivyFile = File(targetDir, "$intellijRuntimeAnnotations.ivy.xml")
-    outputs.files(ivyFile)
-
-    doLast {
-        writeIvyXml(
-            customDepsOrg,
-            intellijRuntimeAnnotations,
-            intellijVersion,
-            intellijRuntimeAnnotations,
-            targetDir,
-            targetDir,
-            targetDir,
-            allowAnnotations = true
-        )
-    }
-}
-
-val mergeSources by tasks.creating(Jar::class.java) {
-    dependsOn(sources)
-    from(provider { sources.map(::zipTree) })
-    destinationDirectory.set(File(repoDir, sources.name))
-    archiveBaseName.set("intellij")
-    archiveClassifier.set("sources")
-    archiveVersion.set(intellijVersion)
-}
-
-val sourcesFile = mergeSources.outputs.files.singleFile
-
-val makeIde = if (androidStudioBuild != null) {
-    buildIvyRepositoryTask(
-        androidStudio,
-        customDepsOrg,
-        customDepsRepoDir,
-        if (androidStudioOs == "mac")
-            ::skipContentsDirectory 
-        else 
-            ::skipToplevelDirectory
-    )
-} else {
-    val task = if (installIntellijUltimate) {
-        buildIvyRepositoryTask(intellijUltimate, customDepsOrg, customDepsRepoDir, null, sourcesFile)
-    } else {
-        buildIvyRepositoryTask(intellij, customDepsOrg, customDepsRepoDir, null, sourcesFile)
-    }
-
-    task.configure {
-        dependsOn(mergeSources)
-    }
-
-    task
-}
-
-val buildJpsStandalone = buildIvyRepositoryTask(jpsStandalone, customDepsOrg, customDepsRepoDir, null, sourcesFile)
-val buildNodeJsPlugin = buildIvyRepositoryTask(nodeJSPlugin, customDepsOrg, customDepsRepoDir, ::skipToplevelDirectory, sourcesFile)
-
-tasks.named("build") {
-    dependsOn(
-        makeIntellijCore,
-        makeIde,
-        buildJpsStandalone,
-        makeIntellijAnnotations
-    )
-
-    if (installIntellijUltimate) {
-        dependsOn(buildNodeJsPlugin)
-    }
-}
-
-// Task to delete legacy repo locations
-tasks.create("cleanLegacy", Delete::class.java) {
-    delete("$projectDir/android-dx")
-    delete("$projectDir/intellij-sdk")
-}
-
-tasks.named<Delete>("clean") {
-    delete(customDepsRepoDir)
-}
-
-fun buildIvyRepositoryTask(
-    configuration: Configuration,
-    organization: String,
-    repoDirectory: File,
-    pathRemap: ((String) -> String)? = null,
-    sources: File? = null
-) = tasks.register("buildIvyRepositoryFor${configuration.name.capitalize()}") {
-
-    fun ResolvedArtifact.moduleDirectory(): File =
-        File(repoDirectory, "$organization/${moduleVersion.id.name}/${moduleVersion.id.version}")
-
-    dependsOn(configuration)
-    inputs.files(configuration)
-
-    if (verifyDependencyOutput) {
-        outputs.dir(provider {
-            configuration.resolvedConfiguration.resolvedArtifacts.single().moduleDirectory()
-        })
-    } else {
-        outputs.upToDateWhen {
-            configuration.resolvedConfiguration.resolvedArtifacts.single()
-                .moduleDirectory()
-                .exists()
-        }
-    }
-
-    doFirst {
-        configuration.resolvedConfiguration.resolvedArtifacts.single().run {
-            val moduleDirectory = moduleDirectory()
-            val artifactsDirectory = File(moduleDirectory(), "artifacts")
-
-            logger.info("Unpacking ${file.name} into ${artifactsDirectory.absolutePath}")
-            copy {
-                val fileTree = when (extension) {
-                    "tar.gz" -> tarTree(file)
-                    "zip" -> zipTree(file)
-                    else -> error("Unsupported artifact extension: $extension")
-                }
-
-                from(fileTree.matching {
-                    exclude("**/plugins/Kotlin/**")
-                })
-
-                into(artifactsDirectory)
-
-                if (pathRemap != null) {
-                    eachFile {
-                        path = pathRemap(path)
-                    }
-                }
-
-                includeEmptyDirs = false
-            }
-
-            writeIvyXml(
-                organization,
-                moduleVersion.id.name,
-                moduleVersion.id.version,
-                moduleVersion.id.name,
-                File(artifactsDirectory, "lib"),
-                File(artifactsDirectory, "lib"),
-                File(moduleDirectory, "ivy"),
-                *listOfNotNull(sources).toTypedArray()
-            )
-
-            val pluginsDirectory = File(artifactsDirectory, "plugins")
-            if (pluginsDirectory.exists()) {
-                file(File(artifactsDirectory, "plugins"))
-                    .listFiles { file: File -> file.isDirectory }
-                    .forEach {
-                        writeIvyXml(
-                            organization,
-                            it.name,
-                            moduleVersion.id.version,
-                            it.name,
-                            File(it, "lib"),
-                            File(it, "lib"),
-                            File(moduleDirectory, "ivy"),
-                            *listOfNotNull(sources).toTypedArray()
-                        )
-                    }
-            }
-        }
-    }
-}
-
-fun writeIvyXml(
-    organization: String,
-    moduleName: String,
-    version: String,
-    fileName: String,
-    baseDir: File,
-    artifactDir: File,
-    targetDir: File,
-    vararg sourcesJar: File,
-    allowAnnotations: Boolean = false
-) {
-    fun shouldIncludeIntellijJar(jar: File) =
-        jar.isFile
-                && jar.extension == "jar"
-                && !jar.name.startsWith("kotlin-")
-                && (allowAnnotations || jar.name != "annotations.jar") // see comments for [intellijAnnotations] above
-
-    val ivyFile = targetDir.resolve("$fileName.ivy.xml")
-    ivyFile.parentFile.mkdirs()
-    with(XMLWriter(FileWriter(ivyFile))) {
-        document("UTF-8", "1.0") {
-            element("ivy-module") {
-                attribute("version", "2.0")
-                attribute("xmlns:m", "http://ant.apache.org/ivy/maven")
-
-                emptyElement("info") {
-                    attributes(
-                        "organisation" to organization,
-                        "module" to moduleName,
-                        "revision" to version,
-                        "publication" to SimpleDateFormat("yyyyMMddHHmmss").format(Date())
-                    )
-                }
-
-                element("configurations") {
-                    listOf("default", "sources").forEach { configurationName ->
-                        emptyElement("conf") {
-                            attributes("name" to configurationName, "visibility" to "public")
-                        }
-                    }
-                }
-
-                element("publications") {
-                    artifactDir.listFiles()?.filter(::shouldIncludeIntellijJar)?.forEach { jarFile ->
-                        val relativeName = jarFile.toRelativeString(baseDir).removeSuffix(".jar")
-                        emptyElement("artifact") {
-                            attributes(
-                                "name" to relativeName,
-                                "type" to "jar",
-                                "ext" to "jar",
-                                "conf" to "default"
-                            )
-                        }
-                    }
-
-                    sourcesJar.forEach { jarFile ->
-                        emptyElement("artifact") {
-                            val sourcesArtifactName = jarFile.name
-                                .substringBeforeLast("-")
-                                .substringBeforeLast("-")
-
-                            attributes(
-                                "name" to sourcesArtifactName,
-                                "type" to "jar",
-                                "ext" to "jar",
-                                "conf" to "sources",
-                                "m:classifier" to "sources"
-                            )
-                        }
-                    }
-                }
-            }
-        }
-
-        close()
-    }
-}
-
-fun skipToplevelDirectory(path: String) = path.substringAfter('/')
-
-fun skipContentsDirectory(path: String) = path.substringAfter("Contents/")
-
-class XMLWriter(private val outputStreamWriter: OutputStreamWriter) : Closeable {
-
-    private val xmlStreamWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(outputStreamWriter)
-
-    private var depth = 0
-    private val indent = "  "
-
-    fun document(encoding: String, version: String, init: XMLWriter.() -> Unit) = apply {
-        xmlStreamWriter.writeStartDocument(encoding, version)
-
-        init()
-
-        xmlStreamWriter.writeEndDocument()
-    }
-
-    fun element(name: String, init: XMLWriter.() -> Unit) = apply {
-        writeIndent()
-        xmlStreamWriter.writeStartElement(name)
-        depth += 1
-
-        init()
-
-        depth -= 1
-        writeIndent()
-        xmlStreamWriter.writeEndElement()
-    }
-
-    fun emptyElement(name: String, init: XMLWriter.() -> Unit) = apply {
-        writeIndent()
-        xmlStreamWriter.writeEmptyElement(name)
-        init()
-    }
-
-    fun attribute(name: String, value: String): Unit = xmlStreamWriter.writeAttribute(name, value)
-
-    fun attributes(vararg attributes: Pair<String, String>) {
-        attributes.forEach { attribute(it.first, it.second) }
-    }
-
-    private fun writeIndent() {
-        xmlStreamWriter.writeCharacters("\n")
-        repeat(depth) {
-            xmlStreamWriter.writeCharacters(indent)
-        }
-    }
-
-    override fun close() {
-        xmlStreamWriter.flush()
-        xmlStreamWriter.close()
-        outputStreamWriter.close()
-    }
-}
--- a/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts
+++ b/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts
@@ -0,0 +1,287 @@
+
+@file:Suppress("PropertyName")
+
+import org.gradle.api.publish.ivy.internal.artifact.DefaultIvyArtifact
+import org.gradle.api.publish.ivy.internal.publication.DefaultIvyConfiguration
+import org.gradle.api.publish.ivy.internal.publication.DefaultIvyPublicationIdentity
+import org.gradle.api.publish.ivy.internal.publisher.IvyDescriptorFileGenerator
+import java.io.File
+import org.gradle.internal.os.OperatingSystem
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}")
+    }
+}
+
+val intellijUltimateEnabled: Boolean by rootProject.extra
+val intellijRepo: String by rootProject.extra
+val intellijReleaseType: String by rootProject.extra
+val intellijVersion = rootProject.extra["versions.intellijSdk"] as String
+val androidStudioRelease = rootProject.findProperty("versions.androidStudioRelease") as String?
+val androidStudioBuild = rootProject.findProperty("versions.androidStudioBuild") as String?
+val intellijSeparateSdks: Boolean by rootProject.extra
+val installIntellijCommunity = !intellijUltimateEnabled || intellijSeparateSdks
+val installIntellijUltimate = intellijUltimateEnabled
+
+val intellijVersionDelimiterIndex = intellijVersion.indexOfAny(charArrayOf('.', '-'))
+if (intellijVersionDelimiterIndex == -1) {
+    error("Invalid IDEA version $intellijVersion")
+}
+
+val platformBaseVersion = intellijVersion.substring(0, intellijVersionDelimiterIndex)
+
+logger.info("intellijUltimateEnabled: $intellijUltimateEnabled")
+
+logger.info("intellijVersion: $intellijVersion")
+logger.info("androidStudioRelease: $androidStudioRelease")
+logger.info("androidStudioBuild: $androidStudioBuild")
+
+logger.info("intellijSeparateSdks: $intellijSeparateSdks")
+logger.info("installIntellijCommunity: $installIntellijCommunity")
+logger.info("installIntellijUltimate: $installIntellijUltimate")
+
+val studioOs by lazy {
+    when {
+        OperatingSystem.current().isWindows -> "windows"
+        OperatingSystem.current().isMacOsX -> "mac"
+        OperatingSystem.current().isLinux -> "linux"
+        else -> {
+            logger.error("Unknown operating system for android tools: ${OperatingSystem.current().name}")
+            ""
+        }
+    }
+}
+
+repositories {
+    if (androidStudioRelease != null) {
+        ivy {
+            artifactPattern("https://dl.google.com/dl/android/studio/ide-zips/$androidStudioRelease/[artifact]-[revision]-$studioOs.zip")
+            metadataSources {
+                artifact()
+            }
+        }
+    }
+    maven { setUrl("$intellijRepo/$intellijReleaseType") }
+    maven { setUrl("https://plugins.jetbrains.com/maven") }
+    ivy {
+        artifactPattern("https://raw.github.com/JetBrains/intellij-community/[revision]/lib/src/[artifact].zip")
+        metadataSources {
+            artifact()
+        }
+    }
+}
+
+val intellij by configurations.creating
+val intellijUltimate by configurations.creating
+val sources by configurations.creating
+val `asm-shaded-sources` by configurations.creating
+val `jps-standalone` by configurations.creating
+val `jps-build-test` by configurations.creating
+val `intellij-core` by configurations.creating
+val `plugins-NodeJS` by configurations.creating
+
+val customDepsRepoDir = File(buildDir, "repo")
+val customDepsOrg: String by rootProject.extra
+val customDepsRevision = intellijVersion
+val customDepsRepoModulesDir = File(customDepsRepoDir, "$customDepsOrg/$customDepsRevision")
+val repoDir = customDepsRepoModulesDir
+
+dependencies {
+    if (androidStudioRelease != null) {
+        intellij("google:android-studio-ide:$androidStudioBuild")
+    } else {
+        if (installIntellijCommunity) {
+            intellij("com.jetbrains.intellij.idea:ideaIC:$intellijVersion")
+        }
+        if (installIntellijUltimate) {
+            intellijUltimate("com.jetbrains.intellij.idea:ideaIU:$intellijVersion")
+        }
+    }
+    sources("com.jetbrains.intellij.idea:ideaIC:$intellijVersion:sources@jar")
+    if (platformBaseVersion == "182") {
+        // There is no asm sources for 182 yet
+        `asm-shaded-sources`("asmsources:asm-src:181@zip")
+    } else {
+        `asm-shaded-sources`("asmsources:asm-src:$platformBaseVersion@zip")
+    }
+    `jps-standalone`("com.jetbrains.intellij.idea:jps-standalone:$intellijVersion")
+    `jps-build-test`("com.jetbrains.intellij.idea:jps-build-test:$intellijVersion")
+    `intellij-core`("com.jetbrains.intellij.idea:intellij-core:$intellijVersion")
+    if (intellijUltimateEnabled) {
+        `plugins-NodeJS`("com.jetbrains.plugins:NodeJS:${rootProject.extra["versions.idea.NodeJS"]}@zip")
+    }
+}
+
+fun Task.configureExtractFromConfigurationTask(sourceConfig: Configuration,
+                                               pathRemap: (String) -> String = { it },
+                                               extractor: (Configuration) -> Any) {
+    dependsOn(sourceConfig)
+    inputs.files(sourceConfig)
+    val targetDir = File(repoDir, sourceConfig.name)
+    outputs.dirs(targetDir)
+    doFirst {
+        project.copy {
+            from(extractor(sourceConfig))
+            into(targetDir)
+            eachFile {
+                path = pathRemap(path)
+            }
+        }
+    }
+}
+
+fun removePathPrefix(path: String): String {
+    if (androidStudioRelease == null) return path
+    val slashes = if (studioOs == "mac") 2 else 1
+    var result = path
+    repeat(slashes) {
+        result = result.substringAfter('/')
+    }
+    return result
+}
+
+val unzipIntellijSdk by tasks.creating {
+    configureExtractFromConfigurationTask(intellij, pathRemap = { removePathPrefix(it) }) {
+        zipTree(it.singleFile).matching {
+            exclude("**/plugins/Kotlin/**")
+        }
+    }
+}
+
+val unzipIntellijUltimateSdk by tasks.creating {
+    configureExtractFromConfigurationTask(intellijUltimate) {
+        zipTree(it.singleFile).matching {
+            exclude("plugins/Kotlin/**")
+        }
+    }
+}
+
+val unzipIntellijCore by tasks.creating { configureExtractFromConfigurationTask(`intellij-core`) { zipTree(it.singleFile) } }
+
+val unzipJpsStandalone by tasks.creating { configureExtractFromConfigurationTask(`jps-standalone`) { zipTree(it.singleFile) } }
+
+val copyAsmShadedSources by tasks.creating(Copy::class.java) {
+    from(`asm-shaded-sources`)
+    rename(".zip", ".jar")
+    destinationDir = File(repoDir, `asm-shaded-sources`.name)
+}
+
+val copyIntellijSdkSources by tasks.creating(ShadowJar::class.java) {
+    from(copyAsmShadedSources)
+    from(sources)
+    baseName = "ideaIC"
+    version = intellijVersion
+    classifier = "sources"
+    destinationDir = File(repoDir, sources.name)
+}
+
+val copyJpsBuildTest by tasks.creating { configureExtractFromConfigurationTask(`jps-build-test`) { it.singleFile } }
+
+val unzipNodeJSPlugin by tasks.creating { configureExtractFromConfigurationTask(`plugins-NodeJS`) { zipTree(it.singleFile) } }
+
+fun writeIvyXml(moduleName: String, fileName: String, jarFiles: FileCollection, baseDir: File, sourcesJar: File?) {
+    with(IvyDescriptorFileGenerator(DefaultIvyPublicationIdentity(customDepsOrg, moduleName, intellijVersion))) {
+        addConfiguration(DefaultIvyConfiguration("default"))
+        addConfiguration(DefaultIvyConfiguration("sources"))
+        jarFiles.asFileTree.files.forEach {
+            if (it.isFile && it.extension == "jar") {
+                val relativeName = it.toRelativeString(baseDir).removeSuffix(".jar")
+                addArtifact(DefaultIvyArtifact(it, relativeName, "jar", "jar", null).also { it.conf = "default" })
+            }
+        }
+        if (sourcesJar != null) {
+            val sourcesArtifactName = sourcesJar.name.removeSuffix(".jar").substringBefore("-")
+            addArtifact(DefaultIvyArtifact(sourcesJar, sourcesArtifactName, "jar", "sources", "sources").also { it.conf = "sources" })
+        }
+        writeTo(File(customDepsRepoModulesDir, "$fileName.ivy.xml"))
+    }
+}
+
+val prepareIvyXmls by tasks.creating {
+    dependsOn(unzipIntellijCore, unzipJpsStandalone, copyIntellijSdkSources, copyJpsBuildTest, copyAsmShadedSources)
+
+    val intellijSdkDir = File(repoDir, intellij.name)
+    val intellijUltimateSdkDir = File(repoDir, intellijUltimate.name)
+
+    if (installIntellijCommunity) {
+        dependsOn(unzipIntellijSdk)
+        inputs.dir(intellijSdkDir)
+        outputs.file(File(repoDir, "${intellij.name}.ivy.xml"))
+    }
+
+    if (installIntellijUltimate) {
+        dependsOn(unzipIntellijUltimateSdk)
+        inputs.dir(intellijUltimateSdkDir)
+        outputs.file(File(repoDir, "${intellijUltimate.name}.ivy.xml"))
+    }
+
+    val flatDeps = listOf(`intellij-core`, `jps-standalone`, `jps-build-test`, `asm-shaded-sources`)
+    flatDeps.forEach {
+        inputs.dir(File(repoDir, it.name))
+        outputs.file(File(repoDir, "${it.name}.ivy.xml"))
+    }
+    inputs.dir(File(repoDir, sources.name))
+
+    if (intellijUltimateEnabled) {
+        dependsOn(unzipNodeJSPlugin)
+        inputs.dir(File(repoDir, `plugins-NodeJS`.name))
+        outputs.file(File(repoDir, "${`plugins-NodeJS`.name}.ivy.xml"))
+    }
+
+    doFirst {
+        val sourcesFile = if (sources.isEmpty) null else File(repoDir, "${sources.name}/${sources.singleFile.name}")
+
+        if (installIntellijCommunity) {
+            val libDir = File(intellijSdkDir, "lib")
+            writeIvyXml(intellij.name,
+                        intellij.name,
+                        fileTree(libDir).filter {
+                            it.parentFile == libDir && !it.name.startsWith("kotlin-")
+                        },
+                        libDir,
+                        sourcesFile)
+
+            File(intellijSdkDir, "plugins").listFiles { it: File -> it.isDirectory }.forEach {
+                writeIvyXml(it.name, "intellij.plugin.${it.name}", files("$it/lib/"), File(it, "lib"), sourcesFile)
+            }
+        }
+
+        if (installIntellijUltimate) {
+            val libDir = File(intellijUltimateSdkDir, "lib")
+            writeIvyXml(intellij.name, // important! the module name should be "intellij"
+                        intellijUltimate.name,
+                        fileTree(libDir).filter {
+                            it.parentFile == libDir && !it.name.startsWith("kotlin-")
+                        },
+                        libDir,
+                        sourcesFile)
+
+            File(intellijUltimateSdkDir, "plugins").listFiles { it: File -> it.isDirectory }.forEach {
+                writeIvyXml(it.name, "intellijUltimate.plugin.${it.name}", files("$it/lib/"), File(it, "lib"), sourcesFile)
+            }
+        }
+
+        flatDeps.forEach {
+            writeIvyXml(it.name, it.name, files("$repoDir/${it.name}"), File(repoDir, it.name), sourcesFile)
+        }
+
+        if (intellijUltimateEnabled) {
+            val nodeJsBaseDir = "${`plugins-NodeJS`.name}/NodeJS/lib"
+            writeIvyXml("NodeJS", `plugins-NodeJS`.name, files("$repoDir/$nodeJsBaseDir"), File(repoDir, nodeJsBaseDir), sourcesFile)
+        }
+    }
+}
+
+val build by tasks.creating {
+    dependsOn(prepareIvyXmls)
+}
+
+val clean by tasks.creating(Delete::class) {
+    delete(customDepsRepoModulesDir)
+    delete(buildDir)
+}
--- a/buildSrc/settings.gradle
+++ b/buildSrc/settings.gradle
@@ -1,78 +1,3 @@
-pluginManagement {
-    repositories {
-        if (cacheRedirectorEnabled == 'true') {
-            logger.info("Using cache redirector for settings.gradle pluginManagement")
-            maven {
-                url "https://cache-redirector.jetbrains.com/plugins.gradle.org/m2"
-            }
-        } else {
-            gradlePluginPortal()
-        }
-    }
-}

-include "prepare-deps"
-
-def flags = new LocalBuildProperties(settings as Settings)
-
-if (flags.includeCidrPlugins) {
-    logger.info("Including CIDR plugins in buildSrc/settings.gradle")
-    include ":prepare-deps:kotlin-native-platform-deps"
-    project(":prepare-deps:kotlin-native-platform-deps").projectDir = file("${flags.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/kotlin-native-platform-deps")
-} else {
-    logger.info("NOT including CIDR plugins in buildSrc/settings.gradle")
-}
-
-if (flags.hasKotlinUltimate) {
-    logger.info("Including extension for IJ Ultimate in buildSrc/settings.gradle")
-    include ":prepare-deps:lldb-frontend"
-    include ":prepare-deps:native-debug-plugin"
-    project(":prepare-deps:lldb-frontend").projectDir = file("${flags.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/lldb-frontend")
-    project(":prepare-deps:native-debug-plugin").projectDir = file("${flags.propertiesProvider.rootProjectDir}/kotlin-ultimate/buildSrc/prepare-deps/native-debug-plugin")
-} else {
-    logger.info("Not including extension for IJ Ultimate in buildSrc/settings.gradle")
-}
-
-
-class LocalBuildPropertiesProvider {
-    private Settings settings
-    private Properties localProperties = new Properties()
-
-    File rootProjectDir
-
-    LocalBuildPropertiesProvider(Settings settings) {
-        this.settings = settings
-        this.rootProjectDir = settings.rootProject.projectDir.parentFile
-        
-        File propertiesFile = new File(rootProjectDir, 'local.properties')
-        if (propertiesFile.isFile()) {
-            propertiesFile.withInputStream { localProperties.load(it) }
-        }
-    }
-    
-    String getString(String name) {
-        if (settings.hasProperty(name)) {
-            return settings[name]?.toString()
-        } else {
-            return localProperties[name]?.toString()
-        }
-    }
-    
-    Boolean getBoolean(String name) {
-        return Boolean.parseBoolean(getString(name))
-    }
-}
-
-class LocalBuildProperties {
-    LocalBuildPropertiesProvider propertiesProvider
-    
-    boolean includeCidrPlugins
-
-    boolean hasKotlinUltimate
-
-    LocalBuildProperties(Settings settings) {
-        propertiesProvider = new LocalBuildPropertiesProvider(settings)
-        hasKotlinUltimate = new File(propertiesProvider.rootProjectDir, 'kotlin-ultimate').exists()
-        includeCidrPlugins = propertiesProvider.getBoolean('cidrPluginsEnabled') && hasKotlinUltimate
-    }
-}
+include "prepare-deps:android-dx",
+        "prepare-deps:intellij-sdk"
--- a/buildSrc/src/main/kotlin/AndroidSdkDependencies.kt
+++ b/buildSrc/src/main/kotlin/AndroidSdkDependencies.kt
@@ -0,0 +1,15 @@
+@file:Suppress("unused") // usages in build scripts are not tracked properly
+
+import org.gradle.api.Project
+import org.gradle.api.artifacts.dsl.RepositoryHandler
+import org.gradle.api.artifacts.repositories.IvyArtifactRepository
+import org.gradle.kotlin.dsl.extra
+import java.io.File
+
+fun RepositoryHandler.androidDxJarRepo(project: Project): IvyArtifactRepository = ivy {
+    val baseDir = File("${project.rootDir}/buildSrc/prepare-deps/android-dx/build/repo")
+    ivyPattern("${baseDir.canonicalPath}/[organisation]/[module]/[revision]/[module].ivy.xml")
+    artifactPattern("${baseDir.canonicalPath}/[organisation]/[module]/[revision]/[artifact](-[classifier]).jar")
+}
+
+fun Project.androidDxJar() = "kotlin.build.custom.deps:android-dx:${rootProject.extra["versions.androidBuildTools"]}"
--- a/buildSrc/src/main/kotlin/Bootstrap.kt
+++ b/buildSrc/src/main/kotlin/Bootstrap.kt
@@ -7,24 +7,19 @@ import org.gradle.kotlin.dsl.*
 var Project.bootstrapKotlinVersion: String
    get() = this.property("bootstrapKotlinVersion") as String
    private set(value) { this.extra["bootstrapKotlinVersion"] = value }
-
 var Project.bootstrapKotlinRepo: String?
    get() = this.property("bootstrapKotlinRepo") as String?
    private set(value) { this.extra["bootstrapKotlinRepo"] = value }

-val Project.internalKotlinRepo: String?
-    get() = bootstrapKotlinRepo?.replace("artifacts/content/maven/", "artifacts/content/internal/repo")
-
 fun Project.kotlinBootstrapFrom(defaultSource: BootstrapOption) {
    val customVersion = project.findProperty("bootstrap.kotlin.version") as String?
    val customRepo = project.findProperty("bootstrap.kotlin.repo") as String?
    val teamCityVersion = project.findProperty("bootstrap.teamcity.kotlin.version") as String?
-    val teamCityBuild = project.findProperty("bootstrap.teamcity.build.number") as String?
    val teamCityProject = project.findProperty("bootstrap.teamcity.project") as String?

    val bootstrapSource = when {
        project.hasProperty("bootstrap.local") -> BootstrapOption.Local(project.findProperty("bootstrap.local.version") as String?, project.findProperty("bootstrap.local.path") as String?)
-        teamCityVersion != null -> BootstrapOption.TeamCity(teamCityVersion, teamCityBuild, projectExtId = teamCityProject, onlySuccessBootstrap = false)
+        teamCityVersion != null -> BootstrapOption.TeamCity(teamCityVersion, projectExtId = teamCityProject, onlySuccessBootstrap = false)
        customVersion != null -> BootstrapOption.Custom(kotlinVersion = customVersion, repo = customRepo)
        else -> defaultSource
    }
@@ -52,15 +47,14 @@ sealed class BootstrapOption {

    /** Get bootstrap from teamcity maven artifacts of the specified build configuration
     *
-     * [kotlinVersion] the version of maven artifacts
-     * [buildNumber] build number of a teamcity build, by default the same as [kotlinVersion],
+     * [kotlinVersion] build number and the version of maven artifacts
     * [projectExtId] extId of a teamcity build configuration, by default "Kotlin_dev_Compiler",
     * [onlySuccessBootstrap] allow artifacts only from success builds of the default branch tagged with 'bootstrap' tag
     */
-    class TeamCity(val kotlinVersion: String, val buildNumber: String? = null, val projectExtId: String? = null, val onlySuccessBootstrap: Boolean = true) : BootstrapOption() {
+    class TeamCity(val kotlinVersion: String, val projectExtId: String? = null, val onlySuccessBootstrap: Boolean = true) : BootstrapOption() {
        override fun applyToProject(project: Project) {
            val query = if (onlySuccessBootstrap) "status:SUCCESS,tag:bootstrap,pinned:true" else "branch:default:any"
-            project.bootstrapKotlinRepo = "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:${projectExtId ?: "Kotlin_dev_Compiler"}),number:${buildNumber ?: kotlinVersion},$query/artifacts/content/maven/"
+            project.bootstrapKotlinRepo = "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:${projectExtId ?: "Kotlin_dev_Compiler"}),number:$kotlinVersion,$query/artifacts/content/maven/"
            project.bootstrapKotlinVersion = kotlinVersion
        }
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ilya Matveev	2f0e20b1c7	WIP: Basic support for Kotlin/Native * Target presets * Compilation into a klib * Compilation into native binraies: framework and executable * Basic dependencies between projects	2018-07-19 19:19:04 +07:00
Ilya Matveev	f924de871f	Add dependency on KN shared in gradle-plugin	2018-07-19 19:18:45 +07:00
Alexander Podkhalyuzin	f953726f64	Kotlin/Native support in IntelliJ IDEA	2018-07-16 12:31:29 +07:00
Sergey Igushkin	d32afbf28c	Fix non-MPP builds failing due to an invalid type cast	2018-07-12 17:54:53 +03:00
Sergey Igushkin	2f567f0fdb	Fix Android, clashes due to the naming conventions; refactor	2018-07-12 14:37:11 +03:00
Sergey Igushkin	c94386cff7	Fix old use cases and tests	2018-07-09 18:53:45 +03:00
Sergey Igushkin	2cb379c7da	(incomplete) new MPP design implementation	2018-07-06 17:21:09 +03:00
Sergey Igushkin	eeb9281b25	~ Partial implementation	2018-07-02 12:26:02 +03:00
Sergey Igushkin	698d69070c	(incomplete) new MPP design implementation	2018-06-29 14:00:49 +03:00
Sergey Igushkin	59cc320abc	~ Fix build after rebase on master	2018-06-26 15:33:40 +03:00
Sergey Igushkin	6bd1675a8b	~ Fix Android in experimental MPP (source sets were not detected)	2018-06-25 18:40:46 +03:00
Sergey Igushkin	d8d69fca98	Partial implementation of Android support in experimental MPP	2018-06-25 18:40:45 +03:00
Sergey Igushkin	504a9ec48f	Publishing with variants	2018-06-25 18:39:34 +03:00
Sergey Igushkin	712a108c7f	(minor) Make `allSource` include `kotlin` and `resources`.	2018-06-25 18:39:34 +03:00
Sergey Igushkin	ab9536b64a	Add `jvmWithJava` platform.	2018-06-25 18:39:33 +03:00
Sergey Igushkin	0072b62d76	Variants, expectedBy relation for single platform	2018-06-25 18:38:51 +03:00
Sergey Igushkin	83d9e9363e	Support JVM platform	2018-06-25 18:38:49 +03:00
Sergey Igushkin	150f8f34c7	Preparations for JVM platform in the experimental MPP plugin.	2018-06-25 18:36:32 +03:00
Sergey Igushkin	3bb1afb05a	Implement common and js platforms in the multiplatform plugin	2018-06-25 18:32:54 +03:00
Sergey Igushkin	0aaf084ff6	Add experimental multiplatform plugin	2018-06-25 18:32:54 +03:00
Sergey Igushkin	415006e7b2	Factor out some abstractions for Kotlin platforms, which should allow implementing a MPP plugin that just calls those abstractions.	2018-06-25 18:32:51 +03:00
Sergey Igushkin	6631d539ad	Кefactor KotlinSourceSet & base plugin, support Android & MPP	2018-06-25 18:28:43 +03:00
Sergey Igushkin	204c36fea2	Add Kotlin source sets that are Java-agnostic, use them instead of the Java source sets.	2018-06-25 17:52:02 +03:00