Update changelog for 1.4.20 release

Due to built dependency with java9

.bunch

@@ -1,2 +1,7 @@
+201
 202
-as42
+203_202
+193
+as40_193
+as41
+as42_202

.gitignore

@@ -32,8 +32,6 @@ build/
 .idea/modules
 .idea/runConfigurations/JPS_*.xml
 .idea/runConfigurations/PILL_*.xml
-.idea/runConfigurations/_FP_*.xml
-.idea/runConfigurations/_MT_*.xml
 .idea/libraries
 .idea/modules.xml
 .idea/gradle.xml
@@ -56,14 +54,8 @@ build/
 .idea/artifacts/kotlin_test_js_ir_*
 .idea/artifacts/kotlin_stdlib_wasm_*
 .idea/jarRepositories.xml
-.idea/csv-plugin.xml
 kotlin-ultimate/
 node_modules/
 .rpt2_cache/
 libraries/tools/kotlin-test-js-runner/lib/
 local.properties
-buildSrcTmp/
-distTmp/
-outTmp/
-/test.output
-/kotlin-native/dist

.idea/artifacts/kotlinx_cli_jvm_1_5_255_SNAPSHOT.xml

@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="kotlinx.cli-jvm-1.5.255-SNAPSHOT">
-    <output-path>$PROJECT_DIR$/kotlin-native/endorsedLibraries/kotlinx.cli/build/libs</output-path>
-    <root id="archive" name="kotlinx.cli-jvm-1.5.255-SNAPSHOT.jar">
-      <element id="module-output" name="kotlin.kotlin-native.endorsedLibraries.kotlinx.cli.jvmMain" />
-    </root>
-  </artifact>
-</component>

.idea/codeStyles/Project.xml

@@ -63,6 +63,27 @@
       <option name="FOR_BRACE_FORCE" value="1" />
       <option name="FIELD_ANNOTATION_WRAP" value="0" />
     </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" />
+    </codeStyleSettings>
     <codeStyleSettings language="PROTO">
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />

.idea/dictionaries/dmitriy_dolovov.xml

@@ -10,7 +10,6 @@
       <w>commonizers</w>
       <w>commonizes</w>
       <w>commonizing</w>
-      <w>interop</w>
       <w>jetbrains</w>
       <w>konan</w>
       <w>kotlinx</w>

.idea/dictionaries/sebastiansellmair.xml

@@ -1,9 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="sebastiansellmair">
-    <words>
-      <w>cinterops</w>
-      <w>interops</w>
-      <w>klibrary</w>
-    </words>
-  </dictionary>
-</component>

.idea/dictionaries/svyatoslav_kuzmich.xml

@@ -1,27 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="svyatoslav.kuzmich">
-    <words>
-      <w>anyfunc</w>
-      <w>copysign</w>
-      <w>eqref</w>
-      <w>exnref</w>
-      <w>externref</w>
-      <w>funcref</w>
-      <w>jetbrains</w>
-      <w>kotlinx</w>
-      <w>ktor</w>
-      <w>optref</w>
-      <w>popcnt</w>
-      <w>rotl</w>
-      <w>rotr</w>
-      <w>simd</w>
-      <w>sqrt</w>
-      <w>testsuite</w>
-      <w>uninstantiable</w>
-      <w>unlinkable</w>
-      <w>vtable</w>
-      <w>wabt</w>
-      <w>xopt</w>
-    </words>
-  </dictionary>
-</component>

.idea/inspectionProfiles/idea_default.xml

@@ -453,4 +453,4 @@
       <option name="ignoreNonEmtpyLoops" value="false" />
     </inspection_tool>
   </profile>
-</component>
+</component>

.idea/misc.xml

@@ -12,14 +12,10 @@
       <item index="2" class="java.lang.String" itemvalue="org.gradle.api.tasks.options.Option" />
     </list>
   </component>
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
   <component name="IdProvider" IDEtalkID="71A301FF1940049D6D82F12C40F1E1D5" />
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
   <component name="JavadocGenerationManager">
     <option name="OTHER_OPTIONS" value="" />
   </component>

.idea/runConfigurations/Generate_All_Tests.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Generate All Tests" type="GradleRunConfiguration" factoryName="Gradle" folderName="Generators">
+  <configuration default="false" name="Generate All Tests" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -17,4 +17,4 @@
     </ExternalSystemSettings>
     <method />
   </configuration>
-</component>
+</component>

.idea/runConfigurations/Generate_Compiler_Tests.xml

@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value=":compiler:tests-for-compiler-generator:generateTests" />
+          <option value=":compiler:generateTests" />
           <option value=":compiler:tests-java8:generateTests" />
           <option value=":compiler:tests-against-klib:generateTests" />
           <option value=":js:js.tests:generateTests" />
@@ -22,4 +22,4 @@
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <method />
   </configuration>
-</component>
+</component>

.idea/runConfigurations/Generate_FIR_Checker_Components_and_FIR_IDE_Diagnostics.xml

@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Generate FIR Checker Components and FIR/IDE Diagnostics" type="GradleRunConfiguration" factoryName="Gradle" folderName="Generators">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":compiler:fir:checkers:generateCheckersComponents" />
-          <option value=":idea:idea-frontend-fir:generateCode" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>

.idea/runConfigurations/Generate_FIR_tree.xml

@@ -1,21 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Generate FIR tree" type="GradleRunConfiguration" factoryName="Gradle" folderName="Generators">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$/compiler/fir/tree" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="generateTree" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
-    <method v="2" />
-  </configuration>
-</component>

.idea/runConfigurations/Generate_standard_library_sources.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Generate standard library sources" type="GradleRunConfiguration" factoryName="Gradle" folderName="Stdlib">
+  <configuration default="false" name="Generate standard library sources" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$/libraries/tools/kotlin-stdlib-gen" />
@@ -17,4 +17,4 @@
     </ExternalSystemSettings>
     <method />
   </configuration>
-</component>
+</component>

.idea/runConfigurations/IDEA.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA" type="GradleRunConfiguration" factoryName="Gradle" singleton="true" folderName="IDEA">
+  <configuration default="false" name="IDEA" type="GradleRunConfiguration" factoryName="Gradle" singleton="true">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -17,4 +17,4 @@
     </ExternalSystemSettings>
     <method />
   </configuration>
-</component>
+</component>

.idea/runConfigurations/IDEA_Ultimate.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA Ultimate" type="GradleRunConfiguration" factoryName="Gradle" folderName="IDEA">
+  <configuration default="false" name="IDEA Ultimate" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -17,4 +17,4 @@
     </ExternalSystemSettings>
     <method />
   </configuration>
-</component>
+</component>

.idea/runConfigurations/IDEA_Ultimate__No_ProcessCanceledException__.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA Ultimate (No ProcessCanceledException) " type="GradleRunConfiguration" factoryName="Gradle" folderName="IDEA">
+  <configuration default="false" name="IDEA Ultimate (No ProcessCanceledException) " type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -17,4 +17,4 @@
     </ExternalSystemSettings>
     <method />
   </configuration>
-</component>
+</component>

.idea/runConfigurations/IDEA__No_ProcessCanceledException_.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA (No ProcessCanceledException)" type="GradleRunConfiguration" factoryName="Gradle" folderName="IDEA">
+  <configuration default="false" name="IDEA (No ProcessCanceledException)" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -17,4 +17,4 @@
     </ExternalSystemSettings>
     <method />
   </configuration>
-</component>
+</component>

.idea/runConfigurations/IDEA__Not_Internal_.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IDEA (Not Internal)" type="GradleRunConfiguration" factoryName="Gradle" folderName="IDEA">
+  <configuration default="false" name="IDEA (Not Internal)" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -16,4 +16,4 @@
       <option name="vmOptions" value="" />
     </ExternalSystemSettings>
   </configuration>
-</component>
+</component>

.idea/runConfigurations/Test__Commonizer.xml

@@ -1,25 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test: Commonizer" type="GradleRunConfiguration" factoryName="Gradle" folderName="Tests">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="--tests &quot;org.jetbrains.kotlin.gradle.CommonizerHierarchicalIT&quot; --tests &quot;org.jetbrains.kotlin.gradle.CommonizerIT&quot; --tests &quot;org.jetbrains.kotlin.commonizer.**&quot;" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value=":native:kotlin-klib-commonizer-api:test" />
-          <option value=":native:kotlin-klib-commonizer:test" />
-          <option value=":kotlin-gradle-plugin-integration-tests:test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>

.idea/runConfigurations/Test__KMM.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test: KMM" type="GradleRunConfiguration" factoryName="Gradle" folderName="Tests">
+  <configuration default="false" name="Test: KMM" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -17,4 +17,4 @@
     </ExternalSystemSettings>
     <method v="2" />
   </configuration>
-</component>
+</component>

.idea/runConfigurations/Test__public_API_binary_compatibility_validator__overwrite_results.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test: public API binary compatibility validator, overwrite results" type="GradleRunConfiguration" factoryName="Gradle" folderName="Stdlib">
+  <configuration default="false" name="Test: public API binary compatibility validator, overwrite results" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$/libraries/tools/binary-compatibility-validator" />
@@ -18,4 +18,4 @@
     </ExternalSystemSettings>
     <method />
   </configuration>
-</component>
+</component>

.idea/runConfigurations/Test__stdlib_js_public_kotlin_api_test__overwrite_results.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test: stdlib-js public kotlin api test, overwrite results" type="GradleRunConfiguration" factoryName="Gradle" folderName="Stdlib">
+  <configuration default="false" name="Test: stdlib-js public kotlin api test, overwrite results" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -19,4 +19,4 @@
     <GradleScriptDebugEnabled>false</GradleScriptDebugEnabled>
     <method v="2" />
   </configuration>
-</component>
+</component>

ReadMe.md

@@ -2,14 +2,10 @@
 [![TeamCity (simple build status)](https://img.shields.io/teamcity/http/teamcity.jetbrains.com/s/Kotlin_KotlinPublic_Compiler.svg)](https://teamcity.jetbrains.com/buildConfiguration/Kotlin_KotlinPublic_Compiler?branch=%3Cdefault%3E&buildTypeTab=overview&mode=builds)
 [![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)
-[![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.jetbrains.com/scans?search.rootProjectNames=Kotlin)
 
 # Kotlin Programming Language
 
-Welcome to [Kotlin](https://kotlinlang.org/)!   
-It is an open-source, statically typed programming language supported and developed by [JetBrains](https://www.jetbrains.com/) and open-source contributors.
-
-Some handy links:
+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)
@@ -18,21 +14,10 @@ Some handy links:
  * [Issue Tracker](https://youtrack.jetbrains.com/issues/KT)
  * [Forum](https://discuss.kotlinlang.org/)
  * [Kotlin Blog](https://blog.jetbrains.com/kotlin/)
- * [Subscribe to Kotlin YouTube channel](https://www.youtube.com/channel/UCP7uiEZIqci43m22KDl0sNw)
  * [Follow Kotlin on Twitter](https://twitter.com/kotlin)
  * [Public Slack channel](https://slack.kotlinlang.org/)
  * [TeamCity CI build](https://teamcity.jetbrains.com/project.html?tab=projectOverview&projectId=Kotlin)
 
-## Kotlin Multiplatform capabilities
-
-Support for multiplatform programming is one of Kotlin’s key benefits. It reduces time spent writing and maintaining the same code for [different platforms](https://kotlinlang.org/docs/reference/mpp-supported-platforms.html) while retaining the flexibility and benefits of native programming.
-
- * [Kotlin Multiplatform Mobile](https://kotlinlang.org/lp/mobile/) for sharing code between Android and iOS
- * [Getting Started with Kotlin Multiplatform Mobile Guide](https://kotlinlang.org/docs/mobile/create-first-app.html)
- * [Kotlin Multiplatform Benefits](https://kotlinlang.org/docs/reference/multiplatform.html)
- * [Share code on all platforms](https://kotlinlang.org/docs/reference/mpp-share-on-platforms.html#share-code-on-all-platforms)
- * [Share code on similar platforms](https://kotlinlang.org/docs/reference/mpp-share-on-platforms.html#share-code-on-similar-platforms)
-
 ## Editing Kotlin
 
  * [Kotlin IntelliJ IDEA Plugin](https://kotlinlang.org/docs/tutorials/getting-started.html)
@@ -59,8 +44,8 @@ You also can use [Gradle properties](https://docs.gradle.org/current/userguide/b
 Note: The JDK 6 for MacOS is not available on Oracle's site. You can install it by
 
 ```bash
-$ brew tap homebrew/cask-versions
-$ brew install --cask java6
+$ brew tap caskroom/versions
+$ brew cask install java6
 ```
 
 On Windows you might need to add long paths setting to the repo:
@@ -106,18 +91,16 @@ To reproduce TeamCity build use `-Pteamcity=true` flag. Local builds don't run p
 **OPTIONAL:** Some artifacts, mainly Maven plugin ones, are built separately with Maven.
 Refer to [libraries/ReadMe.md](libraries/ReadMe.md) for details.
 
-To build Kotlin/Native, see
-[kotlin-native/README.md](kotlin-native/README.md#building-from-source).
 
 ### 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, the 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 a non-default platform.
+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.
 
-A More detailed description of this scheme can be found at https://github.com/JetBrains/bunches/blob/master/ReadMe.md.
+More detailed description of this scheme can be found at https://github.com/JetBrains/bunches/blob/master/ReadMe.md.
 
 Usually, there's no need to care about multiple platforms as all features are enabled everywhere by default. Additional counterparts should be created if there's an expected difference in behavior or an incompatible API usage is required **and** there's no reasonable workaround to save source compatibility. Kotlin plugin contains a pre-commit check that shows a warning if a file has been updated without its counterparts.
 
-Development for some particular platform is possible after 'switching' that can be done with the [Bunch Tool](https://github.com/JetBrains/bunches/releases) from the command line.
+Development for some particular platform is possible after 'switching' that can be done with [Bunch Tool](https://github.com/JetBrains/bunches/releases) from the command line.
 
 ```sh
 cd kotlin-project-dir
@@ -147,27 +130,28 @@ From this root project there are Run/Debug Configurations for running `IDEA` or
 * Run the `IDEA` run configuration in the project
 * A child IntelliJ IDEA with the Kotlin plugin will then startup
 
-### Dependency verification
+### Including into composite build
 
-We have a [dependencies verification](https://docs.gradle.org/current/userguide/dependency_verification.html) feature enabled in the
-repository for all Gradle builds. Gradle will check hashes (md5 and sha256) of used dependencies and will fail builds with
-`Dependency verification failed` errors when local artifacts are absent or have different hashes listed in the
-[verification-metadata.xml](https://github.com/JetBrains/kotlin/blob/master/gradle/verification-metadata.xml) file.
+To include kotlin compiler into [composite build](https://docs.gradle.org/current/userguide/composite_builds.html) you need to define `dependencySubstitution` for `kotlin-compiler` module in `settings.gradle.kts`
 
-It's expected that `verification-metadata.xml` should only be updated with the commits that modify the build. There are some tips how
-to perform such updates:
+```Kotlin
+includeBuild("/path/to/kotlin") {
+    dependencySubstitution {
+        substitute(module("org.jetbrains.kotlin:kotlin-compiler"))
+            .with(project(":include:kotlin-compiler"))
+    }
+}
+```
 
-- Use auto-generation for getting an initial list of new hashes (verify updates relate to you changes).
+or in `settings.gradle`
 
-`./gradlew -M sha256,md5 help`
-
-*(any other task may be used instead of `help`)*
-
-- Consider removing old versions from the file if you are updating dependencies.
-- Leave meaningful `origin` attribute (instead of `Generated by Gradle`) if you did some manual verification of the artifact.
-- Always do manual verification if several hashes are needed and a new `also-trust` tag has to be added.
-- If you’re adding a dependency with OS mentioning in an artifact name (`darwin`, `mac`, `osx`, `linux`, `windows`), remember to add 
-  counterparts for other platforms.
+```Groovy
+includeBuild('/path/to/kotlin') {
+    dependencySubstitution {
+        substitute module('org.jetbrains.kotlin:kotlin-compiler') with project(':include:kotlin-compiler')
+    }
+}
+```
 
 # License
 Kotlin is distributed under the terms of the Apache License (Version 2.0). See [license folder](license/README.md) for details.

ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt

@@ -16,24 +16,18 @@
 
 package org.jetbrains.kotlin.ant
 
-import org.apache.tools.ant.BuildException
-import org.apache.tools.ant.taskdefs.Execute
-import org.apache.tools.ant.taskdefs.Redirector
-import org.apache.tools.ant.types.*
+import org.apache.tools.ant.types.Path
+import org.apache.tools.ant.types.Reference
 import java.io.File.pathSeparator
-import java.io.File.separator
 
 class Kotlin2JvmTask : KotlinCompilerBaseTask() {
     override val compilerFqName = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"
 
-    var includeRuntime: Boolean = false
+    var includeRuntime: Boolean = true
     var moduleName: String? = null
 
     var noReflect: Boolean = false
 
-    private val cmdl = CommandlineJava()
-    var fork: Boolean = false
-
     private var compileClasspath: Path? = null
 
     fun setClasspath(classpath: Path) {
@@ -79,47 +73,4 @@ class Kotlin2JvmTask : KotlinCompilerBaseTask() {
         if (noReflect) args.add("-no-reflect")
         if (includeRuntime) args.add("-include-runtime")
     }
-
-    override fun execute() {
-        if (!fork)
-            super.execute()
-        else {
-            exec()
-        }
-    }
-
-    private fun exec() {
-        val javaHome = System.getProperty("java.home")
-        val javaBin = javaHome + separator + "bin" + separator + "java"
-        val redirector = Redirector(this)
-
-        fillArguments()
-
-        val command = ArrayList<String>()
-        command.add(javaBin)
-        command.addAll(cmdl.vmCommand.arguments) // jvm args
-        command.add("-Dorg.jetbrains.kotlin.cliMessageRenderer=FullPath") // same MessageRenderer as non-forking mode
-        command.add("-cp")
-        command.add(KotlinAntTaskUtil.compilerJar.canonicalPath)
-        command.add(compilerFqName)
-        command.addAll(args) // compiler args
-
-        // streamHandler: used to handle the input and output streams of the subprocess.
-        // watchdog: a watchdog for the subprocess or <code>null</code> to disable a timeout for the subprocess.
-        // TODO: support timeout for the subprocess
-        val exe = Execute(redirector.createHandler(), null)
-        exe.setAntRun(getProject())
-        exe.commandline = command.toTypedArray()
-        log("Executing command: ${command.joinToString(" ")}", LogLevel.DEBUG.level)
-        log("Compiling ${src!!.list().toList()} => [${output!!.canonicalPath}]")
-        val exitCode = exe.execute()
-        redirector.complete()
-        if (failOnError && exitCode != 0) {
-            throw BuildException("Compile failed; see the compiler error output for details.")
-        }
-    }
-
-    fun createJvmarg(): Commandline.Argument {
-        return cmdl.createVmArgument()
-    }
 }

ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt

@@ -80,7 +80,7 @@ abstract class KotlinCompilerBaseTask : Task() {
         fillSpecificArguments()
     }
 
-    override fun execute() {
+    final override fun execute() {
         fillArguments()
 
         val compilerClass = KotlinAntTaskUtil.getOrCreateClassLoader().loadClass(compilerFqName)

benchmarks/build.gradle.kts

@@ -1,11 +1,36 @@
 import kotlinx.benchmark.gradle.benchmark
 
-val benchmarks_version = "0.3.0"
+val benchmarks_version = "0.2.0-dev-7"
+buildscript {
+    val benchmarks_version = "0.2.0-dev-7"
+
+    repositories {
+        val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
+        if (cacheRedirectorEnabled) {
+            maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlinx")
+        } else {
+            maven("https://dl.bintray.com/kotlin/kotlinx")
+        }
+    }
+    dependencies {
+        classpath("org.jetbrains.kotlinx:kotlinx.benchmark.gradle:$benchmarks_version")
+    }
+}
+
+apply(plugin = "kotlinx.benchmark")
 
 plugins {
     java
     kotlin("jvm")
-    id("org.jetbrains.kotlinx.benchmark") version "0.3.0"
+}
+
+repositories {
+    val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
+    if (cacheRedirectorEnabled) {
+        maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlinx")
+   } else {
+        maven("https://dl.bintray.com/kotlin/kotlinx")
+    }
 }
 
 dependencies {
@@ -15,9 +40,11 @@ dependencies {
     compile(project(":compiler:cli"))
     compile(intellijCoreDep()) { includeJars("intellij-core") }
     compile(jpsStandalone()) { includeJars("jps-model") }
-    compile(intellijPluginDep("java"))
+    Platform[192].orHigher {
+        compile(intellijPluginDep("java"))
+    }
     compile(intellijDep()) { includeIntellijCoreJarDependencies(project) }
-    compile("org.jetbrains.kotlinx:kotlinx-benchmark-runtime:$benchmarks_version")
+    compile("org.jetbrains.kotlinx:kotlinx.benchmark.runtime-jvm:$benchmarks_version")
 }
 
 sourceSets {
@@ -67,16 +94,18 @@ benchmark {
     }
 }
 
-tasks.matching { it is Zip && it.name == "mainBenchmarkJar" }.configureEach {
-    this as Zip
-    isZip64 = true
-    archiveFileName.set("benchmarks.jar")
-}
-
-val benchmarkTasks = listOf("mainBenchmark", "mainFirBenchmark", "mainNiBenchmark")
-tasks.matching { it is JavaExec && it.name in benchmarkTasks }.configureEach {
-    this as JavaExec
-    systemProperty("idea.home.path", intellijRootDir().canonicalPath)
+tasks.named("classes") {
+    doLast {
+        tasks.named("mainBenchmarkJar", Zip::class.java) {
+            isZip64 = true
+            archiveName = "benchmarks.jar"
+        }
+        listOf("mainBenchmark", "mainFirBenchmark", "mainNiBenchmark").forEach {
+            tasks.named(it, JavaExec::class.java) {
+                systemProperty("idea.home.path", intellijRootDir().canonicalPath)
+            }
+        }
+    }
 }
 
 tasks.register<JavaExec>("runBenchmark") {

benchmarks/src/org/jetbrains/kotlin/benchmarks/AbstractSimpleFileBenchmark.kt

@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.context.withProject
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.diagnostics.Severity
 import org.jetbrains.kotlin.fir.builder.RawFirBuilder
-import org.jetbrains.kotlin.fir.createSessionForTests
+import org.jetbrains.kotlin.fir.createSession
 import org.jetbrains.kotlin.fir.java.FirJavaElementFinder
 import org.jetbrains.kotlin.fir.resolve.firProvider
 import org.jetbrains.kotlin.fir.resolve.providers.impl.FirProviderImpl
@@ -150,9 +150,9 @@ abstract class AbstractSimpleFileBenchmark {
     private fun analyzeGreenFileIr(bh: Blackhole) {
         val scope = GlobalSearchScope.filesScope(env.project, listOf(file.virtualFile))
             .uniteWith(TopDownAnalyzerFacadeForJVM.AllJavaSourcesInProjectScope(env.project))
-        val session = createSessionForTests(env, scope)
+        val session = createSession(env, scope)
         val firProvider = session.firProvider as FirProviderImpl
-        val builder = RawFirBuilder(session, firProvider.kotlinScopeProvider)
+        val builder = RawFirBuilder(session, firProvider.kotlinScopeProvider, stubMode = false)
 
         val totalTransformer = FirTotalResolveProcessor(session)
         val firFile = builder.buildFirFile(file).also(firProvider::recordFile)

build-common/build.gradle.kts

@@ -7,7 +7,6 @@ plugins {
 
 dependencies {
     compileOnly(project(":core:util.runtime"))
-    compileOnly(project(":compiler:backend.common.jvm"))
     compileOnly(project(":compiler:util"))
     compileOnly(project(":compiler:cli-common"))
     compileOnly(project(":compiler:frontend.java"))

build-common/src/org/jetbrains/kotlin/build/BuildMetaInfo.kt

@@ -17,6 +17,9 @@ interface BuildMetaInfo {
     val compilerBuildVersion: String
     val languageVersionString: String
     val apiVersionString: String
+    val coroutinesEnable: Boolean
+    val coroutinesWarn: Boolean
+    val coroutinesError: Boolean
     val multiplatformEnable: Boolean
     val metadataVersionMajor: Int
     val metadataVersionMinor: Int
@@ -32,6 +35,9 @@ abstract class BuildMetaInfoFactory<T : BuildMetaInfo>(private val metaInfoClass
         compilerBuildVersion: String,
         languageVersionString: String,
         apiVersionString: String,
+        coroutinesEnable: Boolean,
+        coroutinesWarn: Boolean,
+        coroutinesError: Boolean,
         multiplatformEnable: Boolean,
         ownVersion: Int,
         coroutinesVersion: Int,
@@ -47,6 +53,9 @@ abstract class BuildMetaInfoFactory<T : BuildMetaInfo>(private val metaInfoClass
             compilerBuildVersion = KotlinCompilerVersion.VERSION,
             languageVersionString = languageVersion.versionString,
             apiVersionString = args.apiVersion ?: languageVersion.versionString,
+            coroutinesEnable = args.coroutinesState == CommonCompilerArguments.ENABLE,
+            coroutinesWarn = args.coroutinesState == CommonCompilerArguments.WARN,
+            coroutinesError = args.coroutinesState == CommonCompilerArguments.ERROR,
             multiplatformEnable = args.multiPlatform,
             ownVersion = OWN_VERSION,
             coroutinesVersion = COROUTINES_VERSION,

build-common/src/org/jetbrains/kotlin/build/CommonBuildMetaInfo.kt

@@ -15,6 +15,9 @@ data class CommonBuildMetaInfo(
     override val compilerBuildVersion: String,
     override val languageVersionString: String,
     override val apiVersionString: String,
+    override val coroutinesEnable: Boolean,
+    override val coroutinesWarn: Boolean,
+    override val coroutinesError: Boolean,
     override val multiplatformEnable: Boolean,
     override val metadataVersionMajor: Int,
     override val metadataVersionMinor: Int,
@@ -29,6 +32,9 @@ data class CommonBuildMetaInfo(
             compilerBuildVersion: String,
             languageVersionString: String,
             apiVersionString: String,
+            coroutinesEnable: Boolean,
+            coroutinesWarn: Boolean,
+            coroutinesError: Boolean,
             multiplatformEnable: Boolean,
             ownVersion: Int,
             coroutinesVersion: Int,
@@ -41,6 +47,9 @@ data class CommonBuildMetaInfo(
                 compilerBuildVersion = compilerBuildVersion,
                 languageVersionString = languageVersionString,
                 apiVersionString = apiVersionString,
+                coroutinesEnable = coroutinesEnable,
+                coroutinesWarn = coroutinesWarn,
+                coroutinesError = coroutinesError,
                 multiplatformEnable = multiplatformEnable,
                 metadataVersionMajor = metadataVersion.major,
                 metadataVersionMinor = metadataVersion.minor,

build-common/src/org/jetbrains/kotlin/build/ExecutionStrategy.kt

@@ -1,12 +0,0 @@
-/*
- * Copyright 2010-2020 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
-
-import java.io.Serializable
-
-enum class ExecutionStrategy : Serializable {
-    DAEMON, IN_PROCESS, OUT_OF_PROCESS
-}

build-common/src/org/jetbrains/kotlin/build/JsBuildMetaInfo.kt

@@ -15,6 +15,9 @@ data class JsBuildMetaInfo(
     override val compilerBuildVersion: String,
     override val languageVersionString: String,
     override val apiVersionString: String,
+    override val coroutinesEnable: Boolean,
+    override val coroutinesWarn: Boolean,
+    override val coroutinesError: Boolean,
     override val multiplatformEnable: Boolean,
     override val metadataVersionMajor: Int,
     override val metadataVersionMinor: Int,
@@ -29,6 +32,9 @@ data class JsBuildMetaInfo(
             compilerBuildVersion: String,
             languageVersionString: String,
             apiVersionString: String,
+            coroutinesEnable: Boolean,
+            coroutinesWarn: Boolean,
+            coroutinesError: Boolean,
             multiplatformEnable: Boolean,
             ownVersion: Int,
             coroutinesVersion: Int,
@@ -41,6 +47,9 @@ data class JsBuildMetaInfo(
                 compilerBuildVersion = compilerBuildVersion,
                 languageVersionString = languageVersionString,
                 apiVersionString = apiVersionString,
+                coroutinesEnable = coroutinesEnable,
+                coroutinesWarn = coroutinesWarn,
+                coroutinesError = coroutinesError,
                 multiplatformEnable = multiplatformEnable,
                 metadataVersionMajor = metadataVersion.major,
                 metadataVersionMinor = metadataVersion.minor,

build-common/src/org/jetbrains/kotlin/build/JvmBuildMetaInfo.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.build
 
-import org.jetbrains.kotlin.load.kotlin.JvmBytecodeBinaryVersion
+import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmBytecodeBinaryVersion
 import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion
 
 /**
@@ -27,6 +27,9 @@ data class JvmBuildMetaInfo(
     override val compilerBuildVersion: String,
     override val languageVersionString: String,
     override val apiVersionString: String,
+    override val coroutinesEnable: Boolean,
+    override val coroutinesWarn: Boolean,
+    override val coroutinesError: Boolean,
     override val multiplatformEnable: Boolean,
     override val metadataVersionMajor: Int,
     override val metadataVersionMinor: Int,
@@ -44,6 +47,9 @@ data class JvmBuildMetaInfo(
             compilerBuildVersion: String,
             languageVersionString: String,
             apiVersionString: String,
+            coroutinesEnable: Boolean,
+            coroutinesWarn: Boolean,
+            coroutinesError: Boolean,
             multiplatformEnable: Boolean,
             ownVersion: Int,
             coroutinesVersion: Int,
@@ -56,6 +62,9 @@ data class JvmBuildMetaInfo(
                 compilerBuildVersion = compilerBuildVersion,
                 languageVersionString = languageVersionString,
                 apiVersionString = apiVersionString,
+                coroutinesEnable = coroutinesEnable,
+                coroutinesWarn = coroutinesWarn,
+                coroutinesError = coroutinesError,
                 multiplatformEnable = multiplatformEnable,
                 metadataVersionMajor = metadataVersion.major,
                 metadataVersionMinor = metadataVersion.minor,

build-common/src/org/jetbrains/kotlin/build/generatedFiles.kt

@@ -26,13 +26,11 @@ open class GeneratedFile(
     val outputFile: File
 ) {
     val sourceFiles = sourceFiles.sortedBy { it.path }
-
-    override fun toString(): String = "${this::class.java.simpleName}: $outputFile"
 }
 
-class GeneratedJvmClass(
-    sourceFiles: Collection<File>,
-    outputFile: File
+class GeneratedJvmClass (
+        sourceFiles: Collection<File>,
+        outputFile: File
 ) : GeneratedFile(sourceFiles, outputFile) {
     val outputClass = LocalFileKotlinClass.create(outputFile).sure {
         "Couldn't load KotlinClass from $outputFile; it may happen because class doesn't have valid Kotlin annotations"

build-common/src/org/jetbrains/kotlin/build/report/BuildReporter.kt

@@ -1,24 +0,0 @@
-/*
- * Copyright 2010-2020 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.report
-
-import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporter
-import org.jetbrains.kotlin.build.report.metrics.RemoteBuildMetricsReporter
-
-open class BuildReporter(
-    protected open val icReporter: ICReporter,
-    protected open val buildMetricsReporter: BuildMetricsReporter
-) : ICReporter by icReporter, BuildMetricsReporter by buildMetricsReporter
-
-class RemoteBuildReporter(
-    override val icReporter: RemoteICReporter,
-    override val buildMetricsReporter: RemoteBuildMetricsReporter
-) : BuildReporter(icReporter, buildMetricsReporter), RemoteReporter {
-    override fun flush() {
-        icReporter.flush()
-        buildMetricsReporter.flush()
-    }
-}

build-common/src/org/jetbrains/kotlin/build/report/RemoteICReporter.kt

@@ -1,9 +0,0 @@
-/*
- * Copyright 2010-2020 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.report
-
-interface RemoteICReporter : ICReporter,
-    RemoteReporter

build-common/src/org/jetbrains/kotlin/build/report/RemoteReporter.kt

@@ -1,11 +0,0 @@
-/*
- * Copyright 2010-2020 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.report
-
-interface RemoteReporter {
-    fun flush()
-}
-

build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildAttribute.kt

@@ -1,37 +0,0 @@
-/*
- * Copyright 2010-2020 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.report.metrics
-
-import java.io.Serializable
-
-enum class BuildAttributeKind : Serializable {
-    REBUILD_REASON;
-
-    companion object {
-        const val serialVersionUID = 0L
-    }
-}
-
-enum class BuildAttribute(val kind: BuildAttributeKind) : Serializable {
-    NO_BUILD_HISTORY(BuildAttributeKind.REBUILD_REASON),
-    CACHE_CORRUPTION(BuildAttributeKind.REBUILD_REASON),
-    UNKNOWN_CHANGES_IN_GRADLE_INPUTS(BuildAttributeKind.REBUILD_REASON),
-    JAVA_CHANGE_UNTRACKED_FILE_IS_REMOVED(BuildAttributeKind.REBUILD_REASON),
-    JAVA_CHANGE_UNEXPECTED_PSI(BuildAttributeKind.REBUILD_REASON),
-    JAVA_CHANGE_UNKNOWN_QUALIFIER(BuildAttributeKind.REBUILD_REASON),
-    DEP_CHANGE_REMOVED_ENTRY(BuildAttributeKind.REBUILD_REASON),
-    DEP_CHANGE_HISTORY_IS_NOT_FOUND(BuildAttributeKind.REBUILD_REASON),
-    DEP_CHANGE_HISTORY_CANNOT_BE_READ(BuildAttributeKind.REBUILD_REASON),
-    DEP_CHANGE_HISTORY_NO_KNOWN_BUILDS(BuildAttributeKind.REBUILD_REASON),
-    DEP_CHANGE_NON_INCREMENTAL_BUILD_IN_DEP(BuildAttributeKind.REBUILD_REASON),
-    IN_PROCESS_EXECUTION(BuildAttributeKind.REBUILD_REASON),
-    OUT_OF_PROCESS_EXECUTION(BuildAttributeKind.REBUILD_REASON),
-    IC_IS_NOT_ENABLED(BuildAttributeKind.REBUILD_REASON);
-
-    companion object {
-        const val serialVersionUID = 0L
-    }
-}

build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildAttributes.kt

@@ -1,30 +0,0 @@
-/*
- * Copyright 2010-2020 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.report.metrics
-
-import java.io.Serializable
-import java.util.*
-
-class BuildAttributes : Serializable {
-    private val myAttributes =
-        EnumMap<BuildAttribute, Int>(
-            BuildAttribute::class.java
-        )
-
-    fun add(attr: BuildAttribute, count: Int = 1) {
-        myAttributes[attr] = myAttributes.getOrDefault(attr, 0) + count
-    }
-
-    fun addAll(other: BuildAttributes) {
-        other.myAttributes.forEach { (attr, n) -> add(attr, n) }
-    }
-
-    fun asMap(): Map<BuildAttribute, Int> = myAttributes
-
-    companion object {
-        const val serialVersionUID = 0L
-    }
-}

build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetrics.kt

@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2020 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.report.metrics
-
-import java.io.Serializable
-
-data class BuildMetrics(
-    val buildTimes: BuildTimes = BuildTimes(),
-    val buildAttributes: BuildAttributes = BuildAttributes()
-) : Serializable {
-    fun addAll(other: BuildMetrics) {
-        buildTimes.addAll(other.buildTimes)
-        buildAttributes.addAll(other.buildAttributes)
-    }
-
-    companion object {
-        const val serialVersionUID = 0L
-    }
-}

build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetricsReporter.kt

@@ -1,28 +0,0 @@
-/*
- * Copyright 2010-2020 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.report.metrics
-
-interface BuildMetricsReporter {
-    fun startMeasure(metric: BuildTime, startNs: Long)
-    fun endMeasure(metric: BuildTime, endNs: Long)
-
-    fun addAttribute(attribute: BuildAttribute)
-
-    fun getMetrics(): BuildMetrics
-    fun addMetrics(metrics: BuildMetrics?)
-}
-
-inline fun <T> BuildMetricsReporter.measure(metric: BuildTime, fn: () -> T): T {
-    val start = System.nanoTime()
-    startMeasure(metric, start)
-
-    try {
-        return fn()
-    } finally {
-        val end = System.nanoTime()
-        endMeasure(metric, end)
-    }
-}

build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildMetricsReporterImpl.kt

@@ -1,47 +0,0 @@
-/*
- * Copyright 2010-2020 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.report.metrics
-
-import java.util.*
-
-class BuildMetricsReporterImpl : BuildMetricsReporter {
-    private val myBuildTimeStartNs: EnumMap<BuildTime, Long> =
-        EnumMap(
-            BuildTime::class.java
-        )
-    private val myBuildTimes = BuildTimes()
-    private val myBuildAttributes = BuildAttributes()
-
-    override fun startMeasure(metric: BuildTime, startNs: Long) {
-        if (metric in myBuildTimeStartNs) {
-            error("$metric was restarted before it finished")
-        }
-        myBuildTimeStartNs[metric] = startNs
-    }
-
-    override fun endMeasure(metric: BuildTime, endNs: Long) {
-        val startNs = myBuildTimeStartNs.remove(metric) ?: error("$metric finished before it started")
-        val durationNs = endNs - startNs
-        myBuildTimes.add(metric, durationNs)
-    }
-
-    override fun addAttribute(attribute: BuildAttribute) {
-        myBuildAttributes.add(attribute)
-    }
-
-    override fun getMetrics(): BuildMetrics =
-        BuildMetrics(
-            buildTimes = myBuildTimes,
-            buildAttributes = myBuildAttributes
-        )
-
-    override fun addMetrics(metrics: BuildMetrics?) {
-        if (metrics == null) return
-
-        myBuildAttributes.addAll(metrics.buildAttributes)
-        myBuildTimes.addAll(metrics.buildTimes)
-    }
-}

build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildTime.kt

@@ -1,43 +0,0 @@
-/*
- * Copyright 2010-2020 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.report.metrics
-
-import java.io.Serializable
-
-@Suppress("Reformat")
-enum class BuildTime(val parent: BuildTime? = null) : Serializable {
-    GRADLE_TASK,
-        CLEAR_OUTPUT(GRADLE_TASK),
-        BACKUP_OUTPUT(GRADLE_TASK),
-        RESTORE_OUTPUT_FROM_BACKUP(GRADLE_TASK),
-        CONNECT_TO_DAEMON(GRADLE_TASK),
-        CLEAR_JAR_CACHE(GRADLE_TASK),
-        RUN_COMPILER(GRADLE_TASK),
-            NON_INCREMENTAL_COMPILATION_IN_PROCESS(RUN_COMPILER),
-            NON_INCREMENTAL_COMPILATION_OUT_OF_PROCESS(RUN_COMPILER),
-            NON_INCREMENTAL_COMPILATION_DAEMON(RUN_COMPILER),
-            INCREMENTAL_COMPILATION(RUN_COMPILER),
-                IC_CALCULATE_INITIAL_DIRTY_SET(INCREMENTAL_COMPILATION),
-                    IC_ANALYZE_CHANGES_IN_DEPENDENCIES(IC_CALCULATE_INITIAL_DIRTY_SET),
-                        IC_FIND_HISTORY_FILES(IC_ANALYZE_CHANGES_IN_DEPENDENCIES),
-                        IC_ANALYZE_HISTORY_FILES(IC_ANALYZE_CHANGES_IN_DEPENDENCIES),
-                    IC_ANALYZE_CHANGES_IN_JAVA_SOURCES(IC_CALCULATE_INITIAL_DIRTY_SET),
-                    IC_ANALYZE_CHANGES_IN_ANDROID_LAYOUTS(IC_CALCULATE_INITIAL_DIRTY_SET),
-                    IC_DETECT_REMOVED_CLASSES(IC_CALCULATE_INITIAL_DIRTY_SET),
-                CLEAR_OUTPUT_ON_REBUILD(INCREMENTAL_COMPILATION),
-                IC_UPDATE_CACHES(INCREMENTAL_COMPILATION),
-                INCREMENTAL_ITERATION(INCREMENTAL_COMPILATION),
-                NON_INCREMENTAL_ITERATION(INCREMENTAL_COMPILATION),
-                IC_WRITE_HISTORY_FILE(INCREMENTAL_COMPILATION);
-
-    companion object {
-        const val serialVersionUID = 0L
-
-        val children by lazy {
-            values().filter { it.parent != null }.groupBy { it.parent }
-        }
-    }
-}

build-common/src/org/jetbrains/kotlin/build/report/metrics/BuildTimes.kt

@@ -1,29 +0,0 @@
-/*
- * Copyright 2010-2020 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.report.metrics
-
-import java.io.Serializable
-import java.util.*
-
-class BuildTimes : Serializable {
-    private val myBuildTimes = EnumMap<BuildTime, Long>(BuildTime::class.java)
-
-    fun addAll(other: BuildTimes) {
-        for ((bt, timeNs) in other.myBuildTimes) {
-            add(bt, timeNs)
-        }
-    }
-
-    fun add(buildTime: BuildTime, timeNs: Long) {
-        myBuildTimes[buildTime] = myBuildTimes.getOrDefault(buildTime, 0) + timeNs
-    }
-
-    fun asMap(): Map<BuildTime, Long> = myBuildTimes
-
-    companion object {
-        const val serialVersionUID = 0L
-    }
-}

build-common/src/org/jetbrains/kotlin/build/report/metrics/DoNothingBuildMetricsReporter.kt

@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2020 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.report.metrics
-
-object DoNothingBuildMetricsReporter : BuildMetricsReporter {
-    override fun startMeasure(metric: BuildTime, startNs: Long) {
-    }
-
-    override fun endMeasure(metric: BuildTime, endNs: Long) {
-    }
-
-    override fun addAttribute(attribute: BuildAttribute) {
-    }
-
-    override fun getMetrics(): BuildMetrics =
-        BuildMetrics(
-            BuildTimes(),
-            BuildAttributes()
-        )
-
-    override fun addMetrics(metrics: BuildMetrics?) {}
-}

build-common/src/org/jetbrains/kotlin/build/report/metrics/RemoteBuildMetricsReporter.kt

@@ -1,11 +0,0 @@
-/*
- * Copyright 2010-2020 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.report.metrics
-
-import org.jetbrains.kotlin.build.report.RemoteReporter
-
-interface RemoteBuildMetricsReporter : BuildMetricsReporter,
-    RemoteReporter

build-common/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java

@@ -29,43 +29,21 @@ 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.idea.ExplicitDefaultSubstitutor;
-import org.jetbrains.kotlin.idea.ExplicitDefaultSubstitutorsKt;
 import org.jetbrains.kotlin.utils.StringsKt;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
 
 public class ArgumentUtils {
-    private ArgumentUtils() {
-    }
+    private ArgumentUtils() {}
 
     @NotNull
     public static List<String> convertArgumentsToStringList(@NotNull CommonToolArguments arguments)
             throws InstantiationException, IllegalAccessException, InvocationTargetException {
-        List<String> convertedArguments = convertArgumentsToStringListInternal(arguments);
-
-        Map<KClass<? extends CommonToolArguments>, Collection<ExplicitDefaultSubstitutor>> defaultSubstitutorsMap =
-                ExplicitDefaultSubstitutorsKt.getDefaultSubstitutors();
-        KClass<? extends CommonToolArguments> argumentsKClass = JvmClassMappingKt.getKotlinClass(arguments.getClass());
-        Collection<ExplicitDefaultSubstitutor> defaultSubstitutors = defaultSubstitutorsMap.get(argumentsKClass);
-        if (defaultSubstitutors != null) {
-            for (ExplicitDefaultSubstitutor substitutor : defaultSubstitutors) {
-                if (substitutor.isSubstitutable(convertedArguments)) convertedArguments.addAll(substitutor.getNewSubstitution());
-            }
-        }
-        return convertedArguments;
-    }
-
-    @NotNull
-    public static List<String> convertArgumentsToStringListNoDefaults(@NotNull CommonToolArguments arguments)
-            throws InstantiationException, IllegalAccessException, InvocationTargetException {
-        return convertArgumentsToStringListInternal(arguments);
-    }
-
-    private static List<String> convertArgumentsToStringListInternal(@NotNull CommonToolArguments arguments)
-            throws InstantiationException, IllegalAccessException, InvocationTargetException {
         List<String> result = new ArrayList<>();
         Class<? extends CommonToolArguments> argumentsClass = arguments.getClass();
         convertArgumentsToStringList(arguments, argumentsClass.newInstance(), JvmClassMappingKt.getKotlinClass(argumentsClass), result);

build-common/src/org/jetbrains/kotlin/idea/explicitDefaultSubstitutors.kt

@@ -1,46 +0,0 @@
-/*
- * Copyright 2010-2021 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.idea
-
-import org.jetbrains.kotlin.cli.common.arguments.Argument
-import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments
-import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
-import org.jetbrains.kotlin.config.JvmTarget
-import kotlin.reflect.KClass
-import kotlin.reflect.KProperty1
-import kotlin.reflect.full.findAnnotation
-
-val defaultSubstitutors: Map<KClass<out CommonToolArguments>, Collection<ExplicitDefaultSubstitutor>> =
-    mapOf(K2JVMCompilerArguments::class to listOf(JvmTargetDefaultSubstitutor))
-
-sealed class ExplicitDefaultSubstitutor {
-    abstract val substitutedProperty: KProperty1<out CommonToolArguments, String?>
-    abstract val oldSubstitution: List<String>
-    abstract val newSubstitution: List<String>
-    abstract fun isSubstitutable(args: List<String>): Boolean
-
-    protected val argument: Argument by lazy {
-        substitutedProperty.findAnnotation() ?: error("Property \"${substitutedProperty.name}\" has no Argument annotation")
-    }
-}
-
-object JvmTargetDefaultSubstitutor : ExplicitDefaultSubstitutor() {
-    override val substitutedProperty
-        get() = K2JVMCompilerArguments::jvmTarget
-    private val oldDefault: String
-        get() = JvmTarget.JVM_1_6.description
-    private val newDefault: String
-        get() = JvmTarget.JVM_1_8.description
-
-    private fun prepareSubstitution(default: String): List<String> = listOf(argument.value, default)
-
-    override val oldSubstitution: List<String>
-        get() = prepareSubstitution(oldDefault)
-    override val newSubstitution: List<String>
-        get() = prepareSubstitution(newDefault)
-
-    override fun isSubstitutable(args: List<String>): Boolean = argument.value !in args
-}

build-common/src/org/jetbrains/kotlin/incremental/AbstractIncrementalCache.kt

@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.incremental
 import com.intellij.util.io.EnumeratorStringDescriptor
 import org.jetbrains.kotlin.incremental.storage.*
 import org.jetbrains.kotlin.metadata.ProtoBuf
-import org.jetbrains.kotlin.metadata.deserialization.Flags
 import org.jetbrains.kotlin.metadata.deserialization.NameResolver
 import org.jetbrains.kotlin.metadata.deserialization.TypeTable
 import org.jetbrains.kotlin.metadata.deserialization.supertypes
@@ -35,15 +34,12 @@ interface IncrementalCacheCommon {
     val thisWithDependentCaches: Iterable<AbstractIncrementalCache<*>>
     fun classesFqNamesBySources(files: Iterable<File>): Collection<FqName>
     fun getSubtypesOf(className: FqName): Sequence<FqName>
-    fun getSupertypesOf(className: FqName): Sequence<FqName>
     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 dump(): String
-
-    fun isSealed(className: FqName): Boolean?
 }
 
 /**
@@ -54,7 +50,6 @@ abstract class AbstractIncrementalCache<ClassName>(
     protected val pathConverter: FileToPathConverter
 ) : BasicMapsOwner(workingDir), IncrementalCacheCommon {
     companion object {
-        private val CLASS_ATTRIBUTES = "class-attributes"
         private val SUBTYPES = "subtypes"
         private val SUPERTYPES = "supertypes"
         private val CLASS_FQ_NAME_TO_SOURCE = "class-fq-name-to-source"
@@ -76,7 +71,6 @@ abstract class AbstractIncrementalCache<ClassName>(
         result
     }
 
-    internal val classAttributesMap = registerMap(ClassAttributesMap(CLASS_ATTRIBUTES.storageFile))
     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))
@@ -96,14 +90,6 @@ abstract class AbstractIncrementalCache<ClassName>(
     override fun getSubtypesOf(className: FqName): Sequence<FqName> =
         subtypesMap[className].asSequence()
 
-    override fun getSupertypesOf(className: FqName): Sequence<FqName> {
-        return supertypesMap[className].asSequence()
-    }
-
-    override fun isSealed(className: FqName): Boolean? {
-        return classAttributesMap[className]?.isSealed
-    }
-
     override fun getSourceFileIfClass(fqName: FqName): File? =
         classFqNameToSourceMap[fqName]
 
@@ -132,7 +118,6 @@ abstract class AbstractIncrementalCache<ClassName>(
 
         supertypesMap[child] = parents
         classFqNameToSourceMap[child] = srcFile
-        classAttributesMap[child] = ICClassesAttributes(ProtoBuf.Modality.SEALED == Flags.MODALITY.get(proto.flags))
     }
 
     protected fun removeAllFromClassStorage(removedClasses: Collection<FqName>, changesCollector: ChangesCollector) {
@@ -167,17 +152,14 @@ abstract class AbstractIncrementalCache<ClassName>(
             }
         }
 
-        removedFqNames.forEach {
-            classFqNameToSourceMap.remove(it)
-            classAttributesMap.remove(it)
-        }
+        removedFqNames.forEach { classFqNameToSourceMap.remove(it) }
     }
 
     protected class ClassFqNameToSourceMap(
         storageFile: File,
         private val pathConverter: FileToPathConverter
-    ) : BasicStringMap<String>(storageFile, EnumeratorStringDescriptor(), PathStringDescriptor) {
-
+    ) :
+        BasicStringMap<String>(storageFile, EnumeratorStringDescriptor(), PathStringDescriptor) {
         operator fun set(fqName: FqName, sourceFile: File) {
             storage[fqName.asString()] = pathConverter.toPath(sourceFile)
         }

build-common/src/org/jetbrains/kotlin/incremental/ChangesCollector.kt

@@ -19,14 +19,12 @@ package org.jetbrains.kotlin.incremental
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.Flags
 import org.jetbrains.kotlin.metadata.deserialization.NameResolver
-import org.jetbrains.kotlin.metadata.deserialization.supertypes
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.serialization.deserialization.getClassId
 
 class ChangesCollector {
     private val removedMembers = hashMapOf<FqName, MutableSet<String>>()
-    private val changedParents = hashMapOf<FqName, MutableSet<FqName>>()
     private val changedMembers = hashMapOf<FqName, MutableSet<String>>()
     private val areSubclassesAffected = hashMapOf<FqName, Boolean>()
 
@@ -49,10 +47,6 @@ class ChangesCollector {
             changes.add(ChangeInfo.SignatureChanged(fqName, areSubclassesAffected))
         }
 
-        for ((fqName, changedParents) in changedParents) {
-            changes.add(ChangeInfo.ParentsChanged(fqName, changedParents))
-        }
-
         return changes
     }
 
@@ -85,12 +79,12 @@ class ChangesCollector {
         }
 
         if (oldData == null) {
-            newData!!.collectAll(isRemoved = false, isAdded = true, collectAllMembersForNewClass = collectAllMembersForNewClass)
+            newData!!.collectAll(isRemoved = false, collectAllMembersForNewClass = collectAllMembersForNewClass)
             return
         }
 
         if (newData == null) {
-            oldData.collectAll(isRemoved = true, isAdded = false)
+            oldData.collectAll(isRemoved = true)
             return
         }
 
@@ -104,7 +98,6 @@ class ChangesCollector {
                             collectSignature(oldData, diff.areSubclassesAffected)
                         }
                         collectChangedMembers(fqName, diff.changedMembersNames)
-                        addChangedParents(fqName, diff.changedSupertypes)
                     }
                     is PackagePartProtoData -> {
                         collectSignature(oldData, areSubclassesAffected = true)
@@ -128,11 +121,10 @@ class ChangesCollector {
     private fun <T> T.getNonPrivateNames(nameResolver: NameResolver, vararg members: T.() -> List<MessageLite>): Set<String> =
             members.flatMap { this.it().filterNot { it.isPrivate }.names(nameResolver) }.toSet()
 
-    //TODO remember all sealed parent classes
-    private fun ProtoData.collectAll(isRemoved: Boolean, isAdded: Boolean, collectAllMembersForNewClass: Boolean = false) =
+    private fun ProtoData.collectAll(isRemoved: Boolean, collectAllMembersForNewClass: Boolean = false) =
         when (this) {
             is PackagePartProtoData -> collectAllFromPackage(isRemoved)
-            is ClassProtoData -> collectAllFromClass(isRemoved, isAdded, collectAllMembersForNewClass)
+            is ClassProtoData -> collectAllFromClass(isRemoved, collectAllMembersForNewClass)
         }
 
     private fun PackagePartProtoData.collectAllFromPackage(isRemoved: Boolean) {
@@ -151,7 +143,7 @@ class ChangesCollector {
         }
     }
 
-    private fun ClassProtoData.collectAllFromClass(isRemoved: Boolean, isAdded: Boolean, collectAllMembersForNewClass: Boolean = false) {
+    private fun ClassProtoData.collectAllFromClass(isRemoved: Boolean, collectAllMembersForNewClass: Boolean = false) {
         val classFqName = nameResolver.getClassId(proto.fqName).asSingleFqName()
         val kind = Flags.CLASS_KIND.get(proto.flags)
 
@@ -170,23 +162,6 @@ class ChangesCollector {
 
             collectSignature(classFqName, areSubclassesAffected = true)
         }
-
-        if (isRemoved || isAdded) {
-            collectChangedParents(classFqName, proto.supertypeList)
-        }
-    }
-
-    private fun addChangedParents(fqName: FqName, parents: Collection<FqName>) {
-        if (parents.isNotEmpty()) {
-            changedParents.getOrPut(fqName) { HashSet() }.addAll(parents)
-        }
-    }
-
-    private fun ClassProtoData.collectChangedParents(fqName: FqName, parents: Collection<ProtoBuf.Type>) {
-        val changedParentsFqNames = parents.map { type ->
-            nameResolver.getClassId(type.className).asSingleFqName()
-        }
-        addChangedParents(fqName, changedParentsFqNames)
     }
 
     private fun ClassProtoData.getNonPrivateMemberNames(): Set<String> {

build-common/src/org/jetbrains/kotlin/incremental/ICReporter.kt

@@ -3,7 +3,7 @@
  * 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.report
+package org.jetbrains.kotlin.incremental
 
 import org.jetbrains.kotlin.cli.common.ExitCode
 import java.io.File
@@ -17,5 +17,3 @@ interface ICReporter {
     fun reportMarkDirtyMember(affectedFiles: Iterable<File>, scope: String, name: String)
     fun reportMarkDirty(affectedFiles: Iterable<File>, reason: String)
 }
-
-

build-common/src/org/jetbrains/kotlin/incremental/ICReporterBase.kt

@@ -1,9 +1,9 @@
 /*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * 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.build.report
+package org.jetbrains.kotlin.incremental
 
 import java.io.File
 

build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt

@@ -32,7 +32,6 @@ import org.jetbrains.kotlin.name.parentOrNull
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
 import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
-import org.jetbrains.kotlin.util.capitalizeDecapitalize.capitalizeAsciiOnly
 import java.io.DataInput
 import java.io.DataOutput
 import java.io.File
@@ -327,7 +326,7 @@ private class ProtoDataProvider(private val serializerProtocol: SerializerExtens
         proto.`package`.apply {
             val packageNameId = getExtensionOrNull(serializerProtocol.packageFqName)
             val packageFqName = packageNameId?.let { FqName(nameResolver.getPackageFqName(it)) } ?: FqName.ROOT
-            val packagePartClassId = ClassId(packageFqName, Name.identifier(sourceFile.nameWithoutExtension.capitalizeAsciiOnly() + "Kt"))
+            val packagePartClassId = ClassId(packageFqName, Name.identifier(sourceFile.nameWithoutExtension.capitalize() + "Kt"))
             classes[packagePartClassId] = PackagePartProtoData(this, nameResolver, packageFqName)
         }
 
@@ -348,7 +347,7 @@ fun getProtoData(sourceFile: File, metadata: ByteArray): Map<ClassId, ProtoData>
 
     proto.`package`.apply {
         val packageFqName = getExtensionOrNull(JsProtoBuf.packageFqName)?.let(nameResolver::getPackageFqName)?.let(::FqName) ?: FqName.ROOT
-        val packagePartClassId = ClassId(packageFqName, Name.identifier(sourceFile.nameWithoutExtension.capitalizeAsciiOnly() + "Kt"))
+        val packagePartClassId = ClassId(packageFqName, Name.identifier(sourceFile.nameWithoutExtension.capitalize() + "Kt"))
         classes[packagePartClassId] = PackagePartProtoData(this, nameResolver, packageFqName)
     }
 
@@ -413,4 +412,4 @@ private class PackageMetadataMap(storageFile: File) : BasicStringMap<ByteArray>(
     operator fun get(packageName: String) = storage[packageName]
 
     override fun dumpValue(value: ByteArray): String = "Package metadata: ${value.md5()}"
-}
+}

build-common/src/org/jetbrains/kotlin/incremental/IncrementalJvmCache.kt

@@ -33,7 +33,6 @@ import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
 import org.jetbrains.kotlin.metadata.jvm.deserialization.ModuleMapping
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.name.SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT
 import org.jetbrains.kotlin.resolve.jvm.AsmTypes
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.org.objectweb.asm.*
@@ -95,10 +94,6 @@ open class IncrementalJvmCache(
     fun sourcesByInternalName(internalName: String): Collection<File> =
         internalNameToSource[internalName]
 
-    fun getAllPartsOfMultifileFacade(facade: JvmClassName): Collection<String>? {
-        return multifileFacadeToParts[facade]
-    }
-
     fun isMultifileFacade(className: JvmClassName): Boolean =
         className in multifileFacadeToParts
 
@@ -150,7 +145,6 @@ open class IncrementalJvmCache(
                 }
                 protoMap.remove(className, changesCollector)
                 classFqNameToSourceMap.remove(className.fqNameForClassNameWithoutDollars)
-                classAttributesMap.remove(className.fqNameForClassNameWithoutDollars)
                 internalNameToSource.remove(className.internalName)
 
                 // TODO NO_CHANGES? (delegates only)
@@ -277,7 +271,6 @@ open class IncrementalJvmCache(
 
     private inner class ProtoMap(storageFile: File) : BasicStringMap<ProtoMapValue>(storageFile, ProtoMapValueExternalizer) {
 
-        @Synchronized
         fun process(kotlinClass: LocalFileKotlinClass, changesCollector: ChangesCollector) {
             return put(kotlinClass, changesCollector)
         }
@@ -289,12 +282,10 @@ open class IncrementalJvmCache(
         // from files compiled during last round.
         // However there is no need to compare old and new data in this case
         // (also that would fail with exception).
-        @Synchronized
         fun storeModuleMapping(className: JvmClassName, bytes: ByteArray) {
             storage[className.internalName] = ProtoMapValue(isPackageFacade = false, bytes = bytes, strings = emptyArray())
         }
 
-        @Synchronized
         private fun put(kotlinClass: LocalFileKotlinClass, changesCollector: ChangesCollector) {
             val header = kotlinClass.classHeader
 
@@ -317,7 +308,6 @@ open class IncrementalJvmCache(
         operator fun get(className: JvmClassName): ProtoMapValue? =
             storage[className.internalName]
 
-        @Synchronized
         fun remove(className: JvmClassName, changesCollector: ChangesCollector) {
             val key = className.internalName
             val oldValue = storage[key] ?: return
@@ -334,8 +324,6 @@ open class IncrementalJvmCache(
 
     private inner class JavaSourcesProtoMap(storageFile: File) :
         BasicStringMap<SerializedJavaClass>(storageFile, JavaClassProtoMapValueExternalizer) {
-
-        @Synchronized
         fun process(jvmClassName: JvmClassName, newData: SerializedJavaClass, changesCollector: ChangesCollector) {
             val key = jvmClassName.internalName
             val oldData = storage[key]
@@ -347,7 +335,6 @@ open class IncrementalJvmCache(
             )
         }
 
-        @Synchronized
         fun remove(className: JvmClassName, changesCollector: ChangesCollector) {
             val key = className.internalName
             val oldValue = storage[key] ?: return
@@ -387,7 +374,6 @@ open class IncrementalJvmCache(
         operator fun contains(className: JvmClassName): Boolean =
             className.internalName in storage
 
-        @Synchronized
         fun process(kotlinClass: LocalFileKotlinClass, changesCollector: ChangesCollector) {
             val key = kotlinClass.className.internalName
             val oldMap = storage[key] ?: emptyMap()
@@ -400,13 +386,10 @@ open class IncrementalJvmCache(
             }
 
             for (const in oldMap.keys + newMap.keys) {
-                //Constant can be declared via companion object or via const field declaration
-                changesCollector.collectMemberIfValueWasChanged(kotlinClass.scopeFqName(companion = true), const, oldMap[const], newMap[const])
-                changesCollector.collectMemberIfValueWasChanged(kotlinClass.scopeFqName(companion = false), const, oldMap[const], newMap[const])
+                changesCollector.collectMemberIfValueWasChanged(kotlinClass.scopeFqName(), const, oldMap[const], newMap[const])
             }
         }
 
-        @Synchronized
         fun remove(className: JvmClassName) {
             storage.remove(className.internalName)
         }
@@ -432,8 +415,6 @@ open class IncrementalJvmCache(
 
     private inner class MultifileClassFacadeMap(storageFile: File) :
         BasicStringMap<Collection<String>>(storageFile, StringCollectionExternalizer) {
-
-        @Synchronized
         operator fun set(className: JvmClassName, partNames: Collection<String>) {
             storage[className.internalName] = partNames
         }
@@ -444,7 +425,6 @@ open class IncrementalJvmCache(
         operator fun contains(className: JvmClassName): Boolean =
             className.internalName in storage
 
-        @Synchronized
         fun remove(className: JvmClassName) {
             storage.remove(className.internalName)
         }
@@ -454,8 +434,6 @@ open class IncrementalJvmCache(
 
     private inner class MultifileClassPartMap(storageFile: File) :
         BasicStringMap<String>(storageFile, EnumeratorStringDescriptor.INSTANCE) {
-
-        @Synchronized
         fun set(partName: String, facadeName: String) {
             storage[partName] = facadeName
         }
@@ -463,7 +441,6 @@ open class IncrementalJvmCache(
         fun get(partName: JvmClassName): String? =
             storage[partName.internalName]
 
-        @Synchronized
         fun remove(className: JvmClassName) {
             storage.remove(className.internalName)
         }
@@ -545,7 +522,6 @@ open class IncrementalJvmCache(
             return result
         }
 
-        @Synchronized
         fun process(kotlinClass: LocalFileKotlinClass, changesCollector: ChangesCollector) {
             val key = kotlinClass.className.internalName
             val oldMap = storage[key] ?: emptyMap()
@@ -571,7 +547,6 @@ open class IncrementalJvmCache(
         private fun functionNameBySignature(signature: String): String =
             signature.substringBefore("(")
 
-        @Synchronized
         fun remove(className: JvmClassName) {
             storage.remove(className.internalName)
         }
@@ -593,7 +568,6 @@ sealed class ChangeInfo(val fqName: FqName) {
 
     class SignatureChanged(fqName: FqName, val areSubclassesAffected: Boolean) : ChangeInfo(fqName)
 
-    class ParentsChanged(fqName: FqName, val parentsChanged: Collection<FqName>) : ChangeInfo(fqName)
 
     protected open fun toStringProperties(): String = "fqName = $fqName"
 
@@ -602,12 +576,11 @@ sealed class ChangeInfo(val fqName: FqName) {
     }
 }
 
-private fun LocalFileKotlinClass.scopeFqName(companion: Boolean = false) = when (classHeader.kind) {
-    KotlinClassHeader.Kind.CLASS -> {
-        className.fqNameForClassNameWithoutDollars.let { if (companion) it.child(DEFAULT_NAME_FOR_COMPANION_OBJECT) else it }
+private fun LocalFileKotlinClass.scopeFqName() =
+    when (classHeader.kind) {
+        KotlinClassHeader.Kind.CLASS -> className.fqNameForClassNameWithoutDollars
+        else -> className.packageFqName
     }
-    else -> className.packageFqName
-}
 
 fun ByteArray.md5(): Long {
     val d = MessageDigest.getInstance("MD5").digest(this)!!

build-common/src/org/jetbrains/kotlin/incremental/IncrementalModuleInfo.kt

@@ -21,7 +21,6 @@ data class IncrementalModuleEntry(
 
 class IncrementalModuleInfo(
     val projectRoot: File,
-    val rootProjectBuildDir: File,
     val dirToModule: Map<File, IncrementalModuleEntry>,
     val nameToModules: Map<String, Set<IncrementalModuleEntry>>,
     val jarToClassListFile: Map<File, File>,
@@ -29,6 +28,6 @@ class IncrementalModuleInfo(
     val jarToModule: Map<File, IncrementalModuleEntry>
 ) : Serializable {
     companion object {
-        private const val serialVersionUID = 1L
+        private const val serialVersionUID = 0L
     }
 }

build-common/src/org/jetbrains/kotlin/incremental/LookupStorage.kt

@@ -17,18 +17,19 @@
 package org.jetbrains.kotlin.incremental
 
 import com.intellij.util.containers.MultiMap
+import com.intellij.util.containers.StringInterner
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.incremental.components.Position
 import org.jetbrains.kotlin.incremental.components.ScopeKind
 import org.jetbrains.kotlin.incremental.storage.*
 import org.jetbrains.kotlin.utils.Printer
-import org.jetbrains.kotlin.utils.createStringInterner
 import org.jetbrains.kotlin.utils.keysToMap
 import java.io.File
 import java.io.IOException
 import java.util.*
 
+
 open class LookupStorage(
     targetDataDir: File,
     pathConverter: FileToPathConverter
@@ -211,8 +212,8 @@ open class LookupStorage(
 
 class LookupTrackerImpl(private val delegate: LookupTracker) : LookupTracker {
     val lookups = MultiMap.createSet<LookupSymbol, String>()
-    val pathInterner = createStringInterner()
-    private val interner = createStringInterner()
+    val pathInterner = StringInterner()
+    private val interner = StringInterner()
 
     override val requiresPosition: Boolean
         get() = delegate.requiresPosition

build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt

@@ -182,21 +182,6 @@ open class ProtoCompareGenerated(
 
         if (!checkEqualsClassSealedSubclassFqName(old, new)) return false
 
-        if (old.hasInlineClassUnderlyingPropertyName() != new.hasInlineClassUnderlyingPropertyName()) return false
-        if (old.hasInlineClassUnderlyingPropertyName()) {
-            if (!checkStringEquals(old.inlineClassUnderlyingPropertyName, new.inlineClassUnderlyingPropertyName)) return false
-        }
-
-        if (old.hasInlineClassUnderlyingType() != new.hasInlineClassUnderlyingType()) return false
-        if (old.hasInlineClassUnderlyingType()) {
-            if (!checkEquals(old.inlineClassUnderlyingType, new.inlineClassUnderlyingType)) return false
-        }
-
-        if (old.hasInlineClassUnderlyingTypeId() != new.hasInlineClassUnderlyingTypeId()) return false
-        if (old.hasInlineClassUnderlyingTypeId()) {
-            if (!checkEquals(oldTypeTable.getType(old.inlineClassUnderlyingTypeId), newTypeTable.getType(new.inlineClassUnderlyingTypeId))) return false
-        }
-
         if (!checkEqualsClassVersionRequirement(old, new)) return false
 
         if (old.hasVersionRequirementTable() != new.hasVersionRequirementTable()) return false
@@ -281,9 +266,6 @@ open class ProtoCompareGenerated(
         TYPE_ALIAS_LIST,
         ENUM_ENTRY_LIST,
         SEALED_SUBCLASS_FQ_NAME_LIST,
-        INLINE_CLASS_UNDERLYING_PROPERTY_NAME,
-        INLINE_CLASS_UNDERLYING_TYPE,
-        INLINE_CLASS_UNDERLYING_TYPE_ID,
         VERSION_REQUIREMENT_LIST,
         VERSION_REQUIREMENT_TABLE,
         JVM_EXT_CLASS_MODULE_NAME,
@@ -332,21 +314,6 @@ open class ProtoCompareGenerated(
 
         if (!checkEqualsClassSealedSubclassFqName(old, new)) result.add(ProtoBufClassKind.SEALED_SUBCLASS_FQ_NAME_LIST)
 
-        if (old.hasInlineClassUnderlyingPropertyName() != new.hasInlineClassUnderlyingPropertyName()) result.add(ProtoBufClassKind.INLINE_CLASS_UNDERLYING_PROPERTY_NAME)
-        if (old.hasInlineClassUnderlyingPropertyName()) {
-            if (!checkStringEquals(old.inlineClassUnderlyingPropertyName, new.inlineClassUnderlyingPropertyName)) result.add(ProtoBufClassKind.INLINE_CLASS_UNDERLYING_PROPERTY_NAME)
-        }
-
-        if (old.hasInlineClassUnderlyingType() != new.hasInlineClassUnderlyingType()) result.add(ProtoBufClassKind.INLINE_CLASS_UNDERLYING_TYPE)
-        if (old.hasInlineClassUnderlyingType()) {
-            if (!checkEquals(old.inlineClassUnderlyingType, new.inlineClassUnderlyingType)) result.add(ProtoBufClassKind.INLINE_CLASS_UNDERLYING_TYPE)
-        }
-
-        if (old.hasInlineClassUnderlyingTypeId() != new.hasInlineClassUnderlyingTypeId()) result.add(ProtoBufClassKind.INLINE_CLASS_UNDERLYING_TYPE_ID)
-        if (old.hasInlineClassUnderlyingTypeId()) {
-            if (!checkEquals(oldTypeTable.getType(old.inlineClassUnderlyingTypeId), newTypeTable.getType(new.inlineClassUnderlyingTypeId))) result.add(ProtoBufClassKind.INLINE_CLASS_UNDERLYING_TYPE_ID)
-        }
-
         if (!checkEqualsClassVersionRequirement(old, new)) result.add(ProtoBufClassKind.VERSION_REQUIREMENT_LIST)
 
         if (old.hasVersionRequirementTable() != new.hasVersionRequirementTable()) result.add(ProtoBufClassKind.VERSION_REQUIREMENT_TABLE)
@@ -1761,18 +1728,6 @@ fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) ->
         hashCode = 31 * hashCode + fqNameIndexes(getSealedSubclassFqName(i))
     }
 
-    if (hasInlineClassUnderlyingPropertyName()) {
-        hashCode = 31 * hashCode + stringIndexes(inlineClassUnderlyingPropertyName)
-    }
-
-    if (hasInlineClassUnderlyingType()) {
-        hashCode = 31 * hashCode + inlineClassUnderlyingType.hashCode(stringIndexes, fqNameIndexes, typeById)
-    }
-
-    if (hasInlineClassUnderlyingTypeId()) {
-        hashCode = 31 * hashCode + typeById(inlineClassUnderlyingTypeId).hashCode(stringIndexes, fqNameIndexes, typeById)
-    }
-
     for(i in 0..versionRequirementCount - 1) {
         hashCode = 31 * hashCode + getVersionRequirement(i)
     }

build-common/src/org/jetbrains/kotlin/incremental/buildUtil.kt

@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.build.GeneratedFile
 import org.jetbrains.kotlin.build.GeneratedJvmClass
 import org.jetbrains.kotlin.build.JvmSourceRoot
 import org.jetbrains.kotlin.build.isModuleMappingFile
-import org.jetbrains.kotlin.build.report.ICReporter
 import org.jetbrains.kotlin.config.Services
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
@@ -32,7 +31,6 @@ import org.jetbrains.kotlin.progress.CompilationCanceledStatus
 import org.jetbrains.kotlin.resolve.sam.SAM_LOOKUP_NAME
 import org.jetbrains.kotlin.utils.addToStdlib.flattenTo
 import java.io.File
-import java.nio.file.Files
 import java.util.*
 import kotlin.collections.HashSet
 import kotlin.collections.LinkedHashSet
@@ -68,7 +66,7 @@ fun makeModuleFile(
         friendDirs
     )
 
-    val scriptFile = Files.createTempFile("kjps", sanitizeJavaIdentifier(name) + ".script.xml").toFile()
+    val scriptFile = File.createTempFile("kjps", sanitizeJavaIdentifier(name) + ".script.xml")
     scriptFile.writeText(builder.asText().toString())
     return scriptFile
 }
@@ -136,8 +134,7 @@ fun LookupStorage.update(
 
 data class DirtyData(
     val dirtyLookupSymbols: Collection<LookupSymbol> = emptyList(),
-    val dirtyClassesFqNames: Collection<FqName> = emptyList(),
-    val dirtyClassesFqNamesForceRecompile: Collection<FqName> = emptyList()
+    val dirtyClassesFqNames: Collection<FqName> = emptyList()
 )
 
 fun ChangesCollector.getDirtyData(
@@ -147,9 +144,6 @@ fun ChangesCollector.getDirtyData(
     val dirtyLookupSymbols = HashSet<LookupSymbol>()
     val dirtyClassesFqNames = HashSet<FqName>()
 
-    val sealedParents = HashMap<FqName, MutableSet<FqName>>()
-    val notSealedParents = HashSet<FqName>()
-
     for (change in changes()) {
         reporter.reportVerbose { "Process $change" }
 
@@ -174,35 +168,10 @@ fun ChangesCollector.getDirtyData(
             }
 
             fqNames.mapTo(dirtyLookupSymbols) { LookupSymbol(SAM_LOOKUP_NAME.asString(), it.asString()) }
-        } else if (change is ChangeInfo.ParentsChanged) {
-            fun FqName.isSealed(): Boolean {
-                if (notSealedParents.contains(this)) return false
-                if (sealedParents.containsKey(this)) return true
-                return isSealed(this, caches).also { sealed ->
-                    if (sealed) {
-                        sealedParents[this] = HashSet()
-                    } else {
-                        notSealedParents.add(this)
-                    }
-                }
-            }
-            change.parentsChanged.forEach { parent ->
-                if (parent.isSealed()) {
-                    sealedParents.getOrPut(parent) { HashSet() }.add(change.fqName)
-                }
-            }
         }
     }
 
-    val forceRecompile = HashSet<FqName>().apply {
-        addAll(sealedParents.keys)
-        //we should recompile all inheritors with parent sealed class: add known subtypes
-        addAll(sealedParents.keys.flatMap { withSubtypes(it, caches) })
-        //we should recompile all inheritors with parent sealed class: add new subtypes
-        addAll(sealedParents.values.flatten())
-    }
-
-    return DirtyData(dirtyLookupSymbols, dirtyClassesFqNames, forceRecompile)
+    return DirtyData(dirtyLookupSymbols, dirtyClassesFqNames)
 }
 
 fun mapLookupSymbolsToFiles(
@@ -246,11 +215,6 @@ fun mapClassesFqNamesToFiles(
     return fqNameToAffectedFiles.values.flattenTo(HashSet())
 }
 
-fun isSealed(
-    fqName: FqName,
-    caches: Iterable<IncrementalCacheCommon>
-): Boolean = caches.any { it.isSealed(fqName) ?: false }
-
 fun withSubtypes(
     typeFqName: FqName,
     caches: Iterable<IncrementalCacheCommon>

build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt

@@ -27,15 +27,12 @@ import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmProtoBufUtil
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.serialization.deserialization.ProtoEnumFlags
-import org.jetbrains.kotlin.serialization.deserialization.descriptorVisibility
-import org.jetbrains.kotlin.serialization.deserialization.getClassId
 import java.util.*
 
 data class Difference(
     val isClassAffected: Boolean = false,
     val areSubclassesAffected: Boolean = false,
-    val changedMembersNames: Set<String> = emptySet(),
-    val changedSupertypes: Set<FqName> = emptySet()
+    val changedMembersNames: Set<String> = emptySet()
 )
 
 sealed class ProtoData
@@ -53,7 +50,7 @@ fun ProtoMapValue.toProtoData(packageFqName: FqName): ProtoData =
 
 internal val MessageLite.isPrivate: Boolean
     get() = DescriptorVisibilities.isPrivate(
-        ProtoEnumFlags.descriptorVisibility(
+        ProtoEnumFlags.visibility(
             when (this) {
                 is ProtoBuf.Constructor -> Flags.VISIBILITY.get(flags)
                 is ProtoBuf.Function -> Flags.VISIBILITY.get(flags)
@@ -189,7 +186,6 @@ class DifferenceCalculatorForClass(
 
         var isClassAffected = false
         var areSubclassesAffected = false
-        val changedSupertypes = HashSet<FqName>()
         val names = hashSetOf<String>()
         val classIsSealed = newProto.isSealed && oldProto.isSealed
 
@@ -250,21 +246,12 @@ class DifferenceCalculatorForClass(
                 ProtoBufClassKind.FLAGS,
                 ProtoBufClassKind.FQ_NAME,
                 ProtoBufClassKind.TYPE_PARAMETER_LIST,
+                ProtoBufClassKind.SUPERTYPE_LIST,
+                ProtoBufClassKind.SUPERTYPE_ID_LIST,
                 ProtoBufClassKind.JS_EXT_CLASS_ANNOTATION_LIST -> {
                     isClassAffected = true
                     areSubclassesAffected = true
                 }
-
-                ProtoBufClassKind.SUPERTYPE_LIST,
-                ProtoBufClassKind.SUPERTYPE_ID_LIST -> {
-                    isClassAffected = true
-                    areSubclassesAffected = true
-
-                    val oldSupertypes = oldProto.supertypeList.map { oldNameResolver.getClassId(it.className).asSingleFqName() }
-                    val newSupertypes = newProto.supertypeList.map { newNameResolver.getClassId(it.className).asSingleFqName() }
-                    val changed = (oldSupertypes union newSupertypes) subtract (oldSupertypes intersect newSupertypes)
-                    changedSupertypes.addAll(changed)
-                }
                 ProtoBufClassKind.JVM_EXT_CLASS_MODULE_NAME,
                 ProtoBufClassKind.JS_EXT_CLASS_CONTAINING_FILE_ID -> {
                     // TODO
@@ -290,15 +277,10 @@ class DifferenceCalculatorForClass(
                     isClassAffected = true
                     areSubclassesAffected = true
                 }
-                ProtoBufClassKind.INLINE_CLASS_UNDERLYING_PROPERTY_NAME,
-                ProtoBufClassKind.INLINE_CLASS_UNDERLYING_TYPE,
-                ProtoBufClassKind.INLINE_CLASS_UNDERLYING_TYPE_ID -> {
-                    isClassAffected = true
-                }
             }
         }
 
-        return Difference(isClassAffected, areSubclassesAffected, names, changedSupertypes)
+        return Difference(isClassAffected, areSubclassesAffected, names)
     }
 }
 

build-common/src/org/jetbrains/kotlin/incremental/storage/BasicMapsOwner.kt

@@ -30,7 +30,6 @@ open class BasicMapsOwner(val cachesDir: File) {
     protected val String.storageFile: File
         get() = File(cachesDir, this + "." + CACHE_EXTENSION)
 
-    @Synchronized
     protected fun <K, V, M : BasicMap<K, V>> registerMap(map: M): M {
         maps.add(map)
         return map
@@ -48,7 +47,6 @@ open class BasicMapsOwner(val cachesDir: File) {
         forEachMapSafe("flush") { it.flush(memoryCachesOnly) }
     }
 
-    @Synchronized
     private fun forEachMapSafe(actionName: String, action: (BasicMap<*, *>) -> Unit) {
         val actionExceptions = LinkedHashMap<String, Exception>()
         maps.forEach {
@@ -68,6 +66,5 @@ open class BasicMapsOwner(val cachesDir: File) {
     }
 
     @TestOnly
-    @Synchronized
     fun dump(): String = maps.joinToString("\n\n") { it.dump() }
 }

build-common/src/org/jetbrains/kotlin/incremental/storage/CachingLazyStorage.kt

@@ -17,11 +17,9 @@
 package org.jetbrains.kotlin.incremental.storage
 
 import com.intellij.util.io.DataExternalizer
-import com.intellij.util.io.IOUtil
 import com.intellij.util.io.KeyDescriptor
 import com.intellij.util.io.PersistentHashMap
 import java.io.File
-import java.io.IOException
 
 
 /**
@@ -32,6 +30,7 @@ class CachingLazyStorage<K, V>(
     private val keyDescriptor: KeyDescriptor<K>,
     private val valueExternalizer: DataExternalizer<V>
 ) : LazyStorage<K, V> {
+    @Volatile
     private var storage: PersistentHashMap<K, V>? = null
 
     @Synchronized
@@ -81,10 +80,8 @@ class CachingLazyStorage<K, V>(
         try {
             storage?.close()
         } finally {
+            PersistentHashMap.deleteFilesStartingWith(storageFile)
             storage = null
-            if (!IOUtil.deleteAllFilesStartingWith(storageFile)) {
-                throw IOException("Could not delete internal storage: ${storageFile.absolutePath}")
-            }
         }
     }
 

build-common/src/org/jetbrains/kotlin/incremental/storage/ClassAttributesMap.kt

@@ -1,51 +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 org.jetbrains.kotlin.name.FqName
-import java.io.DataInput
-import java.io.DataOutput
-import java.io.File
-
-internal data class ICClassesAttributes(val isSealed: Boolean)
-
-internal object ICClassesAttributesExternalizer : DataExternalizer<ICClassesAttributes> {
-    override fun read(input: DataInput): ICClassesAttributes {
-        return ICClassesAttributes(input.readBoolean())
-    }
-
-    override fun save(output: DataOutput, value: ICClassesAttributes) {
-        output.writeBoolean(value.isSealed)
-    }
-}
-
-internal open class ClassAttributesMap(
-    storageFile: File
-) : BasicStringMap<ICClassesAttributes>(storageFile, ICClassesAttributesExternalizer) {
-    override fun dumpValue(value: ICClassesAttributes): String = value.toString()
-
-    operator fun set(key: FqName, value: ICClassesAttributes) {
-        storage[key.asString()] = value
-    }
-
-    operator fun get(key: FqName): ICClassesAttributes? = storage[key.asString()]
-
-    fun remove(key: FqName) {
-        storage.remove(key.asString())
-    }
-}

build-common/src/org/jetbrains/kotlin/incremental/storage/ClassOneToManyMap.kt

@@ -20,18 +20,18 @@ 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) {
+internal open class ClassOneToManyMap(
+        storageFile: File
+) : BasicStringMap<Collection<String>>(storageFile, StringCollectionExternalizer) {
     override fun dumpValue(value: Collection<String>): String = value.dumpCollection()
 
-    @Synchronized
     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()
+            storage[key.asString()]?.map(::FqName) ?: setOf()
 
-    @Synchronized
     operator fun set(key: FqName, values: Collection<FqName>) {
         if (values.isEmpty()) {
             remove(key)
@@ -41,14 +41,10 @@ internal open class ClassOneToManyMap(storageFile: File) : BasicStringMap<Collec
         storage[key.asString()] = values.map(FqName::asString)
     }
 
-    @Synchronized
     fun remove(key: FqName) {
         storage.remove(key.asString())
     }
 
-    // Access to caches could be done from multiple threads (e.g. JPS worker and RMI). The underlying collection is already synchronized,
-    // thus we need synchronization of this method and all modification methods.
-    @Synchronized
     fun removeValues(key: FqName, removed: Set<FqName>) {
         val notRemoved = this[key].filter { it !in removed }
         this[key] = notRemoved

build-common/src/org/jetbrains/kotlin/incremental/storage/DirtyClassesMaps.kt

@@ -25,7 +25,8 @@ internal class DirtyClassesJvmNameMap(storageFile: File) : AbstractDirtyClassesM
 internal class DirtyClassesFqNameMap(storageFile: File) : AbstractDirtyClassesMap<FqName>(FqNameTransformer, storageFile)
 
 internal abstract class AbstractDirtyClassesMap<Name>(
-    private val nameTransformer: NameTransformer<Name>, storageFile: File
+        private val nameTransformer: NameTransformer<Name>,
+        storageFile: File
 ) : BasicStringMap<Boolean>(storageFile, BooleanDataDescriptor.INSTANCE) {
     fun markDirty(className: Name) {
         storage[nameTransformer.asString(className)] = true
@@ -36,10 +37,10 @@ internal abstract class AbstractDirtyClassesMap<Name>(
     }
 
     fun getDirtyOutputClasses(): Collection<Name> =
-        storage.keys.map { nameTransformer.asName(it) }
+            storage.keys.map { nameTransformer.asName(it) }
 
     fun isDirty(className: Name): Boolean =
-        storage.contains(nameTransformer.asString(className))
+            storage.contains(nameTransformer.asString(className))
 
     override fun dumpValue(value: Boolean) = ""
 }

build-common/src/org/jetbrains/kotlin/incremental/storage/IncrementalFileToPathConverter.kt

@@ -1,34 +0,0 @@
-/*
- * Copyright 2010-2020 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 IncrementalFileToPathConverter(val rootProjectDir: File?) : FileToPathConverter {
-    //project root dir
-    private val projectDirPath = rootProjectDir?.normalize()?.absolutePath
-
-    override fun toPath(file: File): String {
-        val path = file.normalize().absolutePath
-        return when {
-            projectDirPath == null || !path.startsWith(projectDirPath) -> path
-            else -> PROJECT_DIR_PLACEHOLDER + path.substring(projectDirPath.length)
-        }
-    }
-
-    override fun toFile(path: String): File =
-        when {
-            rootProjectDir != null && path.startsWith(PROJECT_DIR_PLACEHOLDER) -> rootProjectDir.resolve(path.substring(PATH_PREFIX.length))
-            else -> File(path)
-        }
-
-    private companion object {
-        private const val PROJECT_DIR_PLACEHOLDER = "${'$'}PROJECT_DIR$"
-        //use only for prefix length because it OS dependent
-        private const val PATH_PREFIX = "$PROJECT_DIR_PLACEHOLDER/"
-
-    }
-}

build-common/src/org/jetbrains/kotlin/incremental/storage/NonCachingLazyStorage.kt

@@ -17,11 +17,9 @@
 package org.jetbrains.kotlin.incremental.storage
 
 import com.intellij.util.io.DataExternalizer
-import com.intellij.util.io.IOUtil
 import com.intellij.util.io.KeyDescriptor
 import com.intellij.util.io.PersistentHashMap
 import java.io.File
-import java.io.IOException
 
 
 class NonCachingLazyStorage<K, V>(
@@ -29,6 +27,7 @@ class NonCachingLazyStorage<K, V>(
     private val keyDescriptor: KeyDescriptor<K>,
     private val valueExternalizer: DataExternalizer<V>
 ) : LazyStorage<K, V> {
+    @Volatile
     private var storage: PersistentHashMap<K, V>? = null
 
     @Synchronized
@@ -77,12 +76,11 @@ class NonCachingLazyStorage<K, V>(
     override fun clean() {
         try {
             storage?.close()
-        } finally {
-            storage = null
-            if (!IOUtil.deleteAllFilesStartingWith(storageFile)) {
-                throw IOException("Could not delete internal storage: ${storageFile.absolutePath}")
-            }
+        } catch (ignored: Throwable) {
         }
+
+        PersistentHashMap.deleteFilesStartingWith(storageFile)
+        storage = null
     }
 
     @Synchronized

build-common/src/org/jetbrains/kotlin/incremental/storage/NonCachingLazyStorage.kt.193

@@ -0,0 +1,106 @@
+/*
+ * 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)
+}

build-common/test/org/jetbrains/kotlin/build/BuildMetaInfoTest.kt

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.build
 
 import junit.framework.TestCase
+import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
 import org.junit.Assert.assertNotEquals
 import org.junit.Test
@@ -33,7 +34,10 @@ class BuildMetaInfoTest : TestCase() {
             "bytecodeVersionMinor",
             "bytecodeVersionPatch",
             "compilerBuildVersion",
+            "coroutinesEnable",
+            "coroutinesError",
             "coroutinesVersion",
+            "coroutinesWarn",
             "isEAP",
             "languageVersionString",
             "metadataVersionMajor",
@@ -67,12 +71,14 @@ class BuildMetaInfoTest : TestCase() {
     @Test
     fun testJvmEquals() {
         val args1 = K2JVMCompilerArguments()
+        args1.coroutinesState = CommonCompilerArguments.ENABLE
         val info1 = JvmBuildMetaInfo.create(args1)
 
         val args2 = K2JVMCompilerArguments()
+        args2.coroutinesState = CommonCompilerArguments.WARN
         val info2 = JvmBuildMetaInfo.create(args2)
 
-        assertEquals(info1, info2)
-        assertEquals(info1, info2.copy())
+        assertNotEquals(info1, info2)
+        assertEquals(info1, info2.copy(coroutinesEnable = true, coroutinesWarn = false))
     }
 }

build-common/test/org/jetbrains/kotlin/incremental/storage/IncrementalFileToPathConverterTest.kt

@@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2020 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.TestWithWorkingDir
-import org.junit.Test
-import java.io.File
-
-internal class IncrementalFileToPathConverterTest : TestWithWorkingDir() {
-    val separator: String = File.separator
-
-    @Test
-    fun testPathTransform() {
-        val relativeFilePath = "testFile.txt"
-        val transformedPath = testPathTransformation(workingDir.resolve("testDir"), relativeFilePath)
-
-        assertEquals("${'$'}PROJECT_DIR${'$'}$separator$relativeFilePath", transformedPath)
-    }
-
-    @Test
-    fun testComplicatedProjectRootPath() {
-        val relativeFilePath = "testFile.txt"
-        val transformedPath = testPathTransformation(workingDir.resolve("first$separator..${separator}testDir"), relativeFilePath)
-
-        assertEquals("${'$'}PROJECT_DIR${'$'}$separator$relativeFilePath", transformedPath)
-    }
-
-    @Test
-    fun testInccorectProjectRootPath() {
-        val relativeFilePath = "testFile.txt"
-        val transformedPath = testPathTransformation(workingDir.resolve("testDir$separator"), relativeFilePath)
-
-        assertEquals("${'$'}PROJECT_DIR${'$'}$separator$relativeFilePath", transformedPath)
-    }
-
-    @Test
-    fun testFileOutOfProject() {
-        val relativeFilePath = "..${separator}testFile.txt"
-        val transformedPath = testPathTransformation(workingDir.resolve("testDir"), relativeFilePath)
-
-        assertEquals("${workingDir.absolutePath}${separator}testFile.txt", transformedPath)
-    }
-
-    @Test
-    fun testFileWithExtraSlash() {
-        val relativeFilePath = "testFile.txt$separator"
-        val transformedPath = testPathTransformation(workingDir.resolve("testDir"), relativeFilePath)
-
-        assertEquals("${'$'}PROJECT_DIR${'$'}${separator}testFile.txt", transformedPath)
-    }
-
-    private fun testPathTransformation(projectRoot: File, relativeFilePath: String): String {
-        val pathConverter = IncrementalFileToPathConverter(projectRoot)
-        val testFile = projectRoot.resolve(relativeFilePath)
-        val transformedPath = pathConverter.toPath(testFile)
-        assertEquals(testFile.normalize().absolutePath, pathConverter.toFile(transformedPath).normalize().absolutePath)
-        return transformedPath
-    }
-}

build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt

@@ -22,19 +22,16 @@ data class BuildLogFinder(
     private val isDataContainerBuildLogEnabled: Boolean = false,
     private val isGradleEnabled: Boolean = false,
     private val isJsEnabled: Boolean = false,
-    private val isScopeExpansionEnabled: Boolean = false,
-    private val isKlibEnabled: Boolean = false,
-    private val isFirEnabled: Boolean = false
+    private val isJsIrEnabled: Boolean = false, // TODO rename as it is used for metadata-only test
+    private val isScopeExpansionEnabled: Boolean = false
 ) {
     companion object {
         private const val JS_LOG = "js-build.log"
-        private const val KLIB_LOG = "klib-build.log"
+        private const val JS_IR_LOG = "js-ir-build.log"
         private const val SCOPE_EXPANDING_LOG = "build-with-scope-expansion.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 FIR_LOG = "fir-build.log"
-        private const val GRADLE_FIR_LOG = "gradle-fir-build.log"
         private const val SIMPLE_LOG = "build.log"
 
         fun isJpsLogFile(file: File): Boolean =
@@ -46,10 +43,8 @@ data class BuildLogFinder(
         val files = names.filter { File(dir, it).isFile }.toSet()
         val matchedName = when {
             isScopeExpansionEnabled && SCOPE_EXPANDING_LOG in files -> SCOPE_EXPANDING_LOG
-            isKlibEnabled && KLIB_LOG in files -> KLIB_LOG
+            isJsIrEnabled && JS_IR_LOG in files -> JS_IR_LOG
             isJsEnabled && JS_LOG in files -> JS_LOG
-            isGradleEnabled && isFirEnabled && GRADLE_FIR_LOG in files -> GRADLE_FIR_LOG
-            isFirEnabled && FIR_LOG in files -> FIR_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

build-common/test/org/jetbrains/kotlin/incremental/testingUtils/classFilesComparison.kt

@@ -151,35 +151,29 @@ private fun classFileToString(classFile: File): String {
     val traceVisitor = TraceClassVisitor(PrintWriter(out))
     ClassReader(classFile.readBytes()).accept(traceVisitor, 0)
 
-    val classHeader = LocalFileKotlinClass.create(classFile)?.classHeader ?: return ""
-    if (!classHeader.metadataVersion.isCompatible()) {
-        error("Incompatible class ($classHeader): $classFile")
-    }
+    val classHeader = LocalFileKotlinClass.create(classFile)?.classHeader
 
-    when (classHeader.kind) {
-        KotlinClassHeader.Kind.FILE_FACADE, KotlinClassHeader.Kind.CLASS, KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> {
-            ByteArrayInputStream(BitEncoding.decodeBytes(classHeader.data!!)).use { input ->
-                out.write("\n------ string table types proto -----\n${DebugJvmProtoBuf.StringTableTypes.parseDelimitedFrom(input)}")
+    val annotationDataEncoded = classHeader?.data
+    if (annotationDataEncoded != null) {
+        ByteArrayInputStream(BitEncoding.decodeBytes(annotationDataEncoded)).use {
+            input ->
 
-                when (classHeader.kind) {
-                    KotlinClassHeader.Kind.FILE_FACADE ->
-                        out.write("\n------ file facade proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}")
-                    KotlinClassHeader.Kind.CLASS ->
-                        out.write("\n------ class proto -----\n${DebugProtoBuf.Class.parseFrom(input, getExtensionRegistry())}")
-                    KotlinClassHeader.Kind.MULTIFILE_CLASS_PART ->
-                        out.write("\n------ multi-file part proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}")
-                    else -> error(classHeader.kind)
-                }
+            out.write("\n------ string table types proto -----\n${DebugJvmProtoBuf.StringTableTypes.parseDelimitedFrom(input)}")
+
+            if (!classHeader.metadataVersion.isCompatible()) {
+                error("Incompatible class ($classHeader): $classFile")
+            }
+
+            when (classHeader.kind) {
+                KotlinClassHeader.Kind.FILE_FACADE ->
+                    out.write("\n------ file facade proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}")
+                KotlinClassHeader.Kind.CLASS ->
+                    out.write("\n------ class proto -----\n${DebugProtoBuf.Class.parseFrom(input, getExtensionRegistry())}")
+                KotlinClassHeader.Kind.MULTIFILE_CLASS_PART ->
+                    out.write("\n------ multi-file part proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}")
+                else -> throw IllegalStateException()
             }
         }
-        KotlinClassHeader.Kind.MULTIFILE_CLASS -> {
-            out.write("\n------ multi-file facade data -----\n")
-            out.write(classHeader.data!!.joinToString("\n"))
-        }
-        KotlinClassHeader.Kind.SYNTHETIC_CLASS -> {
-            // Synthetic class has no metadata, thus there can be no differences in it.
-        }
-        KotlinClassHeader.Kind.UNKNOWN -> error("Should not meet unknown classes here: $classFile")
     }
 
     return out.toString()

build-common/test/org/jetbrains/kotlin/library/metadata/DebugKlibMetadataProtoBuf.java

@@ -10,21 +10,17 @@ public final class DebugKlibMetadataProtoBuf {
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.packageFqName);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.classAnnotation);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.classFile);
-    registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.classKdoc);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.classUniqId);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.constructorAnnotation);
-    registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.constructorKdoc);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.constructorUniqId);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.functionAnnotation);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.functionFile);
-    registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.functionKdoc);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.functionUniqId);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyAnnotation);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyGetterAnnotation);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertySetterAnnotation);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.compileTimeValue);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyFile);
-    registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyKdoc);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.propertyUniqId);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.enumEntryAnnotation);
     registry.add(org.jetbrains.kotlin.library.metadata.DebugKlibMetadataProtoBuf.enumEntryOrdinal);
@@ -3167,17 +3163,6 @@ public final class DebugKlibMetadataProtoBuf {
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
-  public static final int CLASS_KDOC_FIELD_NUMBER = 176;
-  /**
-   * <code>extend .org.jetbrains.kotlin.metadata.Class { ... }</code>
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.metadata.DebugProtoBuf.Class,
-      java.lang.String> classKdoc = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        java.lang.String.class,
-        null);
   public static final int CLASS_UNIQ_ID_FIELD_NUMBER = 171;
   /**
    * <code>extend .org.jetbrains.kotlin.metadata.Class { ... }</code>
@@ -3200,17 +3185,6 @@ public final class DebugKlibMetadataProtoBuf {
           .newFileScopedGeneratedExtension(
         org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
         org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int CONSTRUCTOR_KDOC_FIELD_NUMBER = 173;
-  /**
-   * <code>extend .org.jetbrains.kotlin.metadata.Constructor { ... }</code>
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor,
-      java.lang.String> constructorKdoc = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        java.lang.String.class,
-        null);
   public static final int CONSTRUCTOR_UNIQ_ID_FIELD_NUMBER = 172;
   /**
    * <code>extend .org.jetbrains.kotlin.metadata.Constructor { ... }</code>
@@ -3244,17 +3218,6 @@ public final class DebugKlibMetadataProtoBuf {
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
-  public static final int FUNCTION_KDOC_FIELD_NUMBER = 174;
-  /**
-   * <code>extend .org.jetbrains.kotlin.metadata.Function { ... }</code>
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.metadata.DebugProtoBuf.Function,
-      java.lang.String> functionKdoc = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        java.lang.String.class,
-        null);
   public static final int FUNCTION_UNIQ_ID_FIELD_NUMBER = 173;
   /**
    * <code>extend .org.jetbrains.kotlin.metadata.Function { ... }</code>
@@ -3321,17 +3284,6 @@ public final class DebugKlibMetadataProtoBuf {
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
-  public static final int PROPERTY_KDOC_FIELD_NUMBER = 180;
-  /**
-   * <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
-      java.lang.String> propertyKdoc = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        java.lang.String.class,
-        null);
   public static final int PROPERTY_UNIQ_ID_FIELD_NUMBER = 179;
   /**
    * <code>extend .org.jetbrains.kotlin.metadata.Property { ... }</code>
@@ -3528,79 +3480,72 @@ public final class DebugKlibMetadataProtoBuf {
       ".metadata.Class\030\252\001 \003(\0132).org.jetbrains.k" +
       "otlin.metadata.Annotation:?\n\nclass_file\022",
       "$.org.jetbrains.kotlin.metadata.Class\030\257\001" +
-      " \001(\005B\004\200\265\030\001:?\n\nclass_kdoc\022$.org.jetbrains" +
-      ".kotlin.metadata.Class\030\260\001 \001(\tB\004\200\265\030\001:u\n\rc" +
-      "lass_uniq_id\022$.org.jetbrains.kotlin.meta" +
-      "data.Class\030\253\001 \001(\01327.org.jetbrains.kotlin" +
-      ".library.metadata.DescriptorUniqId:v\n\026co" +
-      "nstructor_annotation\022*.org.jetbrains.kot" +
-      "lin.metadata.Constructor\030\252\001 \003(\0132).org.je" +
-      "tbrains.kotlin.metadata.Annotation:K\n\020co" +
-      "nstructor_kdoc\022*.org.jetbrains.kotlin.me",
-      "tadata.Constructor\030\255\001 \001(\tB\004\200\265\030\001:\201\001\n\023cons" +
-      "tructor_uniq_id\022*.org.jetbrains.kotlin.m" +
-      "etadata.Constructor\030\254\001 \001(\01327.org.jetbrai" +
-      "ns.kotlin.library.metadata.DescriptorUni" +
-      "qId:p\n\023function_annotation\022\'.org.jetbrai" +
-      "ns.kotlin.metadata.Function\030\252\001 \003(\0132).org" +
-      ".jetbrains.kotlin.metadata.Annotation:E\n" +
-      "\rfunction_file\022\'.org.jetbrains.kotlin.me" +
-      "tadata.Function\030\254\001 \001(\005B\004\200\265\030\001:E\n\rfunction" +
-      "_kdoc\022\'.org.jetbrains.kotlin.metadata.Fu",
-      "nction\030\256\001 \001(\tB\004\200\265\030\001:{\n\020function_uniq_id\022" +
-      "\'.org.jetbrains.kotlin.metadata.Function" +
-      "\030\255\001 \001(\01327.org.jetbrains.kotlin.library.m" +
-      "etadata.DescriptorUniqId:p\n\023property_ann" +
-      "otation\022\'.org.jetbrains.kotlin.metadata." +
-      "Property\030\252\001 \003(\0132).org.jetbrains.kotlin.m" +
-      "etadata.Annotation:w\n\032property_getter_an" +
-      "notation\022\'.org.jetbrains.kotlin.metadata" +
-      ".Property\030\261\001 \003(\0132).org.jetbrains.kotlin." +
-      "metadata.Annotation:w\n\032property_setter_a",
-      "nnotation\022\'.org.jetbrains.kotlin.metadat" +
-      "a.Property\030\262\001 \003(\0132).org.jetbrains.kotlin" +
-      ".metadata.Annotation:~\n\022compile_time_val" +
-      "ue\022\'.org.jetbrains.kotlin.metadata.Prope" +
-      "rty\030\255\001 \001(\01328.org.jetbrains.kotlin.metada" +
-      "ta.Annotation.Argument.Value:E\n\rproperty" +
-      "_file\022\'.org.jetbrains.kotlin.metadata.Pr" +
-      "operty\030\260\001 \001(\005B\004\200\265\030\001:E\n\rproperty_kdoc\022\'.o" +
-      "rg.jetbrains.kotlin.metadata.Property\030\264\001" +
-      " \001(\tB\004\200\265\030\001:{\n\020property_uniq_id\022\'.org.jet",
-      "brains.kotlin.metadata.Property\030\263\001 \001(\01327" +
-      ".org.jetbrains.kotlin.library.metadata.D" +
-      "escriptorUniqId:s\n\025enum_entry_annotation" +
-      "\022(.org.jetbrains.kotlin.metadata.EnumEnt" +
-      "ry\030\252\001 \003(\0132).org.jetbrains.kotlin.metadat" +
-      "a.Annotation:E\n\022enum_entry_ordinal\022(.org" +
-      ".jetbrains.kotlin.metadata.EnumEntry\030\253\001 " +
-      "\001(\005:~\n\022enum_entry_uniq_id\022(.org.jetbrain" +
-      "s.kotlin.metadata.EnumEntry\030\254\001 \001(\01327.org" +
-      ".jetbrains.kotlin.library.metadata.Descr",
-      "iptorUniqId:w\n\024parameter_annotation\022-.or" +
-      "g.jetbrains.kotlin.metadata.ValueParamet" +
-      "er\030\252\001 \003(\0132).org.jetbrains.kotlin.metadat" +
-      "a.Annotation:h\n\017type_annotation\022#.org.je" +
-      "tbrains.kotlin.metadata.Type\030\252\001 \003(\0132).or" +
-      "g.jetbrains.kotlin.metadata.Annotation:{" +
-      "\n\031type_parameter_annotation\022,.org.jetbra" +
-      "ins.kotlin.metadata.TypeParameter\030\252\001 \003(\013" +
-      "2).org.jetbrains.kotlin.metadata.Annotat" +
-      "ion:\202\001\n\022type_param_uniq_id\022,.org.jetbrai",
-      "ns.kotlin.metadata.TypeParameter\030\253\001 \001(\0132" +
-      "7.org.jetbrains.kotlin.library.metadata." +
-      "DescriptorUniqId:U\n\026package_fragment_fil" +
-      "es\022..org.jetbrains.kotlin.metadata.Packa" +
-      "geFragment\030\252\001 \003(\005B\004\200\265\030\001:A\n\010is_empty\022..or" +
-      "g.jetbrains.kotlin.metadata.PackageFragm" +
-      "ent\030\254\001 \001(\010:@\n\007fq_name\022..org.jetbrains.ko" +
-      "tlin.metadata.PackageFragment\030\255\001 \001(\t:G\n\n" +
-      "class_name\022..org.jetbrains.kotlin.metada" +
-      "ta.PackageFragment\030\256\001 \003(\005B\002\020\001:~\n\022type_al",
-      "ias_uniq_id\022(.org.jetbrains.kotlin.metad" +
-      "ata.TypeAlias\030\203\001 \001(\01327.org.jetbrains.kot" +
-      "lin.library.metadata.DescriptorUniqIdB\033B" +
-      "\031DebugKlibMetadataProtoBuf"
+      " \001(\005B\004\200\265\030\001:u\n\rclass_uniq_id\022$.org.jetbra" +
+      "ins.kotlin.metadata.Class\030\253\001 \001(\01327.org.j" +
+      "etbrains.kotlin.library.metadata.Descrip" +
+      "torUniqId:v\n\026constructor_annotation\022*.or" +
+      "g.jetbrains.kotlin.metadata.Constructor\030" +
+      "\252\001 \003(\0132).org.jetbrains.kotlin.metadata.A" +
+      "nnotation:\201\001\n\023constructor_uniq_id\022*.org." +
+      "jetbrains.kotlin.metadata.Constructor\030\254\001" +
+      " \001(\01327.org.jetbrains.kotlin.library.meta",
+      "data.DescriptorUniqId:p\n\023function_annota" +
+      "tion\022\'.org.jetbrains.kotlin.metadata.Fun" +
+      "ction\030\252\001 \003(\0132).org.jetbrains.kotlin.meta" +
+      "data.Annotation:E\n\rfunction_file\022\'.org.j" +
+      "etbrains.kotlin.metadata.Function\030\254\001 \001(\005" +
+      "B\004\200\265\030\001:{\n\020function_uniq_id\022\'.org.jetbrai" +
+      "ns.kotlin.metadata.Function\030\255\001 \001(\01327.org" +
+      ".jetbrains.kotlin.library.metadata.Descr" +
+      "iptorUniqId:p\n\023property_annotation\022\'.org" +
+      ".jetbrains.kotlin.metadata.Property\030\252\001 \003",
+      "(\0132).org.jetbrains.kotlin.metadata.Annot" +
+      "ation:w\n\032property_getter_annotation\022\'.or" +
+      "g.jetbrains.kotlin.metadata.Property\030\261\001 " +
+      "\003(\0132).org.jetbrains.kotlin.metadata.Anno" +
+      "tation:w\n\032property_setter_annotation\022\'.o" +
+      "rg.jetbrains.kotlin.metadata.Property\030\262\001" +
+      " \003(\0132).org.jetbrains.kotlin.metadata.Ann" +
+      "otation:~\n\022compile_time_value\022\'.org.jetb" +
+      "rains.kotlin.metadata.Property\030\255\001 \001(\01328." +
+      "org.jetbrains.kotlin.metadata.Annotation",
+      ".Argument.Value:E\n\rproperty_file\022\'.org.j" +
+      "etbrains.kotlin.metadata.Property\030\260\001 \001(\005" +
+      "B\004\200\265\030\001:{\n\020property_uniq_id\022\'.org.jetbrai" +
+      "ns.kotlin.metadata.Property\030\263\001 \001(\01327.org" +
+      ".jetbrains.kotlin.library.metadata.Descr" +
+      "iptorUniqId:s\n\025enum_entry_annotation\022(.o" +
+      "rg.jetbrains.kotlin.metadata.EnumEntry\030\252" +
+      "\001 \003(\0132).org.jetbrains.kotlin.metadata.An" +
+      "notation:E\n\022enum_entry_ordinal\022(.org.jet" +
+      "brains.kotlin.metadata.EnumEntry\030\253\001 \001(\005:",
+      "~\n\022enum_entry_uniq_id\022(.org.jetbrains.ko" +
+      "tlin.metadata.EnumEntry\030\254\001 \001(\01327.org.jet" +
+      "brains.kotlin.library.metadata.Descripto" +
+      "rUniqId:w\n\024parameter_annotation\022-.org.je" +
+      "tbrains.kotlin.metadata.ValueParameter\030\252" +
+      "\001 \003(\0132).org.jetbrains.kotlin.metadata.An" +
+      "notation:h\n\017type_annotation\022#.org.jetbra" +
+      "ins.kotlin.metadata.Type\030\252\001 \003(\0132).org.je" +
+      "tbrains.kotlin.metadata.Annotation:{\n\031ty" +
+      "pe_parameter_annotation\022,.org.jetbrains.",
+      "kotlin.metadata.TypeParameter\030\252\001 \003(\0132).o" +
+      "rg.jetbrains.kotlin.metadata.Annotation:" +
+      "\202\001\n\022type_param_uniq_id\022,.org.jetbrains.k" +
+      "otlin.metadata.TypeParameter\030\253\001 \001(\01327.or" +
+      "g.jetbrains.kotlin.library.metadata.Desc" +
+      "riptorUniqId:U\n\026package_fragment_files\022." +
+      ".org.jetbrains.kotlin.metadata.PackageFr" +
+      "agment\030\252\001 \003(\005B\004\200\265\030\001:A\n\010is_empty\022..org.je" +
+      "tbrains.kotlin.metadata.PackageFragment\030" +
+      "\254\001 \001(\010:@\n\007fq_name\022..org.jetbrains.kotlin",
+      ".metadata.PackageFragment\030\255\001 \001(\t:G\n\nclas" +
+      "s_name\022..org.jetbrains.kotlin.metadata.P" +
+      "ackageFragment\030\256\001 \003(\005B\002\020\001:~\n\022type_alias_" +
+      "uniq_id\022(.org.jetbrains.kotlin.metadata." +
+      "TypeAlias\030\203\001 \001(\01327.org.jetbrains.kotlin." +
+      "library.metadata.DescriptorUniqIdB\033B\031Deb" +
+      "ugKlibMetadataProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -3637,34 +3582,30 @@ public final class DebugKlibMetadataProtoBuf {
     packageFqName.internalInit(descriptor.getExtensions().get(0));
     classAnnotation.internalInit(descriptor.getExtensions().get(1));
     classFile.internalInit(descriptor.getExtensions().get(2));
-    classKdoc.internalInit(descriptor.getExtensions().get(3));
-    classUniqId.internalInit(descriptor.getExtensions().get(4));
-    constructorAnnotation.internalInit(descriptor.getExtensions().get(5));
-    constructorKdoc.internalInit(descriptor.getExtensions().get(6));
-    constructorUniqId.internalInit(descriptor.getExtensions().get(7));
-    functionAnnotation.internalInit(descriptor.getExtensions().get(8));
-    functionFile.internalInit(descriptor.getExtensions().get(9));
-    functionKdoc.internalInit(descriptor.getExtensions().get(10));
-    functionUniqId.internalInit(descriptor.getExtensions().get(11));
-    propertyAnnotation.internalInit(descriptor.getExtensions().get(12));
-    propertyGetterAnnotation.internalInit(descriptor.getExtensions().get(13));
-    propertySetterAnnotation.internalInit(descriptor.getExtensions().get(14));
-    compileTimeValue.internalInit(descriptor.getExtensions().get(15));
-    propertyFile.internalInit(descriptor.getExtensions().get(16));
-    propertyKdoc.internalInit(descriptor.getExtensions().get(17));
-    propertyUniqId.internalInit(descriptor.getExtensions().get(18));
-    enumEntryAnnotation.internalInit(descriptor.getExtensions().get(19));
-    enumEntryOrdinal.internalInit(descriptor.getExtensions().get(20));
-    enumEntryUniqId.internalInit(descriptor.getExtensions().get(21));
-    parameterAnnotation.internalInit(descriptor.getExtensions().get(22));
-    typeAnnotation.internalInit(descriptor.getExtensions().get(23));
-    typeParameterAnnotation.internalInit(descriptor.getExtensions().get(24));
-    typeParamUniqId.internalInit(descriptor.getExtensions().get(25));
-    packageFragmentFiles.internalInit(descriptor.getExtensions().get(26));
-    isEmpty.internalInit(descriptor.getExtensions().get(27));
-    fqName.internalInit(descriptor.getExtensions().get(28));
-    className.internalInit(descriptor.getExtensions().get(29));
-    typeAliasUniqId.internalInit(descriptor.getExtensions().get(30));
+    classUniqId.internalInit(descriptor.getExtensions().get(3));
+    constructorAnnotation.internalInit(descriptor.getExtensions().get(4));
+    constructorUniqId.internalInit(descriptor.getExtensions().get(5));
+    functionAnnotation.internalInit(descriptor.getExtensions().get(6));
+    functionFile.internalInit(descriptor.getExtensions().get(7));
+    functionUniqId.internalInit(descriptor.getExtensions().get(8));
+    propertyAnnotation.internalInit(descriptor.getExtensions().get(9));
+    propertyGetterAnnotation.internalInit(descriptor.getExtensions().get(10));
+    propertySetterAnnotation.internalInit(descriptor.getExtensions().get(11));
+    compileTimeValue.internalInit(descriptor.getExtensions().get(12));
+    propertyFile.internalInit(descriptor.getExtensions().get(13));
+    propertyUniqId.internalInit(descriptor.getExtensions().get(14));
+    enumEntryAnnotation.internalInit(descriptor.getExtensions().get(15));
+    enumEntryOrdinal.internalInit(descriptor.getExtensions().get(16));
+    enumEntryUniqId.internalInit(descriptor.getExtensions().get(17));
+    parameterAnnotation.internalInit(descriptor.getExtensions().get(18));
+    typeAnnotation.internalInit(descriptor.getExtensions().get(19));
+    typeParameterAnnotation.internalInit(descriptor.getExtensions().get(20));
+    typeParamUniqId.internalInit(descriptor.getExtensions().get(21));
+    packageFragmentFiles.internalInit(descriptor.getExtensions().get(22));
+    isEmpty.internalInit(descriptor.getExtensions().get(23));
+    fqName.internalInit(descriptor.getExtensions().get(24));
+    className.internalInit(descriptor.getExtensions().get(25));
+    typeAliasUniqId.internalInit(descriptor.getExtensions().get(26));
     org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
         org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
     registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipMessageInComparison);
@@ -3672,10 +3613,6 @@ public final class DebugKlibMetadataProtoBuf {
     registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
     registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
     registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
-    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
-    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
-    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
-    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison);
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
         .internalUpdateFileDescriptor(descriptor, registry);
     org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor();

build-common/test/org/jetbrains/kotlin/metadata/DebugProtoBuf.java

@@ -10347,37 +10347,6 @@ public final class DebugProtoBuf {
      */
     int getSealedSubclassFqName(int index);
 
-    /**
-     * <code>optional int32 inline_class_underlying_property_name = 17;</code>
-     */
-    boolean hasInlineClassUnderlyingPropertyName();
-    /**
-     * <code>optional int32 inline_class_underlying_property_name = 17;</code>
-     */
-    int getInlineClassUnderlyingPropertyName();
-
-    /**
-     * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-     */
-    boolean hasInlineClassUnderlyingType();
-    /**
-     * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-     */
-    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getInlineClassUnderlyingType();
-    /**
-     * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-     */
-    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getInlineClassUnderlyingTypeOrBuilder();
-
-    /**
-     * <code>optional int32 inline_class_underlying_type_id = 19;</code>
-     */
-    boolean hasInlineClassUnderlyingTypeId();
-    /**
-     * <code>optional int32 inline_class_underlying_type_id = 19;</code>
-     */
-    int getInlineClassUnderlyingTypeId();
-
     /**
      * <code>optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;</code>
      */
@@ -10616,32 +10585,9 @@ public final class DebugProtoBuf {
               input.popLimit(limit);
               break;
             }
-            case 136: {
-              bitField0_ |= 0x00000008;
-              inlineClassUnderlyingPropertyName_ = input.readInt32();
-              break;
-            }
-            case 146: {
-              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000010) == 0x00000010)) {
-                subBuilder = inlineClassUnderlyingType_.toBuilder();
-              }
-              inlineClassUnderlyingType_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(inlineClassUnderlyingType_);
-                inlineClassUnderlyingType_ = subBuilder.buildPartial();
-              }
-              bitField0_ |= 0x00000010;
-              break;
-            }
-            case 152: {
-              bitField0_ |= 0x00000020;
-              inlineClassUnderlyingTypeId_ = input.readInt32();
-              break;
-            }
             case 242: {
               org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000040) == 0x00000040)) {
+              if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = typeTable_.toBuilder();
               }
               typeTable_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.PARSER, extensionRegistry);
@@ -10649,13 +10595,13 @@ public final class DebugProtoBuf {
                 subBuilder.mergeFrom(typeTable_);
                 typeTable_ = subBuilder.buildPartial();
               }
-              bitField0_ |= 0x00000040;
+              bitField0_ |= 0x00000008;
               break;
             }
             case 248: {
-              if (!((mutable_bitField0_ & 0x00020000) == 0x00020000)) {
+              if (!((mutable_bitField0_ & 0x00004000) == 0x00004000)) {
                 versionRequirement_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00020000;
+                mutable_bitField0_ |= 0x00004000;
               }
               versionRequirement_.add(input.readInt32());
               break;
@@ -10663,9 +10609,9 @@ public final class DebugProtoBuf {
             case 250: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00020000) == 0x00020000) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00004000) == 0x00004000) && input.getBytesUntilLimit() > 0) {
                 versionRequirement_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00020000;
+                mutable_bitField0_ |= 0x00004000;
               }
               while (input.getBytesUntilLimit() > 0) {
                 versionRequirement_.add(input.readInt32());
@@ -10675,7 +10621,7 @@ public final class DebugProtoBuf {
             }
             case 258: {
               org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000080) == 0x00000080)) {
+              if (((bitField0_ & 0x00000010) == 0x00000010)) {
                 subBuilder = versionRequirementTable_.toBuilder();
               }
               versionRequirementTable_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.PARSER, extensionRegistry);
@@ -10683,7 +10629,7 @@ public final class DebugProtoBuf {
                 subBuilder.mergeFrom(versionRequirementTable_);
                 versionRequirementTable_ = subBuilder.buildPartial();
               }
-              bitField0_ |= 0x00000080;
+              bitField0_ |= 0x00000010;
               break;
             }
           }
@@ -10724,7 +10670,7 @@ public final class DebugProtoBuf {
         if (((mutable_bitField0_ & 0x00001000) == 0x00001000)) {
           sealedSubclassFqName_ = java.util.Collections.unmodifiableList(sealedSubclassFqName_);
         }
-        if (((mutable_bitField0_ & 0x00020000) == 0x00020000)) {
+        if (((mutable_bitField0_ & 0x00004000) == 0x00004000)) {
           versionRequirement_ = java.util.Collections.unmodifiableList(versionRequirement_);
         }
         this.unknownFields = unknownFields.build();
@@ -11279,64 +11225,13 @@ public final class DebugProtoBuf {
     }
     private int sealedSubclassFqNameMemoizedSerializedSize = -1;
 
-    public static final int INLINE_CLASS_UNDERLYING_PROPERTY_NAME_FIELD_NUMBER = 17;
-    private int inlineClassUnderlyingPropertyName_;
-    /**
-     * <code>optional int32 inline_class_underlying_property_name = 17;</code>
-     */
-    public boolean hasInlineClassUnderlyingPropertyName() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    /**
-     * <code>optional int32 inline_class_underlying_property_name = 17;</code>
-     */
-    public int getInlineClassUnderlyingPropertyName() {
-      return inlineClassUnderlyingPropertyName_;
-    }
-
-    public static final int INLINE_CLASS_UNDERLYING_TYPE_FIELD_NUMBER = 18;
-    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type inlineClassUnderlyingType_;
-    /**
-     * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-     */
-    public boolean hasInlineClassUnderlyingType() {
-      return ((bitField0_ & 0x00000010) == 0x00000010);
-    }
-    /**
-     * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-     */
-    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getInlineClassUnderlyingType() {
-      return inlineClassUnderlyingType_;
-    }
-    /**
-     * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-     */
-    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getInlineClassUnderlyingTypeOrBuilder() {
-      return inlineClassUnderlyingType_;
-    }
-
-    public static final int INLINE_CLASS_UNDERLYING_TYPE_ID_FIELD_NUMBER = 19;
-    private int inlineClassUnderlyingTypeId_;
-    /**
-     * <code>optional int32 inline_class_underlying_type_id = 19;</code>
-     */
-    public boolean hasInlineClassUnderlyingTypeId() {
-      return ((bitField0_ & 0x00000020) == 0x00000020);
-    }
-    /**
-     * <code>optional int32 inline_class_underlying_type_id = 19;</code>
-     */
-    public int getInlineClassUnderlyingTypeId() {
-      return inlineClassUnderlyingTypeId_;
-    }
-
     public static final int TYPE_TABLE_FIELD_NUMBER = 30;
     private org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable typeTable_;
     /**
      * <code>optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;</code>
      */
     public boolean hasTypeTable() {
-      return ((bitField0_ & 0x00000040) == 0x00000040);
+      return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
      * <code>optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;</code>
@@ -11391,7 +11286,7 @@ public final class DebugProtoBuf {
      * <code>optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;</code>
      */
     public boolean hasVersionRequirementTable() {
-      return ((bitField0_ & 0x00000080) == 0x00000080);
+      return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
      * <code>optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;</code>
@@ -11420,9 +11315,6 @@ public final class DebugProtoBuf {
       typeAlias_ = java.util.Collections.emptyList();
       enumEntry_ = java.util.Collections.emptyList();
       sealedSubclassFqName_ = java.util.Collections.emptyList();
-      inlineClassUnderlyingPropertyName_ = 0;
-      inlineClassUnderlyingType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
-      inlineClassUnderlyingTypeId_ = 0;
       typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
       versionRequirement_ = java.util.Collections.emptyList();
       versionRequirementTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
@@ -11479,12 +11371,6 @@ public final class DebugProtoBuf {
           return false;
         }
       }
-      if (hasInlineClassUnderlyingType()) {
-        if (!getInlineClassUnderlyingType().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
       if (hasTypeTable()) {
         if (!getTypeTable().isInitialized()) {
           memoizedIsInitialized = 0;
@@ -11557,21 +11443,12 @@ public final class DebugProtoBuf {
         output.writeInt32NoTag(sealedSubclassFqName_.get(i));
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeInt32(17, inlineClassUnderlyingPropertyName_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeMessage(18, inlineClassUnderlyingType_);
-      }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        output.writeInt32(19, inlineClassUnderlyingTypeId_);
-      }
-      if (((bitField0_ & 0x00000040) == 0x00000040)) {
         output.writeMessage(30, typeTable_);
       }
       for (int i = 0; i < versionRequirement_.size(); i++) {
         output.writeInt32(31, versionRequirement_.get(i));
       }
-      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
         output.writeMessage(32, versionRequirementTable_);
       }
       extensionWriter.writeUntil(19000, output);
@@ -11667,18 +11544,6 @@ public final class DebugProtoBuf {
         sealedSubclassFqNameMemoizedSerializedSize = dataSize;
       }
       if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-          .computeInt32Size(17, inlineClassUnderlyingPropertyName_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-          .computeMessageSize(18, inlineClassUnderlyingType_);
-      }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-          .computeInt32Size(19, inlineClassUnderlyingTypeId_);
-      }
-      if (((bitField0_ & 0x00000040) == 0x00000040)) {
         size += org.jetbrains.kotlin.protobuf.CodedOutputStream
           .computeMessageSize(30, typeTable_);
       }
@@ -11691,7 +11556,7 @@ public final class DebugProtoBuf {
         size += dataSize;
         size += 2 * getVersionRequirementList().size();
       }
-      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+      if (((bitField0_ & 0x00000010) == 0x00000010)) {
         size += org.jetbrains.kotlin.protobuf.CodedOutputStream
           .computeMessageSize(32, versionRequirementTable_);
       }
@@ -11813,7 +11678,6 @@ public final class DebugProtoBuf {
           getPropertyFieldBuilder();
           getTypeAliasFieldBuilder();
           getEnumEntryFieldBuilder();
-          getInlineClassUnderlyingTypeFieldBuilder();
           getTypeTableFieldBuilder();
           getVersionRequirementTableFieldBuilder();
         }
@@ -11878,30 +11742,20 @@ public final class DebugProtoBuf {
         }
         sealedSubclassFqName_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00001000);
-        inlineClassUnderlyingPropertyName_ = 0;
-        bitField0_ = (bitField0_ & ~0x00002000);
-        if (inlineClassUnderlyingTypeBuilder_ == null) {
-          inlineClassUnderlyingType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
-        } else {
-          inlineClassUnderlyingTypeBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00004000);
-        inlineClassUnderlyingTypeId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00008000);
         if (typeTableBuilder_ == null) {
           typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
         } else {
           typeTableBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00010000);
+        bitField0_ = (bitField0_ & ~0x00002000);
         versionRequirement_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00020000);
+        bitField0_ = (bitField0_ & ~0x00004000);
         if (versionRequirementTableBuilder_ == null) {
           versionRequirementTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
         } else {
           versionRequirementTableBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00040000);
+        bitField0_ = (bitField0_ & ~0x00008000);
         return this;
       }
 
@@ -12023,34 +11877,18 @@ public final class DebugProtoBuf {
         if (((from_bitField0_ & 0x00002000) == 0x00002000)) {
           to_bitField0_ |= 0x00000008;
         }
-        result.inlineClassUnderlyingPropertyName_ = inlineClassUnderlyingPropertyName_;
-        if (((from_bitField0_ & 0x00004000) == 0x00004000)) {
-          to_bitField0_ |= 0x00000010;
-        }
-        if (inlineClassUnderlyingTypeBuilder_ == null) {
-          result.inlineClassUnderlyingType_ = inlineClassUnderlyingType_;
-        } else {
-          result.inlineClassUnderlyingType_ = inlineClassUnderlyingTypeBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00008000) == 0x00008000)) {
-          to_bitField0_ |= 0x00000020;
-        }
-        result.inlineClassUnderlyingTypeId_ = inlineClassUnderlyingTypeId_;
-        if (((from_bitField0_ & 0x00010000) == 0x00010000)) {
-          to_bitField0_ |= 0x00000040;
-        }
         if (typeTableBuilder_ == null) {
           result.typeTable_ = typeTable_;
         } else {
           result.typeTable_ = typeTableBuilder_.build();
         }
-        if (((bitField0_ & 0x00020000) == 0x00020000)) {
+        if (((bitField0_ & 0x00004000) == 0x00004000)) {
           versionRequirement_ = java.util.Collections.unmodifiableList(versionRequirement_);
-          bitField0_ = (bitField0_ & ~0x00020000);
+          bitField0_ = (bitField0_ & ~0x00004000);
         }
         result.versionRequirement_ = versionRequirement_;
-        if (((from_bitField0_ & 0x00040000) == 0x00040000)) {
-          to_bitField0_ |= 0x00000080;
+        if (((from_bitField0_ & 0x00008000) == 0x00008000)) {
+          to_bitField0_ |= 0x00000010;
         }
         if (versionRequirementTableBuilder_ == null) {
           result.versionRequirementTable_ = versionRequirementTable_;
@@ -12294,22 +12132,13 @@ public final class DebugProtoBuf {
           }
           onChanged();
         }
-        if (other.hasInlineClassUnderlyingPropertyName()) {
-          setInlineClassUnderlyingPropertyName(other.getInlineClassUnderlyingPropertyName());
-        }
-        if (other.hasInlineClassUnderlyingType()) {
-          mergeInlineClassUnderlyingType(other.getInlineClassUnderlyingType());
-        }
-        if (other.hasInlineClassUnderlyingTypeId()) {
-          setInlineClassUnderlyingTypeId(other.getInlineClassUnderlyingTypeId());
-        }
         if (other.hasTypeTable()) {
           mergeTypeTable(other.getTypeTable());
         }
         if (!other.versionRequirement_.isEmpty()) {
           if (versionRequirement_.isEmpty()) {
             versionRequirement_ = other.versionRequirement_;
-            bitField0_ = (bitField0_ & ~0x00020000);
+            bitField0_ = (bitField0_ & ~0x00004000);
           } else {
             ensureVersionRequirementIsMutable();
             versionRequirement_.addAll(other.versionRequirement_);
@@ -12371,12 +12200,6 @@ public final class DebugProtoBuf {
             return false;
           }
         }
-        if (hasInlineClassUnderlyingType()) {
-          if (!getInlineClassUnderlyingType().isInitialized()) {
-            
-            return false;
-          }
-        }
         if (hasTypeTable()) {
           if (!getTypeTable().isInitialized()) {
             
@@ -14435,186 +14258,6 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private int inlineClassUnderlyingPropertyName_ ;
-      /**
-       * <code>optional int32 inline_class_underlying_property_name = 17;</code>
-       */
-      public boolean hasInlineClassUnderlyingPropertyName() {
-        return ((bitField0_ & 0x00002000) == 0x00002000);
-      }
-      /**
-       * <code>optional int32 inline_class_underlying_property_name = 17;</code>
-       */
-      public int getInlineClassUnderlyingPropertyName() {
-        return inlineClassUnderlyingPropertyName_;
-      }
-      /**
-       * <code>optional int32 inline_class_underlying_property_name = 17;</code>
-       */
-      public Builder setInlineClassUnderlyingPropertyName(int value) {
-        bitField0_ |= 0x00002000;
-        inlineClassUnderlyingPropertyName_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional int32 inline_class_underlying_property_name = 17;</code>
-       */
-      public Builder clearInlineClassUnderlyingPropertyName() {
-        bitField0_ = (bitField0_ & ~0x00002000);
-        inlineClassUnderlyingPropertyName_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type inlineClassUnderlyingType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
-      private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> inlineClassUnderlyingTypeBuilder_;
-      /**
-       * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-       */
-      public boolean hasInlineClassUnderlyingType() {
-        return ((bitField0_ & 0x00004000) == 0x00004000);
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-       */
-      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getInlineClassUnderlyingType() {
-        if (inlineClassUnderlyingTypeBuilder_ == null) {
-          return inlineClassUnderlyingType_;
-        } else {
-          return inlineClassUnderlyingTypeBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-       */
-      public Builder setInlineClassUnderlyingType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
-        if (inlineClassUnderlyingTypeBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          inlineClassUnderlyingType_ = value;
-          onChanged();
-        } else {
-          inlineClassUnderlyingTypeBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00004000;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-       */
-      public Builder setInlineClassUnderlyingType(
-          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
-        if (inlineClassUnderlyingTypeBuilder_ == null) {
-          inlineClassUnderlyingType_ = builderForValue.build();
-          onChanged();
-        } else {
-          inlineClassUnderlyingTypeBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00004000;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-       */
-      public Builder mergeInlineClassUnderlyingType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
-        if (inlineClassUnderlyingTypeBuilder_ == null) {
-          if (((bitField0_ & 0x00004000) == 0x00004000) &&
-              inlineClassUnderlyingType_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
-            inlineClassUnderlyingType_ =
-              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(inlineClassUnderlyingType_).mergeFrom(value).buildPartial();
-          } else {
-            inlineClassUnderlyingType_ = value;
-          }
-          onChanged();
-        } else {
-          inlineClassUnderlyingTypeBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00004000;
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-       */
-      public Builder clearInlineClassUnderlyingType() {
-        if (inlineClassUnderlyingTypeBuilder_ == null) {
-          inlineClassUnderlyingType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
-          onChanged();
-        } else {
-          inlineClassUnderlyingTypeBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00004000);
-        return this;
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-       */
-      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getInlineClassUnderlyingTypeBuilder() {
-        bitField0_ |= 0x00004000;
-        onChanged();
-        return getInlineClassUnderlyingTypeFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-       */
-      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getInlineClassUnderlyingTypeOrBuilder() {
-        if (inlineClassUnderlyingTypeBuilder_ != null) {
-          return inlineClassUnderlyingTypeBuilder_.getMessageOrBuilder();
-        } else {
-          return inlineClassUnderlyingType_;
-        }
-      }
-      /**
-       * <code>optional .org.jetbrains.kotlin.metadata.Type inline_class_underlying_type = 18;</code>
-       */
-      private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
-          getInlineClassUnderlyingTypeFieldBuilder() {
-        if (inlineClassUnderlyingTypeBuilder_ == null) {
-          inlineClassUnderlyingTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
-                  getInlineClassUnderlyingType(),
-                  getParentForChildren(),
-                  isClean());
-          inlineClassUnderlyingType_ = null;
-        }
-        return inlineClassUnderlyingTypeBuilder_;
-      }
-
-      private int inlineClassUnderlyingTypeId_ ;
-      /**
-       * <code>optional int32 inline_class_underlying_type_id = 19;</code>
-       */
-      public boolean hasInlineClassUnderlyingTypeId() {
-        return ((bitField0_ & 0x00008000) == 0x00008000);
-      }
-      /**
-       * <code>optional int32 inline_class_underlying_type_id = 19;</code>
-       */
-      public int getInlineClassUnderlyingTypeId() {
-        return inlineClassUnderlyingTypeId_;
-      }
-      /**
-       * <code>optional int32 inline_class_underlying_type_id = 19;</code>
-       */
-      public Builder setInlineClassUnderlyingTypeId(int value) {
-        bitField0_ |= 0x00008000;
-        inlineClassUnderlyingTypeId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional int32 inline_class_underlying_type_id = 19;</code>
-       */
-      public Builder clearInlineClassUnderlyingTypeId() {
-        bitField0_ = (bitField0_ & ~0x00008000);
-        inlineClassUnderlyingTypeId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
           org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder> typeTableBuilder_;
@@ -14622,7 +14265,7 @@ public final class DebugProtoBuf {
        * <code>optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;</code>
        */
       public boolean hasTypeTable() {
-        return ((bitField0_ & 0x00010000) == 0x00010000);
+        return ((bitField0_ & 0x00002000) == 0x00002000);
       }
       /**
        * <code>optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;</code>
@@ -14647,7 +14290,7 @@ public final class DebugProtoBuf {
         } else {
           typeTableBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00010000;
+        bitField0_ |= 0x00002000;
         return this;
       }
       /**
@@ -14661,7 +14304,7 @@ public final class DebugProtoBuf {
         } else {
           typeTableBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00010000;
+        bitField0_ |= 0x00002000;
         return this;
       }
       /**
@@ -14669,7 +14312,7 @@ public final class DebugProtoBuf {
        */
       public Builder mergeTypeTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable value) {
         if (typeTableBuilder_ == null) {
-          if (((bitField0_ & 0x00010000) == 0x00010000) &&
+          if (((bitField0_ & 0x00002000) == 0x00002000) &&
               typeTable_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance()) {
             typeTable_ =
               org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
@@ -14680,7 +14323,7 @@ public final class DebugProtoBuf {
         } else {
           typeTableBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00010000;
+        bitField0_ |= 0x00002000;
         return this;
       }
       /**
@@ -14693,14 +14336,14 @@ public final class DebugProtoBuf {
         } else {
           typeTableBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00010000);
+        bitField0_ = (bitField0_ & ~0x00002000);
         return this;
       }
       /**
        * <code>optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;</code>
        */
       public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder getTypeTableBuilder() {
-        bitField0_ |= 0x00010000;
+        bitField0_ |= 0x00002000;
         onChanged();
         return getTypeTableFieldBuilder().getBuilder();
       }
@@ -14733,9 +14376,9 @@ public final class DebugProtoBuf {
 
       private java.util.List<java.lang.Integer> versionRequirement_ = java.util.Collections.emptyList();
       private void ensureVersionRequirementIsMutable() {
-        if (!((bitField0_ & 0x00020000) == 0x00020000)) {
+        if (!((bitField0_ & 0x00004000) == 0x00004000)) {
           versionRequirement_ = new java.util.ArrayList<java.lang.Integer>(versionRequirement_);
-          bitField0_ |= 0x00020000;
+          bitField0_ |= 0x00004000;
          }
       }
       /**
@@ -14820,7 +14463,7 @@ public final class DebugProtoBuf {
        */
       public Builder clearVersionRequirement() {
         versionRequirement_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00020000);
+        bitField0_ = (bitField0_ & ~0x00004000);
         onChanged();
         return this;
       }
@@ -14832,7 +14475,7 @@ public final class DebugProtoBuf {
        * <code>optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;</code>
        */
       public boolean hasVersionRequirementTable() {
-        return ((bitField0_ & 0x00040000) == 0x00040000);
+        return ((bitField0_ & 0x00008000) == 0x00008000);
       }
       /**
        * <code>optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;</code>
@@ -14857,7 +14500,7 @@ public final class DebugProtoBuf {
         } else {
           versionRequirementTableBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00040000;
+        bitField0_ |= 0x00008000;
         return this;
       }
       /**
@@ -14871,7 +14514,7 @@ public final class DebugProtoBuf {
         } else {
           versionRequirementTableBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00040000;
+        bitField0_ |= 0x00008000;
         return this;
       }
       /**
@@ -14879,7 +14522,7 @@ public final class DebugProtoBuf {
        */
       public Builder mergeVersionRequirementTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable value) {
         if (versionRequirementTableBuilder_ == null) {
-          if (((bitField0_ & 0x00040000) == 0x00040000) &&
+          if (((bitField0_ & 0x00008000) == 0x00008000) &&
               versionRequirementTable_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance()) {
             versionRequirementTable_ =
               org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.newBuilder(versionRequirementTable_).mergeFrom(value).buildPartial();
@@ -14890,7 +14533,7 @@ public final class DebugProtoBuf {
         } else {
           versionRequirementTableBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00040000;
+        bitField0_ |= 0x00008000;
         return this;
       }
       /**
@@ -14903,14 +14546,14 @@ public final class DebugProtoBuf {
         } else {
           versionRequirementTableBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00040000);
+        bitField0_ = (bitField0_ & ~0x00008000);
         return this;
       }
       /**
        * <code>optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;</code>
        */
       public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder getVersionRequirementTableBuilder() {
-        bitField0_ |= 0x00040000;
+        bitField0_ |= 0x00008000;
         onChanged();
         return getVersionRequirementTableFieldBuilder().getBuilder();
       }
@@ -34739,7 +34382,7 @@ public final class DebugProtoBuf {
       "Variance:\003INV\0228\n\013upper_bound\030\005 \003(\0132#.org" +
       ".jetbrains.kotlin.metadata.Type\022\036\n\016upper" +
       "_bound_id\030\006 \003(\005B\006\020\001\240\265\030\001\"$\n\010Variance\022\006\n\002I" +
-      "N\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002*\005\010d\020\350\007\"\327\010\n\005Class\022\020" +
+      "N\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002*\005\010d\020\350\007\"\250\007\n\005Class\022\020" +
       "\n\005flags\030\001 \001(\005:\0016\022\025\n\007fq_name\030\003 \002(\005B\004\220\265\030\001\022",
       "#\n\025companion_object_name\030\004 \001(\005B\004\210\265\030\001\022D\n\016" +
       "type_parameter\030\005 \003(\0132,.org.jetbrains.kot" +
@@ -34755,127 +34398,122 @@ public final class DebugProtoBuf {
       "brains.kotlin.metadata.TypeAlias\022<\n\nenum" +
       "_entry\030\r \003(\0132(.org.jetbrains.kotlin.meta" +
       "data.EnumEntry\022\'\n\027sealed_subclass_fq_nam" +
-      "e\030\020 \003(\005B\006\020\001\220\265\030\001\0223\n%inline_class_underlyi" +
-      "ng_property_name\030\021 \001(\005B\004\210\265\030\001\022I\n\034inline_c" +
-      "lass_underlying_type\030\022 \001(\0132#.org.jetbrai" +
-      "ns.kotlin.metadata.Type\022-\n\037inline_class_" +
-      "underlying_type_id\030\023 \001(\005B\004\240\265\030\001\022<\n\ntype_t" +
-      "able\030\036 \001(\0132(.org.jetbrains.kotlin.metada",
-      "ta.TypeTable\022\033\n\023version_requirement\030\037 \003(" +
-      "\005\022Y\n\031version_requirement_table\030  \001(\01326.o" +
-      "rg.jetbrains.kotlin.metadata.VersionRequ" +
-      "irementTable\"x\n\004Kind\022\t\n\005CLASS\020\000\022\r\n\tINTER" +
-      "FACE\020\001\022\016\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024" +
-      "\n\020ANNOTATION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\024\n\020COMP" +
-      "ANION_OBJECT\020\006*\006\010d\020\270\224\001\"\335\002\n\007Package\0229\n\010fu" +
-      "nction\030\003 \003(\0132\'.org.jetbrains.kotlin.meta" +
-      "data.Function\0229\n\010property\030\004 \003(\0132\'.org.je" +
-      "tbrains.kotlin.metadata.Property\022<\n\ntype",
-      "_alias\030\005 \003(\0132(.org.jetbrains.kotlin.meta" +
-      "data.TypeAlias\022<\n\ntype_table\030\036 \001(\0132(.org" +
-      ".jetbrains.kotlin.metadata.TypeTable\022Y\n\031" +
-      "version_requirement_table\030  \001(\01326.org.je" +
-      "tbrains.kotlin.metadata.VersionRequireme" +
-      "ntTable*\005\010d\020\310\001\"`\n\tTypeTable\0221\n\004type\030\001 \003(" +
-      "\0132#.org.jetbrains.kotlin.metadata.Type\022\032" +
-      "\n\016first_nullable\030\002 \001(\005:\002-1:\004\240\273\030\001\"\214\001\n\013Con" +
-      "structor\022\020\n\005flags\030\001 \001(\005:\0016\022F\n\017value_para" +
-      "meter\030\002 \003(\0132-.org.jetbrains.kotlin.metad",
-      "ata.ValueParameter\022\033\n\023version_requiremen" +
-      "t\030\037 \003(\005*\006\010d\020\270\224\001\"\246\004\n\010Function\022\020\n\005flags\030\t " +
-      "\001(\005:\0016\022\024\n\told_flags\030\001 \001(\005:\0016\022\022\n\004name\030\002 \002" +
-      "(\005B\004\210\265\030\001\0228\n\013return_type\030\003 \001(\0132#.org.jetb" +
-      "rains.kotlin.metadata.Type\022\034\n\016return_typ" +
-      "e_id\030\007 \001(\005B\004\240\265\030\001\022D\n\016type_parameter\030\004 \003(\013" +
-      "2,.org.jetbrains.kotlin.metadata.TypePar" +
-      "ameter\022:\n\rreceiver_type\030\005 \001(\0132#.org.jetb" +
-      "rains.kotlin.metadata.Type\022\036\n\020receiver_t" +
-      "ype_id\030\010 \001(\005B\004\240\265\030\001\022F\n\017value_parameter\030\006 ",
-      "\003(\0132-.org.jetbrains.kotlin.metadata.Valu" +
-      "eParameter\022<\n\ntype_table\030\036 \001(\0132(.org.jet" +
-      "brains.kotlin.metadata.TypeTable\022\033\n\023vers" +
-      "ion_requirement\030\037 \003(\005\0229\n\010contract\030  \001(\0132" +
-      "\'.org.jetbrains.kotlin.metadata.Contract" +
-      "*\006\010d\020\270\224\001\"\345\003\n\010Property\022\022\n\005flags\030\013 \001(\005:\00351" +
-      "8\022\027\n\told_flags\030\001 \001(\005:\0042054\022\022\n\004name\030\002 \002(\005" +
-      "B\004\210\265\030\001\0228\n\013return_type\030\003 \001(\0132#.org.jetbra" +
-      "ins.kotlin.metadata.Type\022\034\n\016return_type_" +
-      "id\030\t \001(\005B\004\240\265\030\001\022D\n\016type_parameter\030\004 \003(\0132,",
-      ".org.jetbrains.kotlin.metadata.TypeParam" +
-      "eter\022:\n\rreceiver_type\030\005 \001(\0132#.org.jetbra" +
-      "ins.kotlin.metadata.Type\022\036\n\020receiver_typ" +
-      "e_id\030\n \001(\005B\004\240\265\030\001\022M\n\026setter_value_paramet" +
-      "er\030\006 \001(\0132-.org.jetbrains.kotlin.metadata" +
-      ".ValueParameter\022\024\n\014getter_flags\030\007 \001(\005\022\024\n" +
-      "\014setter_flags\030\010 \001(\005\022\033\n\023version_requireme" +
-      "nt\030\037 \003(\005*\006\010d\020\270\224\001\"\357\001\n\016ValueParameter\022\020\n\005f" +
-      "lags\030\001 \001(\005:\0010\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\0221\n\004typ" +
-      "e\030\003 \001(\0132#.org.jetbrains.kotlin.metadata.",
-      "Type\022\025\n\007type_id\030\005 \001(\005B\004\240\265\030\001\022@\n\023vararg_el" +
-      "ement_type\030\004 \001(\0132#.org.jetbrains.kotlin." +
-      "metadata.Type\022$\n\026vararg_element_type_id\030" +
-      "\006 \001(\005B\004\240\265\030\001*\005\010d\020\310\001\"\226\003\n\tTypeAlias\022\020\n\005flag" +
-      "s\030\001 \001(\005:\0016\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\022D\n\016type_p" +
-      "arameter\030\003 \003(\0132,.org.jetbrains.kotlin.me" +
-      "tadata.TypeParameter\022<\n\017underlying_type\030" +
-      "\004 \001(\0132#.org.jetbrains.kotlin.metadata.Ty" +
-      "pe\022 \n\022underlying_type_id\030\005 \001(\005B\004\240\265\030\001\022:\n\r" +
-      "expanded_type\030\006 \001(\0132#.org.jetbrains.kotl",
-      "in.metadata.Type\022\036\n\020expanded_type_id\030\007 \001" +
-      "(\005B\004\240\265\030\001\022=\n\nannotation\030\010 \003(\0132).org.jetbr" +
-      "ains.kotlin.metadata.Annotation\022\033\n\023versi" +
-      "on_requirement\030\037 \003(\005*\005\010d\020\310\001\"&\n\tEnumEntry" +
-      "\022\022\n\004name\030\001 \001(\005B\004\210\265\030\001*\005\010d\020\310\001\"\225\003\n\022VersionR" +
-      "equirement\022\017\n\007version\030\001 \001(\005\022\024\n\014version_f" +
-      "ull\030\002 \001(\005\022M\n\005level\030\003 \001(\01627.org.jetbrains" +
-      ".kotlin.metadata.VersionRequirement.Leve" +
-      "l:\005ERROR\022\022\n\nerror_code\030\004 \001(\005\022\025\n\007message\030" +
-      "\005 \001(\005B\004\230\265\030\001\022e\n\014version_kind\030\006 \001(\0162=.org.",
-      "jetbrains.kotlin.metadata.VersionRequire" +
-      "ment.VersionKind:\020LANGUAGE_VERSION\"+\n\005Le" +
-      "vel\022\013\n\007WARNING\020\000\022\t\n\005ERROR\020\001\022\n\n\006HIDDEN\020\002\"" +
-      "J\n\013VersionKind\022\024\n\020LANGUAGE_VERSION\020\000\022\024\n\020" +
-      "COMPILER_VERSION\020\001\022\017\n\013API_VERSION\020\002\"a\n\027V" +
-      "ersionRequirementTable\022F\n\013requirement\030\001 " +
-      "\003(\01321.org.jetbrains.kotlin.metadata.Vers" +
-      "ionRequirement\"\217\002\n\017PackageFragment\022;\n\007st" +
-      "rings\030\001 \001(\0132*.org.jetbrains.kotlin.metad" +
-      "ata.StringTable\022J\n\017qualified_names\030\002 \001(\013",
-      "21.org.jetbrains.kotlin.metadata.Qualifi" +
-      "edNameTable\0227\n\007package\030\003 \001(\0132&.org.jetbr" +
-      "ains.kotlin.metadata.Package\0223\n\005class\030\004 " +
-      "\003(\0132$.org.jetbrains.kotlin.metadata.Clas" +
-      "s*\005\010d\020\310\001\"A\n\010Contract\0225\n\006effect\030\001 \003(\0132%.o" +
-      "rg.jetbrains.kotlin.metadata.Effect\"\306\003\n\006" +
-      "Effect\022E\n\013effect_type\030\001 \001(\01620.org.jetbra" +
-      "ins.kotlin.metadata.Effect.EffectType\022N\n" +
-      "\033effect_constructor_argument\030\002 \003(\0132).org" +
-      ".jetbrains.kotlin.metadata.Expression\022S\n",
-      " conclusion_of_conditional_effect\030\003 \001(\0132" +
-      ").org.jetbrains.kotlin.metadata.Expressi" +
-      "on\022B\n\004kind\030\004 \001(\01624.org.jetbrains.kotlin." +
-      "metadata.Effect.InvocationKind\"C\n\nEffect" +
-      "Type\022\024\n\020RETURNS_CONSTANT\020\000\022\t\n\005CALLS\020\001\022\024\n" +
-      "\020RETURNS_NOT_NULL\020\002\"G\n\016InvocationKind\022\020\n" +
-      "\014AT_MOST_ONCE\020\000\022\020\n\014EXACTLY_ONCE\020\001\022\021\n\rAT_" +
-      "LEAST_ONCE\020\002\"\245\003\n\nExpression\022\020\n\005flags\030\001 \001" +
-      "(\005:\0010\022!\n\031value_parameter_reference\030\002 \001(\005" +
-      "\022O\n\016constant_value\030\003 \001(\01627.org.jetbrains",
-      ".kotlin.metadata.Expression.ConstantValu" +
-      "e\022=\n\020is_instance_type\030\004 \001(\0132#.org.jetbra" +
-      "ins.kotlin.metadata.Type\022!\n\023is_instance_" +
-      "type_id\030\005 \001(\005B\004\240\265\030\001\022?\n\014and_argument\030\006 \003(" +
-      "\0132).org.jetbrains.kotlin.metadata.Expres" +
-      "sion\022>\n\013or_argument\030\007 \003(\0132).org.jetbrain" +
-      "s.kotlin.metadata.Expression\".\n\rConstant" +
-      "Value\022\010\n\004TRUE\020\000\022\t\n\005FALSE\020\001\022\010\n\004NULL\020\002*9\n\010" +
-      "Modality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRAC" +
-      "T\020\002\022\n\n\006SEALED\020\003*b\n\nVisibility\022\014\n\010INTERNA",
-      "L\020\000\022\013\n\007PRIVATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLI" +
-      "C\020\003\022\023\n\017PRIVATE_TO_THIS\020\004\022\t\n\005LOCAL\020\005*Q\n\nM" +
-      "emberKind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_OVERR" +
-      "IDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED\020\003B\017" +
-      "B\rDebugProtoBuf"
+      "e\030\020 \003(\005B\006\020\001\220\265\030\001\022<\n\ntype_table\030\036 \001(\0132(.or" +
+      "g.jetbrains.kotlin.metadata.TypeTable\022\033\n" +
+      "\023version_requirement\030\037 \003(\005\022Y\n\031version_re" +
+      "quirement_table\030  \001(\01326.org.jetbrains.ko" +
+      "tlin.metadata.VersionRequirementTable\"x\n" +
+      "\004Kind\022\t\n\005CLASS\020\000\022\r\n\tINTERFACE\020\001\022\016\n\nENUM_",
+      "CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTATION_CL" +
+      "ASS\020\004\022\n\n\006OBJECT\020\005\022\024\n\020COMPANION_OBJECT\020\006*" +
+      "\006\010d\020\270\224\001\"\335\002\n\007Package\0229\n\010function\030\003 \003(\0132\'." +
+      "org.jetbrains.kotlin.metadata.Function\0229" +
+      "\n\010property\030\004 \003(\0132\'.org.jetbrains.kotlin." +
+      "metadata.Property\022<\n\ntype_alias\030\005 \003(\0132(." +
+      "org.jetbrains.kotlin.metadata.TypeAlias\022" +
+      "<\n\ntype_table\030\036 \001(\0132(.org.jetbrains.kotl" +
+      "in.metadata.TypeTable\022Y\n\031version_require" +
+      "ment_table\030  \001(\01326.org.jetbrains.kotlin.",
+      "metadata.VersionRequirementTable*\005\010d\020\310\001\"" +
+      "`\n\tTypeTable\0221\n\004type\030\001 \003(\0132#.org.jetbrai" +
+      "ns.kotlin.metadata.Type\022\032\n\016first_nullabl" +
+      "e\030\002 \001(\005:\002-1:\004\240\273\030\001\"\214\001\n\013Constructor\022\020\n\005fla" +
+      "gs\030\001 \001(\005:\0016\022F\n\017value_parameter\030\002 \003(\0132-.o" +
+      "rg.jetbrains.kotlin.metadata.ValueParame" +
+      "ter\022\033\n\023version_requirement\030\037 \003(\005*\006\010d\020\270\224\001" +
+      "\"\246\004\n\010Function\022\020\n\005flags\030\t \001(\005:\0016\022\024\n\told_f" +
+      "lags\030\001 \001(\005:\0016\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\0228\n\013ret" +
+      "urn_type\030\003 \001(\0132#.org.jetbrains.kotlin.me",
+      "tadata.Type\022\034\n\016return_type_id\030\007 \001(\005B\004\240\265\030" +
+      "\001\022D\n\016type_parameter\030\004 \003(\0132,.org.jetbrain" +
+      "s.kotlin.metadata.TypeParameter\022:\n\rrecei" +
+      "ver_type\030\005 \001(\0132#.org.jetbrains.kotlin.me" +
+      "tadata.Type\022\036\n\020receiver_type_id\030\010 \001(\005B\004\240" +
+      "\265\030\001\022F\n\017value_parameter\030\006 \003(\0132-.org.jetbr" +
+      "ains.kotlin.metadata.ValueParameter\022<\n\nt" +
+      "ype_table\030\036 \001(\0132(.org.jetbrains.kotlin.m" +
+      "etadata.TypeTable\022\033\n\023version_requirement" +
+      "\030\037 \003(\005\0229\n\010contract\030  \001(\0132\'.org.jetbrains",
+      ".kotlin.metadata.Contract*\006\010d\020\270\224\001\"\345\003\n\010Pr" +
+      "operty\022\022\n\005flags\030\013 \001(\005:\003518\022\027\n\told_flags\030" +
+      "\001 \001(\005:\0042054\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\0228\n\013retur" +
+      "n_type\030\003 \001(\0132#.org.jetbrains.kotlin.meta" +
+      "data.Type\022\034\n\016return_type_id\030\t \001(\005B\004\240\265\030\001\022" +
+      "D\n\016type_parameter\030\004 \003(\0132,.org.jetbrains." +
+      "kotlin.metadata.TypeParameter\022:\n\rreceive" +
+      "r_type\030\005 \001(\0132#.org.jetbrains.kotlin.meta" +
+      "data.Type\022\036\n\020receiver_type_id\030\n \001(\005B\004\240\265\030" +
+      "\001\022M\n\026setter_value_parameter\030\006 \001(\0132-.org.",
+      "jetbrains.kotlin.metadata.ValueParameter" +
+      "\022\024\n\014getter_flags\030\007 \001(\005\022\024\n\014setter_flags\030\010" +
+      " \001(\005\022\033\n\023version_requirement\030\037 \003(\005*\006\010d\020\270\224" +
+      "\001\"\357\001\n\016ValueParameter\022\020\n\005flags\030\001 \001(\005:\0010\022\022" +
+      "\n\004name\030\002 \002(\005B\004\210\265\030\001\0221\n\004type\030\003 \001(\0132#.org.j" +
+      "etbrains.kotlin.metadata.Type\022\025\n\007type_id" +
+      "\030\005 \001(\005B\004\240\265\030\001\022@\n\023vararg_element_type\030\004 \001(" +
+      "\0132#.org.jetbrains.kotlin.metadata.Type\022$" +
+      "\n\026vararg_element_type_id\030\006 \001(\005B\004\240\265\030\001*\005\010d" +
+      "\020\310\001\"\226\003\n\tTypeAlias\022\020\n\005flags\030\001 \001(\005:\0016\022\022\n\004n",
+      "ame\030\002 \002(\005B\004\210\265\030\001\022D\n\016type_parameter\030\003 \003(\0132" +
+      ",.org.jetbrains.kotlin.metadata.TypePara" +
+      "meter\022<\n\017underlying_type\030\004 \001(\0132#.org.jet" +
+      "brains.kotlin.metadata.Type\022 \n\022underlyin" +
+      "g_type_id\030\005 \001(\005B\004\240\265\030\001\022:\n\rexpanded_type\030\006" +
+      " \001(\0132#.org.jetbrains.kotlin.metadata.Typ" +
+      "e\022\036\n\020expanded_type_id\030\007 \001(\005B\004\240\265\030\001\022=\n\nann" +
+      "otation\030\010 \003(\0132).org.jetbrains.kotlin.met" +
+      "adata.Annotation\022\033\n\023version_requirement\030" +
+      "\037 \003(\005*\005\010d\020\310\001\"&\n\tEnumEntry\022\022\n\004name\030\001 \001(\005B",
+      "\004\210\265\030\001*\005\010d\020\310\001\"\225\003\n\022VersionRequirement\022\017\n\007v" +
+      "ersion\030\001 \001(\005\022\024\n\014version_full\030\002 \001(\005\022M\n\005le" +
+      "vel\030\003 \001(\01627.org.jetbrains.kotlin.metadat" +
+      "a.VersionRequirement.Level:\005ERROR\022\022\n\nerr" +
+      "or_code\030\004 \001(\005\022\025\n\007message\030\005 \001(\005B\004\230\265\030\001\022e\n\014" +
+      "version_kind\030\006 \001(\0162=.org.jetbrains.kotli" +
+      "n.metadata.VersionRequirement.VersionKin" +
+      "d:\020LANGUAGE_VERSION\"+\n\005Level\022\013\n\007WARNING\020" +
+      "\000\022\t\n\005ERROR\020\001\022\n\n\006HIDDEN\020\002\"J\n\013VersionKind\022" +
+      "\024\n\020LANGUAGE_VERSION\020\000\022\024\n\020COMPILER_VERSIO",
+      "N\020\001\022\017\n\013API_VERSION\020\002\"a\n\027VersionRequireme" +
+      "ntTable\022F\n\013requirement\030\001 \003(\01321.org.jetbr" +
+      "ains.kotlin.metadata.VersionRequirement\"" +
+      "\217\002\n\017PackageFragment\022;\n\007strings\030\001 \001(\0132*.o" +
+      "rg.jetbrains.kotlin.metadata.StringTable" +
+      "\022J\n\017qualified_names\030\002 \001(\01321.org.jetbrain" +
+      "s.kotlin.metadata.QualifiedNameTable\0227\n\007" +
+      "package\030\003 \001(\0132&.org.jetbrains.kotlin.met" +
+      "adata.Package\0223\n\005class\030\004 \003(\0132$.org.jetbr" +
+      "ains.kotlin.metadata.Class*\005\010d\020\310\001\"A\n\010Con",
+      "tract\0225\n\006effect\030\001 \003(\0132%.org.jetbrains.ko" +
+      "tlin.metadata.Effect\"\306\003\n\006Effect\022E\n\013effec" +
+      "t_type\030\001 \001(\01620.org.jetbrains.kotlin.meta" +
+      "data.Effect.EffectType\022N\n\033effect_constru" +
+      "ctor_argument\030\002 \003(\0132).org.jetbrains.kotl" +
+      "in.metadata.Expression\022S\n conclusion_of_" +
+      "conditional_effect\030\003 \001(\0132).org.jetbrains" +
+      ".kotlin.metadata.Expression\022B\n\004kind\030\004 \001(" +
+      "\01624.org.jetbrains.kotlin.metadata.Effect" +
+      ".InvocationKind\"C\n\nEffectType\022\024\n\020RETURNS",
+      "_CONSTANT\020\000\022\t\n\005CALLS\020\001\022\024\n\020RETURNS_NOT_NU" +
+      "LL\020\002\"G\n\016InvocationKind\022\020\n\014AT_MOST_ONCE\020\000" +
+      "\022\020\n\014EXACTLY_ONCE\020\001\022\021\n\rAT_LEAST_ONCE\020\002\"\245\003" +
+      "\n\nExpression\022\020\n\005flags\030\001 \001(\005:\0010\022!\n\031value_" +
+      "parameter_reference\030\002 \001(\005\022O\n\016constant_va" +
+      "lue\030\003 \001(\01627.org.jetbrains.kotlin.metadat" +
+      "a.Expression.ConstantValue\022=\n\020is_instanc" +
+      "e_type\030\004 \001(\0132#.org.jetbrains.kotlin.meta" +
+      "data.Type\022!\n\023is_instance_type_id\030\005 \001(\005B\004" +
+      "\240\265\030\001\022?\n\014and_argument\030\006 \003(\0132).org.jetbrai",
+      "ns.kotlin.metadata.Expression\022>\n\013or_argu" +
+      "ment\030\007 \003(\0132).org.jetbrains.kotlin.metada" +
+      "ta.Expression\".\n\rConstantValue\022\010\n\004TRUE\020\000" +
+      "\022\t\n\005FALSE\020\001\022\010\n\004NULL\020\002*9\n\010Modality\022\t\n\005FIN" +
+      "AL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020\002\022\n\n\006SEALED\020\003" +
+      "*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVATE\020" +
+      "\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVATE_" +
+      "TO_THIS\020\004\022\t\n\005LOCAL\020\005*Q\n\nMemberKind\022\017\n\013DE" +
+      "CLARATION\020\000\022\021\n\rFAKE_OVERRIDE\020\001\022\016\n\nDELEGA" +
+      "TION\020\002\022\017\n\013SYNTHESIZED\020\003B\017B\rDebugProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -34949,7 +34587,7 @@ public final class DebugProtoBuf {
     internal_static_org_jetbrains_kotlin_metadata_Class_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_org_jetbrains_kotlin_metadata_Class_descriptor,
-        new java.lang.String[] { "Flags", "FqName", "CompanionObjectName", "TypeParameter", "Supertype", "SupertypeId", "NestedClassName", "Constructor", "Function", "Property", "TypeAlias", "EnumEntry", "SealedSubclassFqName", "InlineClassUnderlyingPropertyName", "InlineClassUnderlyingType", "InlineClassUnderlyingTypeId", "TypeTable", "VersionRequirement", "VersionRequirementTable", });
+        new java.lang.String[] { "Flags", "FqName", "CompanionObjectName", "TypeParameter", "Supertype", "SupertypeId", "NestedClassName", "Constructor", "Function", "Property", "TypeAlias", "EnumEntry", "SealedSubclassFqName", "TypeTable", "VersionRequirement", "VersionRequirementTable", });
     internal_static_org_jetbrains_kotlin_metadata_Package_descriptor =
       getDescriptor().getMessageTypes().get(6);
     internal_static_org_jetbrains_kotlin_metadata_Package_fieldAccessorTable = new
@@ -35058,8 +34696,6 @@ public final class DebugProtoBuf {
     registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.typeIdInTable);
     registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
     registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.fqNameIdInTable);
-    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
-    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.typeIdInTable);
     registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipMessageInComparison);
     registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
     registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.typeIdInTable);

build.gradle.kts

@@ -7,7 +7,7 @@ import proguard.gradle.ProGuardTask
 buildscript {
     val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
 
-    kotlinBootstrapFrom(BootstrapOption.SpaceBootstrap(kotlinBuildProperties.kotlinBootstrapVersion!!, cacheRedirectorEnabled))
+    kotlinBootstrapFrom(BootstrapOption.BintrayBootstrap(kotlinBuildProperties.kotlinBootstrapVersion!!, cacheRedirectorEnabled))
 
     repositories {
         bootstrapKotlinRepo?.let(::maven)
@@ -27,11 +27,9 @@ buildscript {
     dependencies {
         bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion))
 
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.26")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.19")
         classpath(kotlin("gradle-plugin", bootstrapKotlinVersion))
-        classpath(kotlin("serialization", bootstrapKotlinVersion))
         classpath("org.jetbrains.dokka:dokka-gradle-plugin:0.9.17")
-        classpath("org.jfrog.buildinfo:build-info-extractor-gradle:4.17.2")
     }
 }
 
@@ -52,6 +50,7 @@ pill {
     excludedDirs(
         "out",
         "buildSrc/build",
+        "buildSrc/prepare-deps/android-dx/build",
         "buildSrc/prepare-deps/intellij-sdk/build"
     )
 }
@@ -73,7 +72,7 @@ val kotlinVersion by extra(
         } ?: buildNumber
 )
 
-val kotlinLanguageVersion by extra("1.5")
+val kotlinLanguageVersion by extra("1.4")
 
 allprojects {
     group = "org.jetbrains.kotlin"
@@ -115,10 +114,6 @@ extra["ideaUltimateSandboxDir"] = project.file(ideaUltimateSandboxDir)
 extra["ideaPluginDir"] = project.file(ideaPluginDir)
 extra["ideaUltimatePluginDir"] = project.file(ideaUltimatePluginDir)
 extra["isSonatypeRelease"] = false
-val kotlinNativeVersionObject = project.kotlinNativeVersionValue()
-subprojects {
-    extra["kotlinNativeVersion"] = kotlinNativeVersionObject
-}
 
 // Work-around necessary to avoid setting null javaHome. Will be removed after support of lazy task configuration
 val jdkNotFoundConst = "JDK NOT FOUND"
@@ -134,7 +129,6 @@ extra["JDK_18"] = jdkPath("1.8")
 extra["JDK_9"] = jdkPath("9")
 extra["JDK_10"] = jdkPath("10")
 extra["JDK_11"] = jdkPath("11")
-extra["JDK_15"] = jdkPath("15")
 
 // allow opening the project without setting up all env variables (see KT-26413)
 if (!kotlinBuildProperties.isInIdeaSync) {
@@ -159,7 +153,6 @@ rootProject.apply {
     from(rootProject.file("gradle/checkArtifacts.gradle.kts"))
     from(rootProject.file("gradle/checkCacheability.gradle.kts"))
     from(rootProject.file("gradle/retryPublishing.gradle.kts"))
-    from(rootProject.file("gradle/modularizedTestConfigurations.gradle.kts"))
 }
 
 IdeVersionConfigurator.setCurrentIde(project)
@@ -171,19 +164,21 @@ extra["versions.jansi"] = "1.16"
 extra["versions.jline"] = "3.3.1"
 extra["versions.junit"] = "4.12"
 extra["versions.javaslang"] = "2.0.6"
-extra["versions.ant"] = "1.10.7"
+extra["versions.ant"] = "1.8.2"
 extra["versions.android"] = "2.3.1"
-extra["versions.kotlinx-coroutines-core"] = "1.3.8"
-extra["versions.kotlinx-coroutines-jdk8"] = "1.3.8"
+val coroutinesVersion = if (Platform[192].orHigher()) "1.3.7" else "1.1.1"
+extra["versions.kotlinx-coroutines-core"] = coroutinesVersion
+extra["versions.kotlinx-coroutines-jdk8"] = coroutinesVersion
 extra["versions.json"] = "20160807"
 extra["versions.native-platform"] = "0.14"
+extra["versions.ant-launcher"] = "1.8.0"
 extra["versions.robolectric"] = "4.0"
 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"
-extra["versions.completion-ranking-kotlin"] = "0.1.3"
-extra["versions.r8"] = "2.1.96"
+extra["versions.completion-ranking-kotlin"] = "0.1.2"
+extra["versions.r8"] = "2.0.88"
 val immutablesVersion = "0.3.1"
 extra["versions.kotlinx-collections-immutable"] = immutablesVersion
 extra["versions.kotlinx-collections-immutable-jvm"] = immutablesVersion
@@ -192,14 +187,13 @@ extra["versions.kotlinx-collections-immutable-jvm"] = immutablesVersion
 extra["versions.ktor-network"] = "1.0.1"
 
 if (!project.hasProperty("versions.kotlin-native")) {
-    extra["versions.kotlin-native"] = "1.5.20-dev-5613"
+    extra["versions.kotlin-native"] = "1.4.20-release-124"
 }
 
 val intellijUltimateEnabled by extra(project.kotlinBuildProperties.intellijUltimateEnabled)
 val effectSystemEnabled by extra(project.getBooleanProperty("kotlin.compiler.effectSystemEnabled") ?: false)
 val newInferenceEnabled by extra(project.getBooleanProperty("kotlin.compiler.newInferenceEnabled") ?: false)
-val useJvmIrBackend by extra(project.kotlinBuildProperties.useIR)
-val useJvmFir by extra(project.kotlinBuildProperties.useFir)
+val useJvmIrBackend by extra(project.getBooleanProperty("kotlin.build.useIR") ?: false)
 
 val intellijSeparateSdks = project.getBooleanProperty("intellijSeparateSdks") ?: false
 
@@ -235,7 +229,6 @@ extra["compilerModules"] = arrayOf(
     ":compiler:frontend",
     ":compiler:frontend.common",
     ":compiler:frontend.java",
-    ":compiler:frontend:cfg",
     ":compiler:cli-common",
     ":compiler:ir.tree",
     ":compiler:ir.tree.impl",
@@ -243,7 +236,6 @@ extra["compilerModules"] = arrayOf(
     ":compiler:ir.psi2ir",
     ":compiler:ir.backend.common",
     ":compiler:backend.jvm",
-    ":compiler:backend.jvm:backend.jvm.entrypoint",
     ":compiler:backend.js",
     ":compiler:backend.wasm",
     ":compiler:ir.serialization.common",
@@ -275,11 +267,8 @@ extra["compilerModules"] = arrayOf(
     ":kotlin-build-common",
     ":core:metadata",
     ":core:metadata.jvm",
-    ":core:deserialization.common",
-    ":core:deserialization.common.jvm",
     ":core:compiler.common",
     ":core:compiler.common.jvm",
-    ":compiler:backend.common.jvm",
     ":core:descriptors",
     ":core:descriptors.jvm",
     ":core:descriptors.runtime",
@@ -299,9 +288,7 @@ extra["compilerModules"] = arrayOf(
     ":compiler:fir:jvm",
     ":compiler:fir:checkers",
     ":compiler:fir:entrypoint",
-    ":compiler:fir:analysis-tests",
-    ":compiler:fir:analysis-tests:legacy-fir-tests",
-    ":wasm:wasm.ir"
+    ":compiler:fir:analysis-tests"
 )
 
 extra["compilerModulesForJps"] = listOf(
@@ -327,24 +314,12 @@ extra["compilerModulesForJps"] = listOf(
     ":compiler:compiler.version"
 )
 
-// TODO: fix remaining warnings and remove this property.
-extra["tasksWithWarnings"] = listOf(
-    ":kotlin-stdlib:compileTestKotlin",
-    ":kotlin-stdlib-jdk7:compileTestKotlin",
-    ":kotlin-stdlib-jdk8:compileTestKotlin",
-    ":plugins:uast-kotlin:compileKotlin",
-    ":plugins:uast-kotlin:compileTestKotlin"
-)
-
-val tasksWithWarnings: List<String> by extra
-
 val coreLibProjects = listOfNotNull(
     ":kotlin-stdlib",
     ":kotlin-stdlib-common",
     ":kotlin-stdlib-js",
     ":kotlin-stdlib-jdk7",
     ":kotlin-stdlib-jdk8",
-    ":kotlin-test",
     ":kotlin-test:kotlin-test-annotations-common",
     ":kotlin-test:kotlin-test-common",
     ":kotlin-test:kotlin-test-jvm",
@@ -352,13 +327,8 @@ val coreLibProjects = listOfNotNull(
     ":kotlin-test:kotlin-test-junit5",
     ":kotlin-test:kotlin-test-testng",
     ":kotlin-test:kotlin-test-js".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
-    ":kotlin-reflect"
-)
-
-val projectsWithDisabledFirBootstrap = coreLibProjects + listOf(
-    ":kotlin-gradle-plugin",
-    ":kotlinx-metadata",
-    ":kotlinx-metadata-jvm"
+    ":kotlin-reflect",
+    ":kotlin-coroutines-experimental-compat"
 )
 
 val gradlePluginProjects = listOf(
@@ -368,8 +338,7 @@ val gradlePluginProjects = listOf(
     ":kotlin-annotation-processing-gradle",
     ":kotlin-noarg",
     ":kotlin-sam-with-receiver",
-    ":kotlin-parcelize-compiler",
-    ":kotlin-lombok"
+    ":kotlin-parcelize-compiler"
 )
 
 apply {
@@ -430,19 +399,15 @@ allprojects {
     repositories {
         kotlinBuildLocalRepo(project)
         mirrorRepo?.let(::maven)
-
-        internalBootstrapRepo?.let(::maven)
-        bootstrapKotlinRepo?.let(::maven)
-        maven(protobufRepo)
-
-        maven(intellijRepo)
-
-        mavenCentral()
-        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
-        maven("https://dl.google.com/dl/android/maven2")
-        maven("https://packages.jetbrains.team/maven/p/ij/intellij-dependencies")
-
         jcenter()
+        maven(protobufRepo)
+        maven(intellijRepo)
+        maven("https://dl.bintray.com/kotlin/ktor")
+        maven("https://kotlin.bintray.com/kotlin-dependencies")
+        maven("https://jetbrains.bintray.com/intellij-third-party-dependencies")
+        maven("https://dl.google.com/dl/android/maven2")
+        bootstrapKotlinRepo?.let(::maven)
+        internalBootstrapRepo?.let(::maven)
     }
 
     configureJvmProject(javaHome!!, jvmTarget!!)
@@ -475,26 +440,6 @@ allprojects {
             if (useJvmIrBackend) {
                 useIR = true
             }
-
-            if (useJvmFir && this@allprojects.name !in projectsWithDisabledFirBootstrap) {
-                freeCompilerArgs += "-Xuse-fir"
-                freeCompilerArgs += "-Xabi-stability=stable"
-            }
-        }
-    }
-
-    if (!kotlinBuildProperties.isInJpsBuildIdeaSync && !kotlinBuildProperties.useFir && !kotlinBuildProperties.disableWerror) {
-        // For compiler and stdlib, allWarningsAsErrors is configured in the corresponding "root" projects
-        // (compiler/build.gradle.kts and libraries/commonConfiguration.gradle).
-        val projectsWithWarningsAsErrors = listOf("core", "plugins").map { File(it).absoluteFile }
-        if (projectsWithWarningsAsErrors.any(projectDir::startsWith)) {
-            tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile> {
-                if (path !in tasksWithWarnings) {
-                    kotlinOptions {
-                        allWarningsAsErrors = true
-                    }
-                }
-            }
         }
     }
 
@@ -516,7 +461,17 @@ allprojects {
     }
 
     tasks.withType<Test> {
-        outputs.doNotCacheIf("https://youtrack.jetbrains.com/issue/KTI-112") { true }
+        outputs.doNotCacheIf("https://youtrack.jetbrains.com/issue/KT-37089") { true }
+    }
+
+    tasks.withType<SourceTask>().configureEach {
+        doFirst {
+            source.visit {
+                if (file.isDirectory && file.listFiles()?.isEmpty() == true) {
+                    logger.warn("Empty source directories may cause build cache misses: " + file.absolutePath)
+                }
+            }
+        }
     }
 
     normalization {
@@ -584,11 +539,10 @@ gradle.taskGraph.whenReady {
 
     val proguardMessage = "proguard is ${kotlinBuildProperties.proguard.toOnOff()}"
     val jarCompressionMessage = "jar compression is ${kotlinBuildProperties.jarCompression.toOnOff()}"
+                val profileMessage = "$profile build profile is active ($proguardMessage, $jarCompressionMessage). " +
+            "Use -Pteamcity=<true|false> to reproduce CI/local build"
 
-    logger.warn(
-        "$profile build profile is active ($proguardMessage, $jarCompressionMessage). " +
-                "Use -Pteamcity=<true|false> to reproduce CI/local build"
-    )
+    logger.warn("\n\n$profileMessage")
 
     allTasks.filterIsInstance<org.gradle.jvm.tasks.Jar>().forEach { task ->
         task.entryCompression = if (kotlinBuildProperties.jarCompression)
@@ -603,7 +557,7 @@ val dist = tasks.register("dist") {
 }
 
 val syncMutedTests = tasks.register("syncMutedTests") {
-    dependsOn(":compiler:tests-mutes:tc-integration:run")
+    dependsOn(":compiler:tests-mutes:run")
 }
 
 val copyCompilerToIdeaPlugin by task<Copy> {
@@ -618,20 +572,22 @@ val ideaPlugin by task<Task> {
 }
 
 tasks {
-    named<Delete>("clean") {
-        delete += setOf("$buildDir/repo", distDir)
+    named("clean") {
+        doLast {
+            delete("$buildDir/repo")
+            delete(distDir)
+        }
     }
 
-    register<Delete>("cleanupArtifacts") {
-        delete = setOf(artifactsDir)
+    register("cleanupArtifacts") {
+        doLast {
+            delete(artifactsDir)
+        }
     }
 
     listOf("clean", "assemble", "install").forEach { taskName ->
         register("coreLibs${taskName.capitalize()}") {
-            for (projectName in coreLibProjects) {
-                if (projectName.startsWith(":kotlin-test:") && taskName == "install") continue
-                dependsOn("$projectName:$taskName")
-            }
+            coreLibProjects.forEach { projectName -> dependsOn("$projectName:$taskName") }
         }
     }
 
@@ -662,7 +618,6 @@ tasks {
         dependsOn("dist")
         dependsOn(
             ":compiler:test",
-            ":compiler:tests-common-new:test",
             ":compiler:container:test",
             ":compiler:tests-java8:test",
             ":compiler:tests-spec:test",
@@ -684,11 +639,8 @@ tasks {
     }
 
     register("wasmCompilerTest") {
-        dependsOn(":js:js.tests:wasmTest")
-        // Windows WABT release requires Visual C++ Redistributable
-        if (!kotlinBuildProperties.isTeamcityBuild || !org.gradle.internal.os.OperatingSystem.current().isWindows) {
-            dependsOn(":wasm:wasm.ir:test")
-        }
+//  TODO: fix once
+//        dependsOn(":js:js.tests:wasmTest")
     }
 
     register("nativeCompilerTest") {
@@ -699,7 +651,6 @@ tasks {
         dependsOn(":compiler:fir:raw-fir:psi2fir:test")
         dependsOn(":compiler:fir:raw-fir:light-tree2fir:test")
         dependsOn(":compiler:fir:analysis-tests:test")
-        dependsOn(":compiler:fir:analysis-tests:legacy-fir-tests:test")
         dependsOn(":compiler:fir:fir2ir:test")
     }
 
@@ -709,7 +660,6 @@ tasks {
             ":compiler:fir:raw-fir:psi2fir:test",
             ":compiler:fir:raw-fir:light-tree2fir:test",
             ":compiler:fir:analysis-tests:test",
-            ":compiler:fir:analysis-tests:legacy-fir-tests:test",
             ":compiler:fir:fir2ir:test",
             ":plugins:fir:fir-plugin-prototype:test"
         )
@@ -722,12 +672,10 @@ tasks {
     register("scriptingTest") {
         dependsOn("dist")
         dependsOn(":kotlin-script-util:test")
-        dependsOn(":kotlin-scripting-compiler:test")
-        dependsOn(":kotlin-scripting-compiler:testWithIr")
+        dependsOn(":kotlin-scripting-compiler-embeddable:test")
         dependsOn(":kotlin-scripting-common:test")
         dependsOn(":kotlin-scripting-jvm:test")
         dependsOn(":kotlin-scripting-jvm-host-test:test")
-        dependsOn(":kotlin-scripting-jvm-host-test:testWithIr")
         dependsOn(":kotlin-scripting-dependencies:test")
         dependsOn(":kotlin-scripting-dependencies-maven:test")
         dependsOn(":kotlin-scripting-jsr223-test:test")
@@ -735,7 +683,6 @@ tasks {
 //        dependsOn(":kotlin-scripting-jvm-host-test:embeddableTest")
         dependsOn(":kotlin-scripting-jsr223-test:embeddableTest")
         dependsOn(":kotlin-main-kts-test:test")
-        dependsOn(":kotlin-main-kts-test:testWithIr")
         dependsOn(":kotlin-scripting-ide-services-test:test")
         dependsOn(":kotlin-scripting-ide-services-test:embeddableTest")
         dependsOn(":kotlin-scripting-js-test:test")
@@ -748,6 +695,7 @@ tasks {
     }
 
     register("miscCompilerTest") {
+        dependsOn("wasmCompilerTest")
         dependsOn("nativeCompilerTest")
         dependsOn("firCompilerTest")
 
@@ -761,15 +709,11 @@ tasks {
         dependsOn("jvmCompilerIntegrationTest")
 
         dependsOn(":plugins:parcelize:parcelize-compiler:test")
-
-        dependsOn(":kotlin-util-io:test")
-        dependsOn(":kotlin-util-klib:test")
     }
 
     register("toolsTest") {
         dependsOn(":tools:kotlinp:test")
         dependsOn(":native:kotlin-klib-commonizer:test")
-        dependsOn(":native:kotlin-klib-commonizer-api:test")
     }
 
     register("examplesTest") {
@@ -804,6 +748,7 @@ tasks {
         dependsOn("dist")
         dependsOn(
             ":idea:idea-maven:test",
+            ":j2k:test",
             ":nj2k:test",
             ":idea:jvm-debugger:jvm-debugger-core:test",
             ":idea:jvm-debugger:jvm-debugger-evaluation:test",
@@ -815,6 +760,7 @@ tasks {
 
     if (Ide.IJ()) {
         register("idea-new-project-wizard-tests") {
+            dependsOn("dist")
             dependsOn(
                 ":libraries:tools:new-project-wizard:test",
                 ":libraries:tools:new-project-wizard:new-project-wizard-cli:test",
@@ -824,31 +770,12 @@ tasks {
     }
 
     register("idea-plugin-performance-tests") {
-        dependsOn(
-            "dist",
-            ":idea:performanceTests:performanceTest",
-            ":idea:performanceTests:aggregateResults"
-        )
-    }
-
-    register("idea-fir-plugin-performance-tests") {
         dependsOn("dist")
         dependsOn(
-            ":idea:idea-fir-performance-tests:ideaFirPerformanceTest"
+            ":idea:performanceTests:performanceTest"
         )
     }
 
-    register("idea-fir-plugin-tests") {
-        dependsOn("dist")
-        dependsOn(
-            ":idea:idea-fir:test",
-            ":idea:idea-frontend-api:test",
-            ":idea:idea-frontend-fir:test",
-            ":idea:idea-frontend-fir:idea-fir-low-level-api:test"
-        )
-    }
-
-
     register("android-ide-tests") {
         dependsOn("dist")
         dependsOn(
@@ -887,18 +814,12 @@ tasks {
             ":generators:test"
         )
         if (Ide.IJ()) {
-            dependsOn(
-                ":libraries:tools:new-project-wizard:test",
-                ":libraries:tools:new-project-wizard:new-project-wizard-cli:test"
-            )
+            dependsOn("idea-new-project-wizard-tests")
         }
     }
 
-
     register("kaptIdeTest") {
         dependsOn(":kotlin-annotation-processing:test")
-        dependsOn(":kotlin-annotation-processing-base:test")
-        dependsOn(":kotlin-annotation-processing-cli:test")
     }
 
     register("gradleIdeTest") {
@@ -913,11 +834,10 @@ tasks {
             ":idea:idea-gradle:test",
             ":idea:test",
             ":compiler:test",
-            ":compiler:container:test",
             ":js:js.tests:test"
         )
-
-        dependsOn(":kotlin-gradle-plugin-integration-tests:test")
+        if (Ide.IJ193.orHigher())
+            dependsOn(":kotlin-gradle-plugin-integration-tests:test")
         if (Ide.AS40.orHigher())
             dependsOn(":kotlin-ultimate:ide:android-studio-native:test")
 
@@ -942,20 +862,16 @@ tasks {
         }
     }
 
-    register("publishGradlePluginArtifacts") {
-        idePluginDependency {
-            dependsOnKotlinGradlePluginPublish()
-        }
-    }
-
     register("publishIdeArtifacts") {
         idePluginDependency {
             dependsOn(
                 ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for-ide:publish",
                 ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-for-ide:publish",
+                ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-tests-for-ide:publish",
                 ":prepare:ide-plugin-dependencies:incremental-compilation-impl-tests-for-ide:publish",
                 ":prepare:ide-plugin-dependencies:kotlin-build-common-tests-for-ide:publish",
                 ":prepare:ide-plugin-dependencies:kotlin-compiler-for-ide:publish",
+                ":prepare:ide-plugin-dependencies:kotlin-dist-for-ide:publish",
                 ":prepare:ide-plugin-dependencies:kotlin-gradle-statistics-for-ide:publish",
                 ":prepare:ide-plugin-dependencies:kotlinx-serialization-compiler-plugin-for-ide:publish",
                 ":prepare:ide-plugin-dependencies:noarg-compiler-plugin-for-ide:publish",
@@ -974,7 +890,9 @@ tasks {
                 ":kotlin-stdlib-jdk7:publish",
                 ":kotlin-stdlib-jdk8:publish",
                 ":kotlin-reflect:publish",
-                ":kotlin-main-kts:publish"
+                ":kotlin-main-kts:publish",
+                ":kotlin-stdlib-js:publish",
+                ":kotlin-test:kotlin-test-js:publish"
             )
         }
     }
@@ -1041,7 +959,7 @@ val zipPlugin by task<Zip> {
     setExecutablePermissions()
 
     doLast {
-        logger.lifecycle("Plugin artifacts packed to ${archiveFile.get()}")
+        logger.lifecycle("Plugin artifacts packed to $archiveFile")
     }
 }
 
@@ -1200,8 +1118,7 @@ val Jar.outputFile: File
 val Project.sourceSetsOrNull: SourceSetContainer?
     get() = convention.findPlugin(JavaPluginConvention::class.java)?.sourceSets
 
-val disableVerificationTasks = providers.systemProperty("disable.verification.tasks")
-    .forUseAtConfigurationTime().orNull?.toBoolean() ?: false
+val disableVerificationTasks = System.getProperty("disable.verification.tasks") == "true"
 if (disableVerificationTasks) {
     gradle.taskGraph.whenReady {
         allTasks.forEach {

buildSrc/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 extra["versions.native-platform"] = "0.14"
 
 buildscript {
@@ -7,13 +5,15 @@ buildscript {
     val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
 
     extra["defaultSnapshotVersion"] = kotlinBuildProperties.defaultSnapshotVersion
-    kotlinBootstrapFrom(BootstrapOption.SpaceBootstrap(kotlinBuildProperties.kotlinBootstrapVersion!!, cacheRedirectorEnabled))
+    kotlinBootstrapFrom(BootstrapOption.BintrayBootstrap(kotlinBuildProperties.kotlinBootstrapVersion!!, cacheRedirectorEnabled))
 
     repositories {
         if (cacheRedirectorEnabled) {
-            maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
+            maven("https://cache-redirector.jetbrains.com/jcenter.bintray.com")
+            maven("https://cache-redirector.jetbrains.com/kotlin.bintray.com/kotlin-dependencies")
         } else {
-            maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
+            jcenter()
+            maven("https://kotlin.bintray.com/kotlin-dependencies")
         }
 
         project.bootstrapKotlinRepo?.let {
@@ -22,12 +22,14 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.26")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.19")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
         classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:${project.bootstrapKotlinVersion}")
     }
 }
 
+val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
+
 logger.info("buildSrcKotlinVersion: " + extra["bootstrapKotlinVersion"])
 logger.info("buildSrc kotlin compiler version: " + org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
 logger.info("buildSrc stdlib version: " + KotlinVersion.CURRENT)
@@ -35,7 +37,6 @@ logger.info("buildSrc stdlib version: " + KotlinVersion.CURRENT)
 apply {
     plugin("kotlin")
     plugin("kotlin-sam-with-receiver")
-    plugin("groovy")
 
     from("../gradle/checkCacheability.gradle.kts")
 }
@@ -79,12 +80,13 @@ extra["intellijReleaseType"] = when {
 }
 
 extra["versions.androidDxSources"] = "5.0.0_r2"
+
 extra["customDepsOrg"] = "kotlin.build"
 
 repositories {
-    mavenCentral()
-    maven("https://packages.jetbrains.team/maven/p/ij/intellij-dependencies")
-    maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies")
+    jcenter()
+    maven("https://jetbrains.bintray.com/intellij-third-party-dependencies/")
+    maven("https://kotlin.bintray.com/kotlin-dependencies")
     gradlePluginPortal()
 
     extra["bootstrapKotlinRepo"]?.let {
@@ -92,60 +94,11 @@ repositories {
     }
 }
 
-val generateCompilerVersion by tasks.registering(VersionGenerator::class) {
-    kotlinNativeVersionInResources=true
-    defaultVersionFileLocation()
-}
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-    dependsOn(generateCompilerVersion)
-}
-
-tasks.clean {
-    doFirst {
-        val versionSourceDirectory = project.konanVersionGeneratedSrc()
-        if (versionSourceDirectory.exists()) {
-            versionSourceDirectory.delete()
-        }
-    }
-}
-
-sourceSets["main"].withConvention(org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet::class) {
-    kotlin.srcDir("src/main/kotlin")
-    if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
-        kotlin.srcDir("../kotlin-native/shared/src/library/kotlin")
-        kotlin.srcDir("../kotlin-native/shared/src/main/kotlin")
-        kotlin.srcDir("../kotlin-native/build-tools/src/main/kotlin")
-        kotlin.srcDir("../kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin")
-        kotlin.srcDir("../compiler/util-klib/src")
-        kotlin.srcDir("../native/utils/src")
-    }
-    kotlin.srcDir(project.kotlinNativeVersionSrc())
-    /**
-     * TODO: mentioned bellow and Co it'd be better to move to :kotlin-native:performance:buildSrc,
-     * because all this relates to benchmarking.
-     */
-    kotlin.exclude("**/benchmark/*.kt")
-    kotlin.exclude("**/kotlin/MPPTools.kt")
-    kotlin.exclude("**/kotlin/RegressionsReporter.kt")
-    kotlin.exclude("**/kotlin/RunJvmTask.kt")
-    kotlin.exclude("**/kotlin/RunKotlinNativeTask.kt")
-    kotlin.exclude("**/kotlin/BuildRegister.kt")
-    kotlin.exclude("**/kotlin/benchmarkUtils.kt")
-}
-
-tasks.validatePlugins.configure {
-    enabled = false
-}
-
-java {
-    disableAutoTargetJvm()
-}
-
 dependencies {
     implementation(kotlin("stdlib", embeddedKotlinVersion))
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.26")
-    implementation("com.gradle.publish:plugin-publish-plugin:0.14.0")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.19")
+    implementation("com.gradle.publish:plugin-publish-plugin:0.11.0")
 
     implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
     implementation("net.rubygrapefruit:native-platform-windows-amd64:${property("versions.native-platform")}")
@@ -158,29 +111,7 @@ dependencies {
 
     implementation("gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.5")
 
-    implementation("org.gradle:test-retry-gradle-plugin:1.2.0")
-    implementation("com.gradle.enterprise:test-distribution-gradle-plugin:1.2.1")
-
-    compileOnly(gradleApi())
-
-    val kotlinVersion = project.bootstrapKotlinVersion
-    val ktorVersion  = "1.2.1"
-    val slackApiVersion = "1.2.0"
-    val metadataVersion = "0.0.1-dev-10"
-
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
-    implementation("com.ullink.slack:simpleslackapi:$slackApiVersion")
-
-    implementation("io.ktor:ktor-client-auth:$ktorVersion")
-    implementation("io.ktor:ktor-client-core:$ktorVersion")
-    implementation("io.ktor:ktor-client-cio:$ktorVersion")
-
-    implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
-    if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
-        implementation("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
-    }
+    implementation("org.gradle:test-retry-gradle-plugin:1.1.9")
 }
 
 samWithReceiver {
@@ -195,27 +126,7 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions.allWarningsAsErrors = true
-    kotlinOptions.freeCompilerArgs += listOf(
-        "-Xopt-in=kotlin.RequiresOptIn",
-        "-Xskip-runtime-version-check",
-        "-Xsuppress-version-warnings",
-        "-Xopt-in=kotlin.ExperimentalStdlibApi"
-    )
-}
-
 tasks["build"].dependsOn(":prepare-deps:build")
-sourceSets["main"].withConvention(org.gradle.api.tasks.GroovySourceSet::class) {
-    if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
-        groovy.srcDir("../kotlin-native/build-tools/src/main/groovy")
-    }
-}
-
-tasks.named("compileGroovy", GroovyCompile::class.java) {
-    classpath += project.files(tasks.named("compileKotlin", org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java))
-    dependsOn(tasks.named("compileKotlin"))
-}
 
 allprojects {
     tasks.register("checkBuild")
@@ -224,40 +135,3 @@ allprojects {
         apply(from = "$rootDir/../gradle/cacheRedirector.gradle.kts")
     }
 }
-
-gradlePlugin {
-    plugins {
-        create("compileToBitcode") {
-            id = "compile-to-bitcode"
-            implementationClass = "org.jetbrains.kotlin.bitcode.CompileToBitcodePlugin"
-        }
-        create("runtimeTesting") {
-            id = "runtime-testing"
-            implementationClass = "org.jetbrains.kotlin.testing.native.RuntimeTestingPlugin"
-        }
-        create("konan") {
-            id = "konan"
-            implementationClass = "org.jetbrains.kotlin.gradle.plugin.konan.KonanPlugin"
-        }
-        // We bundle a shaded version of kotlinx-serialization plugin
-        create("kotlinx-serialization-native") {
-            id = "kotlinx-serialization-native"
-            implementationClass = "shadow.org.jetbrains.kotlinx.serialization.gradle.SerializationGradleSubplugin"
-        }
-
-        create("org.jetbrains.kotlin.konan") {
-            id = "org.jetbrains.kotlin.konan"
-            implementationClass = "org.jetbrains.kotlin.gradle.plugin.konan.KonanPlugin"
-        }
-
-        create("native") {
-            id = "native"
-            implementationClass = "org.jetbrains.gradle.plugins.tools.NativePlugin"
-        }
-
-        create("native-interop-plugin") {
-            id = "native-interop-plugin"
-            implementationClass = "org.jetbrains.kotlin.NativeInteropPlugin"
-        }
-    }
-}

buildSrc/prepare-deps/build.gradle.kts

@@ -65,11 +65,28 @@ repositories {
                 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://packages.jetbrains.team/maven/p/ij/intellij-dependencies")
+    maven("https://jetbrains.bintray.com/intellij-third-party-dependencies/")
 }
 
 val intellij by configurations.creating
@@ -238,8 +255,9 @@ fun buildIvyRepositoryTask(
         inputs.files(configuration)
 
         outputs.upToDateWhen {
-            val repoMarker = configuration.resolvedConfiguration.resolvedArtifacts.single().moduleDirectory().resolve(".marker")
-            repoMarker.exists()
+            configuration.resolvedConfiguration.resolvedArtifacts.single()
+                .moduleDirectory()
+                .exists()
         }
 
         doFirst {
@@ -248,9 +266,8 @@ fun buildIvyRepositoryTask(
 
             artifact.storeDirectory().cleanStore()
 
-            val repoMarker = File(moduleDirectory, ".marker")
-            if (repoMarker.exists()) {
-                logger.info("Path ${repoMarker.absolutePath} already exists, skipping unpacking.")
+            if (moduleDirectory.exists()) {
+                logger.info("Path ${moduleDirectory.absolutePath} already exists, skipping unpacking.")
                 return@doFirst
             }
 
@@ -309,8 +326,6 @@ fun buildIvyRepositoryTask(
                             )
                         }
                 }
-
-                repoMarker.createNewFile()
             }
         }
     }

buildSrc/settings.gradle

@@ -14,13 +14,13 @@ pluginManagement {
 buildscript {
     repositories {
         if (cacheRedirectorEnabled == 'true') {
-            maven { url "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies" }
+            maven { url "https://cache-redirector.jetbrains.com/kotlin.bintray.com/kotlin-dependencies" }
         } else {
-            maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-dependencies" }
+            maven { url "https://kotlin.bintray.com/kotlin-dependencies" }
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.26")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.19")
     }
 }
 
@@ -69,4 +69,4 @@ if (target_AppCode_Clion) {
 
 } else {
     logger.info("Not including extra modules in buildSrc/settings.gradle")
-}
+}

buildSrc/src/kotlin-native-binary-version/kotlin/org/jetbrains/kotlin/konan/kotlin-native-version.kt

@@ -1,17 +0,0 @@
-/*
- * Copyright 2010-2021 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.konan
-import java.io.*
-
-val VERSION_PATH = "/META-INF/kotlin-native.compiler.version"
-val CompilerVersion.Companion.CURRENT: CompilerVersion
-    get() {
-        return InputStreamReader(this::class.java.getResourceAsStream(VERSION_PATH)).use {
-            it.readLines().single().parseCompilerVersion()
-        }
-    }
-
-val currentCompilerVersion = CompilerVersion.CURRENT

buildSrc/src/main/kotlin/BuildPropertiesExt.kt

@@ -18,5 +18,3 @@ val KotlinBuildProperties.proguard: Boolean get() = postProcessing && getBoolean
 val KotlinBuildProperties.jarCompression: Boolean get() = getBoolean("kotlin.build.jar.compression", isTeamcityBuild)
 
 val KotlinBuildProperties.ignoreTestFailures: Boolean get() = getBoolean("ignoreTestFailures", isTeamcityBuild)
-
-val KotlinBuildProperties.disableWerror: Boolean get() = getBoolean("kotlin.build.disable.werror", false)

buildSrc/src/main/kotlin/CommonUtil.kt

@@ -54,12 +54,11 @@ var Project.javaHome: String?
         extra["javaHome"] = v
     }
 
-fun Project.generator(fqName: String, sourceSet: SourceSet? = null, configure: JavaExec.() -> Unit = {}) = smartJavaExec {
+fun Project.generator(fqName: String, sourceSet: SourceSet? = null) = smartJavaExec {
     classpath = (sourceSet ?: testSourceSet).runtimeClasspath
     mainClass.set(fqName)
     workingDir = rootDir
     systemProperty("line.separator", "\n")
-    configure()
 }
 
 fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)?.let {

buildSrc/src/main/kotlin/InstrumentJava.kt

@@ -1,51 +0,0 @@
-import org.gradle.api.Action
-import org.gradle.api.Task
-import org.gradle.api.artifacts.Configuration
-import org.gradle.api.file.FileCollection
-import org.gradle.api.tasks.SourceSet
-import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.kotlin.dsl.provideDelegate
-import org.gradle.kotlin.dsl.withGroovyBuilder
-
-/*
- * Copyright 2010-2021 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.
- */
-
-class InstrumentJava(@Transient val javaInstrumentator: Configuration, @Transient val sourceSet: SourceSet) : Action<Task> {
-    private val instrumentatorClasspath: String by lazy {
-        javaInstrumentator.asPath
-    }
-
-    private val srcDirs: FileCollection by lazy {
-        sourceSet.allJava.sourceDirectories
-    }
-
-    override fun execute(task: Task) {
-        require(task is JavaCompile) { "$task is not of type JavaCompile!" }
-        task.doLast {
-            task.ant.withGroovyBuilder {
-                "taskdef"(
-                    "name" to "instrumentIdeaExtensions",
-                    "classpath" to instrumentatorClasspath,
-                    "loaderref" to "java2.loader",
-                    "classname" to "com.intellij.ant.InstrumentIdeaExtensions"
-                )
-            }
-
-            val javaSourceDirectories = srcDirs.filter { it.exists() }
-
-            task.ant.withGroovyBuilder {
-                javaSourceDirectories.forEach { directory ->
-                    "instrumentIdeaExtensions"(
-                        "srcdir" to directory,
-                        "destdir" to task.destinationDir,
-                        "classpath" to task.classpath.asPath,
-                        "includeantruntime" to false,
-                        "instrumentNotNull" to true
-                    )
-                }
-            }
-        }
-    }
-}

buildSrc/src/main/kotlin/artifacts.kt

@@ -25,6 +25,7 @@ import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.Upload
 import org.gradle.api.tasks.javadoc.Javadoc
 import org.gradle.jvm.tasks.Jar
+import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.kotlin.dsl.*
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetContainer
 import plugins.KotlinBuildPublishingPlugin
@@ -70,6 +71,18 @@ fun Project.noDefaultJar() {
     }
 }
 
+fun <T : Task> Project.runtimeJarArtifactBy(
+    task: TaskProvider<T>,
+    artifactRef: Any,
+    body: ConfigurablePublishArtifact.() -> Unit = {}
+) {
+    addArtifact("archives", task, artifactRef, body)
+    addArtifact("runtimeJar", task, artifactRef, body)
+    configurations.findByName("runtime")?.let {
+        addArtifact(it.name, task, artifactRef, body)
+    }
+}
+
 fun Project.runtimeJar(body: Jar.() -> Unit = {}): TaskProvider<Jar> = runtimeJar(getOrCreateTask("jar", body)) { }
 
 fun <T : Jar> Project.runtimeJar(task: TaskProvider<T>, body: T.() -> Unit = {}): TaskProvider<T> {
@@ -90,11 +103,7 @@ fun <T : Jar> Project.runtimeJar(task: TaskProvider<T>, body: T.() -> Unit = {})
         body()
     }
 
-    project.addArtifact("archives", task, task)
-    project.addArtifact("runtimeJar", task, task)
-    project.configurations.findByName("runtime")?.let {
-        project.addArtifact(it.name, task, task)
-    }
+    project.runtimeJarArtifactBy(task, task)
 
     val runtimeJar = configurations.maybeCreate("runtimeJar").apply {
         isCanBeConsumed = true

buildSrc/src/main/kotlin/copyright.kt

@@ -8,37 +8,48 @@ package tasks
 import groovy.util.Node
 import groovy.util.XmlParser
 import org.gradle.api.DefaultTask
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.provider.Property
+import org.gradle.api.Project
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
+import java.io.File
 import java.util.*
 
-abstract class WriteCopyrightToFile : DefaultTask() {
+
+
+
+open class WriteCopyrightToFile : DefaultTask() {
+
     @InputFile
-    val path = project.file("${project.rootDir}/.idea/copyright/apache.xml")
+    var path = project.file("${project.rootDir}/.idea/copyright/apache.xml")
 
-    @get:OutputFile
-    abstract val outputFile: RegularFileProperty
+    @OutputFile
+    var outputFile: File? = null
 
-    @get:Input
-    val commented: Property<Boolean> = project.objects.property(Boolean::class.java).convention(true)
+    @Input
+    var commented: Boolean = true
 
     @TaskAction
     fun write() {
-        val file = outputFile.asFile.get()
-        file.writeText(if (commented.get()) readCopyrightCommented() else readCopyright())
+        if (commented) {
+            outputFile!!.writeText(project.readCopyrightCommented())
+        } else {
+            outputFile!!.writeText(project.readCopyright())
+        }
     }
 
-    private fun readCopyright(): String {
-        assert(path.exists()) {
-            "File $path with copyright not found"
+
+    fun Project.readCopyright(): String {
+        val file = rootDir.resolve(".idea/copyright/apache.xml")
+
+        assert(file.exists()) {
+            "File $file with copyright not found"
         }
 
+
         val xmlParser = XmlParser()
-        val node = xmlParser.parse(path)
+        val node = xmlParser.parse(file)
         assert(node.attribute("name") == "CopyrightManager") {
             "Format changed occasionally?"
         }
@@ -48,7 +59,7 @@ abstract class WriteCopyrightToFile : DefaultTask() {
         return noticeNode.attribute("value").toString().replace("&#36;today.year", GregorianCalendar()[Calendar.YEAR].toString())
     }
 
-    private fun readCopyrightCommented(): String {
+    fun Project.readCopyrightCommented(): String {
         return "/*\n" + readCopyright().prependIndent(" * ") + "\n */"
     }
 }

buildSrc/src/main/kotlin/dependencies.kt

@@ -9,13 +9,10 @@
 
 import org.gradle.api.GradleException
 import org.gradle.api.Project
-import org.gradle.api.artifacts.Dependency
-import org.gradle.api.artifacts.ExternalModuleDependency
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.FileCollection
-import org.gradle.kotlin.dsl.accessors.runtime.addDependencyTo
 import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.project
 import java.io.File
@@ -115,56 +112,6 @@ fun DependencyHandler.projectTests(name: String): ProjectDependency = project(na
 fun DependencyHandler.projectRuntimeJar(name: String): ProjectDependency = project(name, configuration = "runtimeJar")
 fun DependencyHandler.projectArchives(name: String): ProjectDependency = project(name, configuration = "archives")
 
-fun Project.testApiJUnit5(
-    vintageEngine: Boolean = false,
-    runner: Boolean = false,
-    suiteApi: Boolean = false,
-    jupiterParams: Boolean = false
-) {
-    with(dependencies) {
-        val platformVersion = commonVer("org.junit", "junit-bom")
-        testApi(platform("org.junit:junit-bom:$platformVersion"))
-        testApi("org.junit.jupiter:junit-jupiter")
-        if (vintageEngine) {
-            testApi("org.junit.vintage:junit-vintage-engine:$platformVersion")
-        }
-
-        if (jupiterParams) {
-            testApi("org.junit.jupiter:junit-jupiter-params:$platformVersion")
-        }
-
-        val componentsVersion = commonVer("org.junit.platform", "")
-
-        val components = mutableListOf(
-            "org.junit.platform:junit-platform-commons",
-            "org.junit.platform:junit-platform-launcher"
-        )
-        if (runner) {
-            components += "org.junit.platform:junit-platform-runner"
-        }
-        if (suiteApi) {
-            components += "org.junit.platform:junit-platform-suite-api"
-        }
-
-        for (component in components) {
-            testApi("$component:$componentsVersion")
-        }
-
-        addDependencyTo<ExternalModuleDependency>(this, "testImplementation", intellijDep()) {
-            // This dependency is needed only for FileComparisonFailure
-            includeJars("idea_rt", rootProject = rootProject)
-            isTransitive = false
-        }
-
-        // This is needed only for using FileComparisonFailure, which relies on JUnit 3 classes
-        add("testRuntimeOnly", commonDep("junit:junit"))
-    }
-}
-
-private fun DependencyHandler.testApi(dependencyNotation: Any) {
-    add("testApi", dependencyNotation)
-}
-
 val Project.protobufVersion: String get() = findProperty("versions.protobuf") as String
 
 val Project.protobufRepo: String

buildSrc/src/main/kotlin/embeddable.kt

@@ -5,13 +5,10 @@ import org.gradle.api.Project
 import org.gradle.api.file.DuplicatesStrategy
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.jvm.tasks.Jar
-import org.gradle.kotlin.dsl.named
-import org.gradle.kotlin.dsl.project
-import org.gradle.kotlin.dsl.provideDelegate
-import org.gradle.kotlin.dsl.register
+import org.gradle.kotlin.dsl.*
 import java.io.File
 
-const val kotlinEmbeddableRootPackage = "org.jetbrains.kotlin"
+val kotlinEmbeddableRootPackage = "org.jetbrains.kotlin"
 
 val packagesToRelocate =
     listOf(
@@ -25,7 +22,6 @@ val packagesToRelocate =
         "org.fusesource",
         "net.jpountz",
         "one.util.streamex",
-        "it.unimi.dsi.fastutil",
         "kotlinx.collections.immutable"
     )
 
@@ -35,23 +31,21 @@ val packagesToRelocate =
 // But due to the shadow plugin bug (https://github.com/johnrengelman/shadow/issues/262) it is not possible to use
 // packagesToRelocate list to for the include list. Therefore the exclude list has to be created.
 val packagesToExcludeFromDummy =
-    listOf(
-        "org/jetbrains/kotlin/**",
-        "org/intellij/lang/annotations/**",
-        "org/jetbrains/jps/**",
-        "META-INF/**",
-        "com/sun/jna/**",
-        "com/thoughtworks/xstream/**",
-        "javaslang/**",
-        "*.proto",
-        "messages/**",
-        "net/sf/cglib/**",
-        "one/util/streamex/**",
-        "org/iq80/snappy/**",
-        "org/jline/**",
-        "org/xmlpull/**",
-        "*.txt"
-    )
+        listOf("org/jetbrains/kotlin/**",
+               "org/intellij/lang/annotations/**",
+               "org/jetbrains/jps/**",
+               "META-INF/**",
+               "com/sun/jna/**",
+               "com/thoughtworks/xstream/**",
+               "javaslang/**",
+               "*.proto",
+               "messages/**",
+               "net/sf/cglib/**",
+               "one/util/streamex/**",
+               "org/iq80/snappy/**",
+               "org/jline/**",
+               "org/xmlpull/**",
+               "*.txt")
 
 private fun ShadowJar.configureEmbeddableCompilerRelocation(withJavaxInject: Boolean = true) {
     relocate("com.google.protobuf", "org.jetbrains.kotlin.protobuf")
@@ -73,8 +67,8 @@ private fun Project.compilerShadowJar(taskName: String, body: ShadowJar.() -> Un
     dependencies.add(compilerJar.name, dependencies.project(":kotlin-compiler", configuration = "runtimeJar"))
 
     return tasks.register<ShadowJar>(taskName) {
-        destinationDirectory.set(project.file(File(buildDir, "libs")))
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        destinationDir = File(buildDir, "libs")
+        setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE)
         from(compilerJar)
         body()
     }
@@ -113,8 +107,8 @@ fun Project.embeddableCompilerDummyForDependenciesRewriting(
     )
 
     return tasks.register<ShadowJar>(taskName) {
-        destinationDirectory.set(project.file(File(buildDir, "libs")))
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        destinationDir = File(buildDir, "libs")
+        setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE)
         from(compilerDummyJar)
         configureEmbeddableCompilerRelocation(withJavaxInject = false)
         body()
@@ -125,9 +119,10 @@ fun Project.rewriteDepsToShadedJar(
     originalJarTask: TaskProvider<out Jar>, shadowJarTask: TaskProvider<out Jar>, body: Jar.() -> Unit = {}
 ): TaskProvider<out Jar> {
     originalJarTask.configure {
-        archiveClassifier.set("original")
+        classifier = "original"
     }
 
+    val compilerDummyJarFile by lazy { configurations.getAt("compilerDummyJar").singleFile }
 
     shadowJarTask.configure {
         dependsOn(originalJarTask)
@@ -135,10 +130,9 @@ fun Project.rewriteDepsToShadedJar(
 
         // When Gradle traverses the inputs, reject the shaded compiler JAR,
         // which leads to the content of that JAR being excluded as well:
-        val compilerDummyJarFile = project.provider { configurations.getByName("compilerDummyJar").singleFile }
-        exclude { it.file == compilerDummyJarFile.get() }
+        exclude { it.file == compilerDummyJarFile }
 
-        archiveClassifier.set("original")
+        classifier = ""
         body()
     }
     return shadowJarTask

buildSrc/src/main/kotlin/instrument.kt

@@ -21,18 +21,15 @@ import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.FileCollection
-import org.gradle.api.file.FileSystemOperations
-import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.internal.ConventionTask
 import org.gradle.api.plugins.ExtensionAware
 import org.gradle.api.tasks.*
 import org.gradle.api.tasks.compile.AbstractCompile
 import org.gradle.kotlin.dsl.*
 import java.io.File
-import javax.inject.Inject
 
 fun Project.configureFormInstrumentation() {
-    plugins.matching { it::class.java.canonicalName.startsWith("org.jetbrains.kotlin.gradle.plugin") }.configureEach {
+    plugins.matching { it::class.java.canonicalName.startsWith("org.jetbrains.kotlin.gradle.plugin") }.all {
         // When we change the output classes directory, Gradle will automatically configure
         // the test compile tasks to use the instrumented classes. Normally this is fine,
         // however, it causes problems for Kotlin projects:
@@ -45,36 +42,31 @@ fun Project.configureFormInstrumentation() {
 
         // This fails when we change the classes dir. The easiest fix is to prepend the
         // classes from the "friendly directory" to the compile classpath.
-        if (!tasks.names.contains("compileTestKotlin")) return@configureEach
+        val testCompile = tasks.findByName("compileTestKotlin") as AbstractCompile?
+        testCompile?.doFirst {
+            val originalClassesDirs = files((mainSourceSet as ExtensionAware).extra.get("classesDirsCopy"))
 
-        tasks.named<AbstractCompile>("compileTestKotlin") {
-            val objects = project.objects
-            val classesDirs = project.mainSourceSet.output.classesDirs
-            val classesDirsCopy = project.provider { (mainSourceSet as ExtensionAware).extra.get("classesDirsCopy") }
-            doFirst {
-                val originalClassesDirs = objects.fileCollection().from(classesDirsCopy)
+            testCompile.classpath = (testCompile.classpath
+                    - mainSourceSet.output.classesDirs
+                    + originalClassesDirs)
 
-                classpath = (classpath
-                        - classesDirs
-                        + originalClassesDirs)
+            // Since Kotlin 1.3.60, the friend paths available to the test compile task are calculated as the main source set's
+            // output.classesDirs. Since the classesDirs are excluded from the classpath (replaced by the originalClassesDirs),
+            // in order to be able to access the internals of 'main', tests need to receive the original classes dirs as a
+            // -Xfriend-paths compiler argument as well.
+            fun addFreeCompilerArgs(kotlinCompileTask: AbstractCompile, vararg args: String) {
+                val getKotlinOptions = kotlinCompileTask::class.java.getMethod("getKotlinOptions")
+                val kotlinOptions = getKotlinOptions(kotlinCompileTask)
 
-                // Since Kotlin 1.3.60, the friend paths available to the test compile task are calculated as the main source set's
-                // output.classesDirs. Since the classesDirs are excluded from the classpath (replaced by the originalClassesDirs),
-                // in order to be able to access the internals of 'main', tests need to receive the original classes dirs as a
-                // -Xfriend-paths compiler argument as well.
-                fun addFreeCompilerArgs(kotlinCompileTask: AbstractCompile, vararg args: String) {
-                    val getKotlinOptions = kotlinCompileTask::class.java.getMethod("getKotlinOptions")
-                    val kotlinOptions = getKotlinOptions(kotlinCompileTask)
+                val getFreeCompilerArgs = kotlinOptions::class.java.getMethod("getFreeCompilerArgs")
+                val freeCompilerArgs = getFreeCompilerArgs(kotlinOptions) as List<*>
 
-                    val getFreeCompilerArgs = kotlinOptions::class.java.getMethod("getFreeCompilerArgs")
-                    val freeCompilerArgs = getFreeCompilerArgs(kotlinOptions) as List<*>
-
-                    val setFreeCompilerArgs = kotlinOptions::class.java.getMethod("setFreeCompilerArgs", List::class.java)
-                    setFreeCompilerArgs(kotlinOptions, freeCompilerArgs + args)
-                }
-                addFreeCompilerArgs(this as AbstractCompile, "-Xfriend-paths=" + originalClassesDirs.joinToString(",")  { it.absolutePath })
+                val setFreeCompilerArgs = kotlinOptions::class.java.getMethod("setFreeCompilerArgs", List::class.java)
+                setFreeCompilerArgs(kotlinOptions, freeCompilerArgs + args)
             }
+            addFreeCompilerArgs(testCompile, "-Xfriend-paths=" + originalClassesDirs.joinToString(",")  { it.absolutePath })
         }
+
     }
 
     val instrumentationClasspathCfg = configurations.create("instrumentationClasspath")
@@ -84,7 +76,7 @@ fun Project.configureFormInstrumentation() {
     }
 
     afterEvaluate {
-        sourceSets.forEach { sourceSetParam ->
+        sourceSets.all { sourceSetParam ->
             // This copy will ignore filters, but they are unlikely to be used.
             val classesDirs = (sourceSetParam.output.classesDirs as ConfigurableFileCollection).from as Collection<Any>
 
@@ -96,82 +88,66 @@ fun Project.configureFormInstrumentation() {
             (sourceSetParam.output.classesDirs as ConfigurableFileCollection).setFrom(instrumentedClassesDir)
             val instrumentTask =
                 project.tasks.register(sourceSetParam.getTaskName("instrument", "classes"), IntelliJInstrumentCodeTask::class.java) {
-                    dependsOn(sourceSetParam.classesTaskName)
-                    compileClasspath.from(sourceSetParam.compileClasspath)
-                    sourceDirs.from(project.files({ sourceSetParam.allSource.srcDirs.filter { !sourceSetParam.resources.contains(it) && it.exists() } }))
-                    instrumentationClasspathConfiguration = instrumentationClasspathCfg
-                    originalClassesDirs.from(classesDirsCopy)
-                    output.set(instrumentedClassesDir)
+                    dependsOn(sourceSetParam.classesTaskName).onlyIf { !classesDirsCopy.isEmpty }
+                    sourceSet = sourceSetParam
+                    instrumentationClasspath = instrumentationClasspathCfg
+                    originalClassesDirs = classesDirsCopy
+                    output = instrumentedClassesDir
+                    outputs.dir(instrumentedClassesDir)
                 }
 
             // Ensure that our task is invoked when the source set is built
             sourceSetParam.compiledBy(instrumentTask)
+            @Suppress("UNUSED_EXPRESSION")
+            true
         }
     }
 }
 
 @CacheableTask
-abstract class IntelliJInstrumentCodeTask : ConventionTask() {
+open class IntelliJInstrumentCodeTask : ConventionTask() {
     companion object {
         private const val FILTER_ANNOTATION_REGEXP_CLASS = "com.intellij.ant.ClassFilterAnnotationRegexp"
         private const val LOADER_REF = "java2.loader"
     }
 
-    @Transient
-    @Internal
-    lateinit var instrumentationClasspathConfiguration: Configuration
+    @Classpath
+    var instrumentationClasspath: Configuration? = null
 
-    @get:Classpath
-    val instrumentationClasspath: String by lazy {
-        instrumentationClasspathConfiguration.asPath
-    }
-
-    @get:InputFiles
-    @get:PathSensitive(PathSensitivity.RELATIVE)
-    @get:SkipWhenEmpty
-    abstract val originalClassesDirs: ConfigurableFileCollection
+    @InputFiles
+    @PathSensitive(PathSensitivity.RELATIVE)
+    var originalClassesDirs: FileCollection? = null
 
     @get:Input
     var instrumentNotNull: Boolean = false
 
-    @get:InputFiles
-    @get:Classpath
-    abstract val compileClasspath: ConfigurableFileCollection
-
-    // Instrumentation needs to have access to sources of forms for inclusion
-    private val depSourceDirectorySets by lazy {
-        project.configurations["compile"].dependencies.withType(ProjectDependency::class.java)
-            .map { p -> p.dependencyProject.mainSourceSet.allSource.sourceDirectories }
-    }
+    @Internal
+    var sourceSet: SourceSet? = null
 
     @get:InputFiles
     @get:PathSensitive(PathSensitivity.RELATIVE)
-    abstract val sourceDirs: ConfigurableFileCollection
+    val sourceDirs: FileCollection
+        get() = project.files(sourceSet!!.allSource.srcDirs.filter { !sourceSet!!.resources.contains(it) && it.exists() })
 
     @get:OutputDirectory
-    abstract val output: RegularFileProperty
-
-    @get:Inject
-    abstract val fs: FileSystemOperations
+    lateinit var output: File
 
     @TaskAction
     fun instrumentClasses() {
         logger.info(
-            "input files are: ${
-                originalClassesDirs.joinToString(
-                    "; ",
-                    transform = { "'${it.name}'${if (it.exists()) "" else " (does not exists)"}" })
-            }"
+            "input files are: ${originalClassesDirs?.joinToString(
+                "; ",
+                transform = { "'${it.name}'${if (it.exists()) "" else " (does not exists)"}" })}"
         )
-        output.asFile.get().deleteRecursively()
+        output.deleteRecursively()
         copyOriginalClasses()
 
-        val classpath = instrumentationClasspath
+        val classpath = instrumentationClasspath!!
 
         ant.withGroovyBuilder {
             "taskdef"(
                 "name" to "instrumentIdeaExtensions",
-                "classpath" to classpath,
+                "classpath" to classpath.asPath,
                 "loaderref" to LOADER_REF,
                 "classname" to "com.intellij.ant.InstrumentIdeaExtensions"
             )
@@ -179,14 +155,14 @@ abstract class IntelliJInstrumentCodeTask : ConventionTask() {
 
         logger.info("Compiling forms and instrumenting code with nullability preconditions")
         if (instrumentNotNull) {
-            prepareNotNullInstrumenting(classpath)
+            prepareNotNullInstrumenting(classpath.asPath)
         }
 
         instrumentCode(sourceDirs, instrumentNotNull)
     }
 
     private fun copyOriginalClasses() {
-        fs.copy {
+        project.copy {
             from(originalClassesDirs)
             into(output)
         }
@@ -205,10 +181,12 @@ abstract class IntelliJInstrumentCodeTask : ConventionTask() {
 
     private fun instrumentCode(srcDirs: FileCollection, instrumentNotNull: Boolean) {
         val headlessOldValue = System.setProperty("java.awt.headless", "true")
-        val output = output.get().asFile
 
+        // Instrumentation needs to have access to sources of forms for inclusion
+        val depSourceDirectorySets = project.configurations["compile"].dependencies.withType(ProjectDependency::class.java)
+            .map { p -> p.dependencyProject.mainSourceSet.allSource.sourceDirectories }
         val instrumentationClasspath =
-            depSourceDirectorySets.fold(compileClasspath as FileCollection) { acc, v -> acc + v }.asPath.also {
+            depSourceDirectorySets.fold(sourceSet!!.compileClasspath) { acc, v -> acc + v }.asPath.also {
                 logger.info("Using following dependency source dirs: $it")
             }
 

buildSrc/src/main/kotlin/jdksFinder.kt

@@ -10,12 +10,12 @@ import net.rubygrapefruit.platform.WindowsRegistry.Key.HKEY_LOCAL_MACHINE
 import org.gradle.internal.os.OperatingSystem
 
 enum class JdkMajorVersion(private val mandatory: Boolean = true) {
-    JDK_16, JDK_17, JDK_18, JDK_9, JDK_10(false), JDK_11(false), /*15.0*/JDK_15(false);
+    JDK_16, JDK_17, JDK_18, JDK_9, JDK_10(false), JDK_11(false);
 
     fun isMandatory(): Boolean = mandatory
 }
 
-val jdkAlternativeVarNames = mapOf(JdkMajorVersion.JDK_9 to listOf("JDK_19"), JdkMajorVersion.JDK_15 to listOf("JDK_15_0"))
+val jdkAlternativeVarNames = mapOf(JdkMajorVersion.JDK_9 to listOf("JDK_19"))
 
 data class JdkId(val explicit: Boolean, val majorVersion: JdkMajorVersion, var version: String, var homeDir: File)
 
@@ -101,12 +101,8 @@ fun MutableCollection<JdkId>.discoverJdks(project: Project) {
     }
 }
 
-private val macOsJavaHomeOutRegexes =
-    listOf(
-        Regex("""\s+(\S+),\s+(\S+):\s+".*?"\s+(.+)"""),
-        Regex("""\s+(\S+)\s+\((.*?)\):\s+(.+)"""),
-        Regex("""\s+(\S+)\s+\((.*?)\)\s+"[^"]*"\s+-\s+"[^"]*"\s(.+)"""),
-        Regex("""\s+(\S+)\s+\((.+)\)\s+".+"\s+-\s+".+"\s+(.+)"""))
+private val macOsJavaHomeOutRegexes = listOf(Regex("""\s+(\S+),\s+(\S+):\s+".*?"\s+(.+)"""),
+                                             Regex("""\s+(\S+)\s+\((.*?)\):\s+(.+)"""))
 
 fun MutableCollection<JdkId>.discoverJdksOnMacOS(project: Project) {
     val procBuilder = ProcessBuilder("/usr/libexec/java_home", "-V").redirectErrorStream(true)

buildSrc/src/main/kotlin/localDependencies.kt

@@ -76,6 +76,8 @@ fun Project.jpsStandalone() = "kotlin.build:jps-standalone:${rootProject.extra["
 
 fun Project.nodeJSPlugin() = "kotlin.build:NodeJS:${rootProject.extra["versions.idea.NodeJS"]}"
 
+fun Project.androidDxJar() = "org.jetbrains.kotlin:android-dx:${rootProject.extra["versions.androidBuildTools"]}"
+
 fun Project.jpsBuildTest() = "com.jetbrains.intellij.idea:jps-build-test:${rootProject.extra["versions.intellijSdk"]}"
 
 fun Project.kotlinxCollectionsImmutable() = "org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:${rootProject.extra["versions.kotlinx-collections-immutable"]}"
@@ -130,10 +132,12 @@ object IntellijRootUtils {
     }
 }
 
-@Suppress("UNCHECKED_CAST")
-fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project, jarsFilterPredicate: (String) -> Boolean = { true }): Unit =
+fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project) =
+    includeJars(*(project.rootProject.extra["IntellijCoreDependencies"] as List<String>).toTypedArray(), rootProject = project.rootProject)
+
+fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project, jarsFilterPredicate: (String) -> Boolean) =
     includeJars(
-        *(project.rootProject.extra["IntellijCoreDependencies"] as List<String>).filter(jarsFilterPredicate).toTypedArray(),
+        *(project.rootProject.extra["IntellijCoreDependencies"] as List<String>).filter { jarsFilterPredicate(it) }.toTypedArray(),
         rootProject = project.rootProject
     )
 
@@ -176,7 +180,6 @@ fun Project.runIdeTask(name: String, ideaPluginDir: File, ideaSandboxDir: File,
             "-Didea.system.path=$ideaSandboxDir",
             "-Didea.config.path=$ideaSandboxConfigDir",
             "-Didea.tooling.debug=true",
-            "-Dfus.internal.test.mode=true",
             "-Dapple.laf.useScreenMenuBar=true",
             "-Dapple.awt.graphics.UseQuartz=true",
             "-Dsun.io.useCanonCaches=false",

buildSrc/src/main/kotlin/org/jetbrains/gradle/plugins/tools/NativePlugin.kt

@@ -1,228 +0,0 @@
-/*
- * Copyright 2010-2021 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.gradle.plugins.tools
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.file.FileCollection
-import org.gradle.api.plugins.BasePlugin
-import org.gradle.api.tasks.*
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.withType
-import org.gradle.language.base.plugins.LifecycleBasePlugin
-import org.jetbrains.kotlin.konan.target.HostManager.Companion.hostIsMac
-import org.jetbrains.kotlin.konan.target.HostManager.Companion.hostIsMingw
-import java.io.File
-import kotlin.collections.List
-import kotlin.collections.MutableMap
-import kotlin.collections.addAll
-import kotlin.collections.drop
-import kotlin.collections.first
-import kotlin.collections.flatMap
-import kotlin.collections.forEach
-import kotlin.collections.listOf
-import kotlin.collections.map
-import kotlin.collections.mutableListOf
-import kotlin.collections.mutableMapOf
-import kotlin.collections.plusAssign
-import kotlin.collections.set
-import kotlin.collections.toTypedArray
-
-open class NativePlugin : Plugin<Project> {
-    override fun apply(project: Project) {
-        project.apply<BasePlugin>()
-        project.extensions.create("native", NativeToolsExtension::class.java, project)
-    }
-}
-
-abstract class ToolExecutionTask : DefaultTask() {
-    @get:OutputFile
-    abstract var output: File
-
-    @get:InputFiles
-    abstract var input: List<File>
-
-    @get:Input
-    abstract var cmd: String
-
-    @get:Input
-    abstract var args: List<String>
-
-    @TaskAction
-    fun action() {
-        project.exec {
-            executable(cmd)
-            args(*this@ToolExecutionTask.args.toTypedArray())
-        }
-    }
-}
-
-class ToolPatternImpl(val extension: NativeToolsExtension, val output:String, vararg val input: String):ToolPattern {
-    val tool = mutableListOf<String>()
-    val args = mutableListOf<String>()
-    override fun ruleOut(): String = output
-    override fun ruleInFirst(): String = input.first()
-    override fun ruleInAll(): Array<String> = arrayOf(*input)
-
-    override fun flags(vararg args: String) {
-        this.args.addAll(args)
-    }
-
-    override fun tool(vararg arg: String) {
-        tool.addAll(arg)
-    }
-
-    override fun env(name: String) = emptyArray<String>()
-
-    fun configure(task: ToolExecutionTask, configureDepencies:Boolean) {
-        extension.cleanupfiles += output
-        task.input = input.map {
-            extension.project.file(it)
-        }
-        task.dependsOn(":kotlin-native:dependencies:update")
-        if (configureDepencies)
-            task.input.forEach { task.dependsOn(it.name) }
-        val file = extension.project.file(output)
-        file.parentFile.mkdirs()
-        task.output = file
-        task.cmd = tool.first()
-        task.args = listOf(*tool.drop(1).toTypedArray(), *args.toTypedArray())
-    }
-}
-
-open class SourceSet(
-    val sourceSets: SourceSets,
-    val name: String,
-    val initialDirectory: File = sourceSets.project.projectDir,
-    val initialSourceSet: SourceSet? = null,
-    val rule: Pair<String, String>? = null
-) {
-    var collection = sourceSets.project.objects.fileCollection() as FileCollection
-    fun file(path: String) {
-        collection = collection.plus(sourceSets.project.files("${initialDirectory.absolutePath}/$path"))
-    }
-
-    fun dir(path: String) {
-        sourceSets.project.fileTree("${initialDirectory.absolutePath}/$path").files.forEach {
-            collection = collection.plus(sourceSets.project.files(it))
-        }
-    }
-
-    fun transform(suffixes: Pair<String, String>): SourceSet {
-        return SourceSet(
-            sourceSets,
-            name,
-            sourceSets.project.file("${sourceSets.project.buildDir}/$name/${suffixes.first}_${suffixes.second}/"),
-            this,
-            suffixes
-        )
-    }
-
-    fun implicitTasks(): Array<TaskProvider<*>> {
-        rule ?: return emptyArray()
-        initialSourceSet?.implicitTasks()
-        return initialSourceSet!!.collection
-            .filter { !it.isDirectory() }
-            .filter { it.name.endsWith(rule.first) }
-            .map { it.relativeTo(initialSourceSet.initialDirectory) }
-            .map { it.path }
-            .map { it to (it.substring(0, it.lastIndexOf(rule.first)) + rule.second) }
-            .map {
-                file(it.second)
-                sourceSets.project.file("${initialSourceSet.initialDirectory.path}/${it.first}") to sourceSets.project.file("${initialDirectory.path}/${it.second}")
-            }.map {
-                sourceSets.project.tasks.register<ToolExecutionTask>(it.second.name, ToolExecutionTask::class.java) {
-                    val toolConfiguration = ToolPatternImpl(sourceSets.extension, it.second.path, it.first.path)
-                    sourceSets.extension.toolPatterns[rule]!!.invoke(toolConfiguration)
-                    toolConfiguration.configure(this, initialSourceSet.rule != null)
-                }
-            }.toTypedArray()
-    }
-}
-
-class SourceSets(val project: Project, val extension: NativeToolsExtension, val sources: MutableMap<String, SourceSet>) :
-    MutableMap<String, SourceSet> by sources {
-    operator fun String.invoke(initialDirectory: File = project.projectDir, configuration: SourceSet.() -> Unit) {
-        sources[this] = SourceSet(this@SourceSets, this, initialDirectory).also {
-            configuration(it)
-        }
-    }
-}
-
-
-interface Environment {
-    operator fun String.invoke(vararg values: String)
-}
-
-interface ToolPattern {
-    fun ruleOut(): String
-    fun ruleInFirst(): String
-    fun ruleInAll(): Array<String>
-    fun flags(vararg args: String): Unit
-    fun tool(vararg arg: String): Unit
-    fun env(name: String): Array<String>
-}
-
-
-typealias ToolPatternConfiguration = ToolPattern.() -> Unit
-typealias EnvironmentConfiguration = Environment.() -> Unit
-
-class ToolConfigurationPatterns(
-    val extension: NativeToolsExtension,
-    val patterns: MutableMap<Pair<String, String>, ToolPatternConfiguration>
-) : MutableMap<Pair<String, String>, ToolPatternConfiguration> by patterns {
-    operator fun Pair<String, String>.invoke(configuration: ToolPatternConfiguration) {
-        patterns[this] = configuration
-    }
-}
-
-
-open class NativeToolsExtension(val project: Project) {
-    val sourceSets = SourceSets(project, this, mutableMapOf<String, SourceSet>())
-    val toolPatterns = ToolConfigurationPatterns(this, mutableMapOf<Pair<String, String>, ToolPatternConfiguration>())
-    val cleanupfiles = mutableListOf<String>()
-    fun sourceSet(configuration: SourceSets.() -> Unit) {
-        sourceSets.configuration()
-    }
-
-    var environmentConfiguration: EnvironmentConfiguration? = null
-    fun environment(configuration: EnvironmentConfiguration) {
-        environmentConfiguration = configuration
-    }
-
-    fun suffixes(configuration: ToolConfigurationPatterns.() -> Unit) = toolPatterns.configuration()
-
-    fun target(name: String, vararg objSet: SourceSet, configuration: ToolPatternConfiguration) {
-        project.tasks.withType<Delete>().named(LifecycleBasePlugin.CLEAN_TASK_NAME).configure {
-            doLast {
-                delete(*this@NativeToolsExtension.cleanupfiles.toTypedArray())
-            }
-        }
-
-        sourceSets.project.tasks.create<ToolExecutionTask>(name, ToolExecutionTask::class.java) {
-            objSet.forEach {
-                dependsOn(it.implicitTasks())
-            }
-            val deps = objSet.flatMap { it.collection.files }.map { it.path }
-            val toolConfiguration = ToolPatternImpl(sourceSets.extension, "${project.buildDir.path}/$name", *deps.toTypedArray())
-            toolConfiguration.configuration()
-            toolConfiguration.configure(this, false )
-        }
-    }
-}
-
-
-fun solib(name: String) = when {
-    hostIsMingw -> "$name.dll"
-    hostIsMac -> "lib$name.dylib"
-    else -> "lib$name.so"
-}
-
-fun lib(name:String) = when {
-    hostIsMingw -> "$name.lib"
-    else -> "lib$name.a"
-}

buildSrc/src/main/kotlin/pill/PillExtension.kt

@@ -10,16 +10,31 @@ import java.io.File
 import org.gradle.api.Project
 
 open class PillExtension {
-    /*
-     * Here's how you can specify a custom variant:
-     * `./gradlew pill -Dpill.variant=<NAME>`
-     */
     enum class Variant {
-        BASE, // Includes compiler and IDE (default)
-        FULL, // Includes compiler, IDE and Gradle plugin
+        // Default variant (./gradlew pill)
+        BASE() {
+            override val includes = setOf(BASE)
+        },
+
+        // Full variant (./gradlew pill -Dpill.variant=full)
+        FULL() {
+            override val includes = setOf(BASE, FULL)
+        },
+
+        // Do not import the project to JPS model, but set some options for it
+        NONE() {
+            override val includes = emptySet<Variant>()
+        },
+
+        // 'BASE' if the "jps-compatible" plugin is applied, 'NONE' otherwise
+        DEFAULT() {
+            override val includes = emptySet<Variant>()
+        };
+
+        abstract val includes: Set<Variant>
     }
 
-    open var variant: Variant? = null
+    open var variant: Variant = Variant.DEFAULT
 
     open var excludedDirs: List<File> = emptyList()
 
@@ -30,7 +45,7 @@ open class PillExtension {
 
     @Suppress("unused")
     fun serialize() = mapOf<String, Any?>(
-        "variant" to variant?.name,
+        "variant" to variant.name,
         "excludedDirs" to excludedDirs
     )
 }

buildSrc/src/main/kotlin/pluginMarkers.kt

@@ -18,7 +18,7 @@ import java.util.*
 
 internal const val PLUGIN_MARKER_SUFFIX = ".gradle.plugin"
 
-@OptIn(ExperimentalStdlibApi::class)
+@UseExperimental(ExperimentalStdlibApi::class)
 fun Project.publishPluginMarkers(withEmptyJars: Boolean = true) {
 
     fun Project.isSonatypePublish(): Boolean =
@@ -64,9 +64,6 @@ private fun createMavenMarkerPublication(
 ): MavenPublication {
     return publications.create<MavenPublication>(declaration.name.toString() + "PluginMarkerMaven") {
         val pluginId: String = declaration.id
-        val cGroupId = coordinates.groupId
-        val cArtifactId = coordinates.artifactId
-        val cVersion = coordinates.version
         artifactId = pluginId + PLUGIN_MARKER_SUFFIX
         groupId = pluginId
         pom.withXml {
@@ -75,11 +72,11 @@ private fun createMavenMarkerPublication(
             val dependencies = root.appendChild(document.createElement("dependencies"))
             val dependency = dependencies.appendChild(document.createElement("dependency"))
             val groupId = dependency.appendChild(document.createElement("groupId"))
-            groupId.textContent = cGroupId
+            groupId.textContent = coordinates.groupId
             val artifactId = dependency.appendChild(document.createElement("artifactId"))
-            artifactId.textContent = cArtifactId
+            artifactId.textContent = coordinates.artifactId
             val version = dependency.appendChild(document.createElement("version"))
-            version.textContent = cVersion
+            version.textContent = coordinates.version
         }
 
         pom.name.set(declaration.displayName)

buildSrc/src/main/kotlin/plugins/DexMethodCount.kt

@@ -6,15 +6,12 @@
 import com.jakewharton.dex.*
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
-import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.provider.ListProperty
-import org.gradle.api.provider.Property
 import org.gradle.api.tasks.*
 import org.gradle.jvm.tasks.Jar
 import java.io.File
 
 @CacheableTask
-abstract class DexMethodCount : DefaultTask() {
+open class DexMethodCount : DefaultTask() {
 
     data class Counts(
         val total: Int,
@@ -27,18 +24,16 @@ abstract class DexMethodCount : DefaultTask() {
     @Classpath
     lateinit var jarFile: File
 
-    @get:Optional
-    @get:Input
-    abstract val ownPackages: ListProperty<String>
+    @Optional
+    @Input
+    var ownPackages: List<String>? = null
 
     @Internal
     var artifactName: String? = null
 
-    private val projectName = project.name
-
     @get:Input
     val artifactOrArchiveName: String
-        get() = artifactName ?: projectName
+        get() = artifactName ?: project.name
 
     fun from(jar: Jar) {
         jarFile = jar.archiveFile.get().asFile
@@ -46,13 +41,12 @@ abstract class DexMethodCount : DefaultTask() {
         dependsOn(jar)
     }
 
-    @Internal // plain output properties are not supported, mark as internal to suppress warning from validatePlugins
+    @Internal // plain output properties are not supported, mark as internal to suppress warning from validateTaskProperties
     lateinit var counts: Counts
 
     @get:OutputFile
-    val detailOutputFile: File by lazy {
-        project.buildDir.resolve("$artifactOrArchiveName-method-count.txt")
-    }
+    val detailOutputFile: File
+        get() = project.buildDir.resolve("$artifactOrArchiveName-method-count.txt")
 
     @TaskAction
     fun invoke() {
@@ -65,9 +59,9 @@ abstract class DexMethodCount : DefaultTask() {
         val byPackage = this.groupingBy { it.`package` }.eachCount()
         val byClass = this.groupingBy { it.declaringType }.eachCount()
 
-        val ownPackages = ownPackages.map { list -> list.map { "$it." } }
-        val byOwnPackages = if (ownPackages.isPresent) {
-            this.partition { method -> ownPackages.get().any { method.declaringType.startsWith(it) } }.let {
+        val ownPackages = ownPackages?.map { "$it." }
+        val byOwnPackages = if (ownPackages != null) {
+            this.partition { method -> ownPackages.any { method.declaringType.startsWith(it) } }.let {
                 it.first.size to it.second.size
             }
         } else (null to null)
@@ -84,7 +78,7 @@ abstract class DexMethodCount : DefaultTask() {
     private fun outputDetails(counts: Counts) {
         detailOutputFile.printWriter().use { writer ->
             writer.println("${counts.total.padRight()}\tTotal methods")
-            ownPackages.orNull?.let { packages ->
+            ownPackages?.let { packages ->
                 writer.println("${counts.totalOwnPackages?.padRight()}\tTotal methods from packages ${packages.joinToString { "$it.*" }}")
                 writer.println("${counts.totalOtherPackages?.padRight()}\tTotal methods from other packages")
             }
@@ -102,24 +96,23 @@ abstract class DexMethodCount : DefaultTask() {
     }
 }
 
-abstract class DexMethodCountStats : DefaultTask() {
+open class DexMethodCountStats : DefaultTask() {
+
+    @Internal
+    lateinit var from: TaskProvider<DexMethodCount>
+
     @get:InputFile
-    internal abstract val inputFile: RegularFileProperty
-
-    @get:Input
-    internal abstract val artifactOrArchiveName: Property<String>
-
-    @get:Input
-    @get:Optional
-    internal abstract val ownPackages: ListProperty<String>
+    internal val inputFile
+        get() = from.get().detailOutputFile
 
     @TaskAction
     private fun printStats() {
-        val artifactOrArchiveName = artifactOrArchiveName.get()
-        inputFile.get().asFile.reader().useLines { lines ->
+        val artifactOrArchiveName = from.get().artifactOrArchiveName
+        inputFile.reader().useLines { lines ->
             fun String.getStatValue() = substringBefore("\t").trim()
 
-            val statsLineCount = if (!ownPackages.isPresent) 1 else 3
+            val ownPackages = from.get().ownPackages
+            val statsLineCount = if (ownPackages == null) 1 else 3
             val stats = lines.take(statsLineCount).map { it.getStatValue() }.toList()
 
             val total = stats[0]
@@ -129,7 +122,7 @@ abstract class DexMethodCountStats : DefaultTask() {
                 println("##teamcity[buildStatisticValue key='DexMethodCount_${artifactOrArchiveName}' value='$total']")
             }
 
-            ownPackages.map { packages ->
+            ownPackages?.let { packages ->
                 val totalOwnPackages = stats[1]
                 val totalOtherPackages = stats[2]
 
@@ -148,9 +141,7 @@ abstract class DexMethodCountStats : DefaultTask() {
 fun Project.printStats(dexMethodCount: TaskProvider<DexMethodCount>) {
     val dexMethodCountStats = tasks.register("dexMethodCountStats", DexMethodCountStats::class.java) {
         dependsOn(dexMethodCount)
-        inputFile.set(dexMethodCount.flatMap { objects.fileProperty().apply { set(it.detailOutputFile) } })
-        artifactOrArchiveName.set(dexMethodCount.map { it.artifactOrArchiveName })
-        ownPackages.set(dexMethodCount.flatMap { it.ownPackages })
+        from = dexMethodCount
     }
 
     dexMethodCount.configure {

buildSrc/src/main/kotlin/plugins/KotlinBuildPublishingPlugin.kt

@@ -1,33 +1,35 @@
 /*
- * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 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 plugins
 
-import PublishToMavenLocalSerializable
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.attributes.Usage
+import org.gradle.api.component.AdhocComponentWithVariants
 import org.gradle.api.component.SoftwareComponentFactory
 import org.gradle.api.plugins.JavaBasePlugin
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
-import org.gradle.api.publish.maven.tasks.PublishToMavenLocal
 import org.gradle.api.publish.maven.tasks.PublishToMavenRepository
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.*
+import org.gradle.plugins.signing.Sign
 import org.gradle.plugins.signing.SigningExtension
 import org.gradle.plugins.signing.SigningPlugin
 import java.util.*
 import javax.inject.Inject
 
+
 class KotlinBuildPublishingPlugin @Inject constructor(
     private val componentFactory: SoftwareComponentFactory
 ) : Plugin<Project> {
     override fun apply(target: Project): Unit = with(target) {
         apply<MavenPublishPlugin>()
+        apply<SigningPlugin>()
 
         val publishedRuntime = configurations.maybeCreate(RUNTIME_CONFIGURATION).apply {
             isCanBeConsumed = false
@@ -45,7 +47,7 @@ class KotlinBuildPublishingPlugin @Inject constructor(
             }
         }
 
-        val kotlinLibraryComponent = componentFactory.adhoc(ADHOC_COMPONENT_NAME)
+        val kotlinLibraryComponent = componentFactory.adhoc(ADHOC_COMPONENT_NAME) as AdhocComponentWithVariants
         components.add(kotlinLibraryComponent)
         kotlinLibraryComponent.addVariantsFromConfiguration(publishedCompile) { mapToMavenScope("compile") }
         kotlinLibraryComponent.addVariantsFromConfiguration(publishedRuntime) { mapToMavenScope("runtime") }
@@ -71,11 +73,62 @@ class KotlinBuildPublishingPlugin @Inject constructor(
                 create<MavenPublication>(PUBLICATION_NAME) {
                     from(kotlinLibraryComponent)
 
-                    configureKotlinPomAttributes(project)
+                    pom {
+                        packaging = "jar"
+                        name.set(humanReadableName(project))
+                        description.set(project.description ?: humanReadableName(project))
+                        url.set("https://kotlinlang.org/")
+                        licenses {
+                            license {
+                                name.set("The Apache License, Version 2.0")
+                                url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                            }
+                        }
+                        scm {
+                            url.set("https://github.com/JetBrains/kotlin")
+                            connection.set("scm:git:https://github.com/JetBrains/kotlin.git")
+                            developerConnection.set("scm:git:https://github.com/JetBrains/kotlin.git")
+                        }
+                        developers {
+                            developer {
+                                name.set("Kotlin Team")
+                                organization.set("JetBrains")
+                                organizationUrl.set("https://www.jetbrains.com")
+                            }
+                        }
+                    }
+                }
+            }
+
+            repositories {
+                maven {
+                    name = REPOSITORY_NAME
+                    url = file("${project.rootDir}/build/repo").toURI()
                 }
             }
         }
-        configureDefaultPublishing()
+
+        val signingRequired = provider {
+            project.findProperty("signingRequired")?.toString()?.toBoolean()
+                ?: project.property("isSonatypeRelease") as Boolean
+        }
+
+        configure<SigningExtension> {
+            setRequired(signingRequired)
+            sign(extensions.getByType<PublishingExtension>().publications[PUBLICATION_NAME])
+            useGpgCmd()
+        }
+
+        tasks.withType<Sign>().configureEach {
+            setOnlyIf { signingRequired.get() }
+        }
+
+        tasks.register("install") {
+            dependsOn(tasks.named("publishToMavenLocal"))
+        }
+
+        tasks.named<PublishToMavenRepository>("publish${PUBLICATION_NAME}PublicationTo${REPOSITORY_NAME}Repository")
+            .configureRepository()
     }
 
     companion object {
@@ -86,92 +139,13 @@ class KotlinBuildPublishingPlugin @Inject constructor(
         const val COMPILE_CONFIGURATION = "publishedCompile"
         const val RUNTIME_CONFIGURATION = "publishedRuntime"
 
+        @UseExperimental(ExperimentalStdlibApi::class)
+        fun humanReadableName(project: Project) =
+            project.name.split("-").joinToString(separator = " ") { it.capitalize(Locale.ROOT) }
     }
 }
 
-@OptIn(ExperimentalStdlibApi::class)
-private fun humanReadableName(name: String) =
-    name.split("-").joinToString(separator = " ") { it.capitalize(Locale.ROOT) }
-
-fun MavenPublication.configureKotlinPomAttributes(project: Project, explicitDescription: String? = null) {
-    val publication = this
-    pom {
-        packaging = "jar"
-        name.set(humanReadableName(publication.artifactId))
-        description.set(explicitDescription ?: project.description ?: humanReadableName(publication.artifactId))
-        url.set("https://kotlinlang.org/")
-        licenses {
-            license {
-                name.set("The Apache License, Version 2.0")
-                url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-            }
-        }
-        scm {
-            url.set("https://github.com/JetBrains/kotlin")
-            connection.set("scm:git:https://github.com/JetBrains/kotlin.git")
-            developerConnection.set("scm:git:https://github.com/JetBrains/kotlin.git")
-        }
-        developers {
-            developer {
-                name.set("Kotlin Team")
-                organization.set("JetBrains")
-                organizationUrl.set("https://www.jetbrains.com")
-            }
-        }
-    }
-}
-
-
-fun Project.configureDefaultPublishing() {
-    configure<PublishingExtension> {
-        repositories {
-            maven {
-                name = KotlinBuildPublishingPlugin.REPOSITORY_NAME
-                url = file("${project.rootDir}/build/repo").toURI()
-            }
-        }
-    }
-
-    val signingRequired = project.providers.gradleProperty("signingRequired").forUseAtConfigurationTime().orNull?.toBoolean()
-        ?: project.providers.gradleProperty("isSonatypeRelease").forUseAtConfigurationTime().orNull?.toBoolean() ?: false
-
-    if (signingRequired) {
-        apply<SigningPlugin>()
-        configureSigning()
-    }
-
-    tasks.register("install") {
-        dependsOn(tasks.named("publishToMavenLocal"))
-    }
-
-    // workaround for Gradle configuration cache
-    // TODO: remove it when https://github.com/gradle/gradle/pull/16945 merged into used in build Gradle version
-    tasks.withType(PublishToMavenLocal::class.java) {
-        val originalTask = this
-        val serializablePublishTask =
-            tasks.register(originalTask.name + "Serializable", PublishToMavenLocalSerializable::class.java) {
-                publication = originalTask.publication
-            }
-        originalTask.onlyIf { false }
-        originalTask.dependsOn(serializablePublishTask)
-    }
-
-    tasks.withType<PublishToMavenRepository>()
-        .matching { it.name.endsWith("PublicationTo${KotlinBuildPublishingPlugin.REPOSITORY_NAME}Repository") }
-        .all { configureRepository() }
-}
-
-private fun Project.configureSigning() {
-    configure<SigningExtension> {
-        sign(extensions.getByType<PublishingExtension>().publications) // all publications
-        useGpgCmd()
-    }
-}
-
-fun TaskProvider<PublishToMavenRepository>.configureRepository() =
-    configure { configureRepository() }
-
-private fun PublishToMavenRepository.configureRepository() {
+fun TaskProvider<PublishToMavenRepository>.configureRepository() = configure {
     dependsOn(project.rootProject.tasks.named("preparePublication"))
     doFirst {
         val preparePublication = project.rootProject.tasks.named("preparePublication").get()

buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt

@@ -1,4 +1,3 @@
-@file:Suppress("DEPRECATION")
 package plugins
 
 import org.codehaus.groovy.runtime.InvokerHelper
@@ -17,8 +16,10 @@ import org.gradle.plugins.signing.Sign
 import org.gradle.plugins.signing.SigningExtension
 import kotlin.properties.Delegates
 
+
 /**
  * Configures a Kotlin module for publication.
+ *
  */
 open class PublishedKotlinModule : Plugin<Project> {
 

buildSrc/src/main/kotlin/sourceSets.kt

@@ -30,7 +30,6 @@ val SourceSet.projectDefault: Project.() -> Unit
             }
             "test" -> {
                 java.srcDirs("test", "tests")
-                this@projectDefault.resources.srcDir("testResources")
             }
         }
     }

buildSrc/src/main/kotlin/tasks.kt

@@ -1,238 +1,188 @@
 /*
- * Copyright 2010-2021 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-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.
  */
 
 
 // usages in build scripts are not tracked properly
 @file:Suppress("unused")
 
-import org.gradle.api.InvalidUserDataException
 import org.gradle.api.Project
 import org.gradle.api.Task
-import org.gradle.api.artifacts.ProjectDependency
-import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.internal.tasks.testing.filter.DefaultTestFilter
-import org.gradle.api.publish.internal.PublishOperation
-import org.gradle.api.publish.maven.internal.publication.MavenPublicationInternal
-import org.gradle.api.publish.maven.internal.publisher.MavenNormalizedPublication
-import org.gradle.api.publish.maven.internal.publisher.MavenPublisher
-import org.gradle.api.publish.maven.internal.publisher.ValidatingMavenPublisher
-import org.gradle.api.publish.maven.tasks.AbstractPublishToMaven
-import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.api.tasks.testing.Test
-import org.gradle.internal.serialization.Cached
 import org.gradle.kotlin.dsl.extra
 import org.gradle.kotlin.dsl.project
-import org.gradle.kotlin.dsl.support.serviceOf
 import java.io.File
 import java.lang.Character.isLowerCase
 import java.lang.Character.isUpperCase
 import java.nio.file.Files
 import java.nio.file.Path
 
-val kotlinGradlePluginAndItsRequired = arrayOf(
-    ":kotlin-allopen",
-    ":kotlin-noarg",
-    ":kotlin-sam-with-receiver",
-    ":kotlin-android-extensions",
-    ":kotlin-android-extensions-runtime",
-    ":kotlin-parcelize-compiler",
-    ":kotlin-build-common",
-    ":kotlin-compiler-embeddable",
-    ":native:kotlin-native-utils",
-    ":kotlin-util-klib",
-    ":kotlin-util-io",
-    ":kotlin-compiler-runner",
-    ":kotlin-daemon-embeddable",
-    ":kotlin-daemon-client",
-    ":kotlin-project-model",
-    ":kotlin-gradle-plugin-api",
-    ":kotlin-gradle-plugin",
-    ":kotlin-gradle-plugin-model",
-    ":kotlin-tooling-metadata",
-    ":kotlin-reflect",
-    ":kotlin-annotation-processing-gradle",
-    ":kotlin-test",
-    ":kotlin-gradle-subplugin-example",
-    ":kotlin-stdlib-common",
-    ":kotlin-stdlib",
-    ":kotlin-stdlib-jdk7",
-    ":kotlin-stdlib-jdk8",
-    ":kotlin-stdlib-js",
-    ":examples:annotation-processor-example",
-    ":kotlin-script-runtime",
-    ":kotlin-scripting-common",
-    ":kotlin-scripting-jvm",
-    ":kotlin-scripting-compiler-embeddable",
-    ":kotlin-scripting-compiler-impl-embeddable",
-    ":kotlin-serialization",
-    ":kotlin-test-js-runner",
-    ":native:kotlin-klib-commonizer-embeddable",
-    ":native:kotlin-klib-commonizer-api",
-    ":native:kotlin-native-utils"
-)
-
-fun Task.dependsOnKotlinGradlePluginInstall() {
-    kotlinGradlePluginAndItsRequired.forEach {
-        dependsOn("${it}:install")
-    }
+fun Task.dependsOnKotlinPluginInstall() {
+    dependsOn(
+        ":kotlin-allopen:install",
+        ":kotlin-noarg:install",
+        ":kotlin-sam-with-receiver:install",
+        ":kotlin-android-extensions:install",
+        ":kotlin-parcelize-compiler:install",
+        ":kotlin-build-common:install",
+        ":kotlin-compiler-embeddable:install",
+        ":native:kotlin-native-utils:install",
+        ":kotlin-util-klib:install",
+        ":kotlin-util-io:install",
+        ":kotlin-compiler-runner:install",
+        ":kotlin-daemon-embeddable:install",
+        ":kotlin-daemon-client:install",
+        ":kotlin-gradle-plugin-api:install",
+        ":kotlin-gradle-plugin:install",
+        ":kotlin-gradle-plugin-model:install",
+        ":kotlin-reflect:install",
+        ":kotlin-annotation-processing-gradle:install",
+        ":kotlin-test:kotlin-test-common:install",
+        ":kotlin-test:kotlin-test-annotations-common:install",
+        ":kotlin-test:kotlin-test-jvm:install",
+        ":kotlin-test:kotlin-test-js:install",
+        ":kotlin-test:kotlin-test-junit:install",
+        ":kotlin-gradle-subplugin-example:install",
+        ":kotlin-stdlib-common:install",
+        ":kotlin-stdlib:install",
+        ":kotlin-stdlib-jdk8:install",
+        ":kotlin-stdlib-js:install",
+        ":examples:annotation-processor-example:install",
+        ":kotlin-script-runtime:install",
+        ":kotlin-scripting-common:install",
+        ":kotlin-scripting-jvm:install",
+        ":kotlin-scripting-compiler-embeddable:install",
+        ":kotlin-scripting-compiler-impl-embeddable:install",
+        ":kotlin-test-js-runner:install",
+        ":native:kotlin-klib-commonizer-embeddable:install"
+    )
 }
 
-fun Task.dependsOnKotlinGradlePluginPublish() {
-    kotlinGradlePluginAndItsRequired.forEach {
-        project.rootProject.tasks.findByPath("${it}:publish")?.let { task ->
-            dependsOn(task)
-        }
-    }
-}
-
-/**
- * @param parallel is redundant if @param jUnit5Enabled is true, because
- *   JUnit5 supports parallel test execution by itself, without gradle help
- */
 fun Project.projectTest(
     taskName: String = "test",
     parallel: Boolean = false,
     shortenTempRootName: Boolean = false,
-    jUnit5Enabled: Boolean = false,
     body: Test.() -> Unit = {}
-): TaskProvider<Test> {
-    val shouldInstrument = project.providers.gradleProperty("kotlin.test.instrumentation.disable")
-        .forUseAtConfigurationTime().orNull?.toBoolean() != true
-    if (shouldInstrument) {
-        evaluationDependsOn(":test-instrumenter")
-    }
-    return getOrCreateTask<Test>(taskName) {
-        doFirst {
-            val commandLineIncludePatterns = (filter as? DefaultTestFilter)?.commandLineIncludePatterns ?: mutableSetOf()
-            val patterns = filter.includePatterns + commandLineIncludePatterns
-            if (patterns.isEmpty() || patterns.any { '*' in it }) return@doFirst
-            patterns.forEach { pattern ->
-                var isClassPattern = false
-                val maybeMethodName = pattern.substringAfterLast('.')
-                val maybeClassFqName = if (maybeMethodName.isFirstChar(::isLowerCase)) {
-                    pattern.substringBeforeLast('.')
+): TaskProvider<Test> = getOrCreateTask(taskName) {
+    doFirst {
+        val commandLineIncludePatterns = (filter as? DefaultTestFilter)?.commandLineIncludePatterns ?: mutableSetOf()
+        val patterns = filter.includePatterns + commandLineIncludePatterns
+        if (patterns.isEmpty() || patterns.any { '*' in it }) return@doFirst
+        patterns.forEach { pattern ->
+            var isClassPattern = false
+            val maybeMethodName = pattern.substringAfterLast('.')
+            val maybeClassFqName = if (maybeMethodName.isFirstChar(::isLowerCase)) {
+                pattern.substringBeforeLast('.')
+            } else {
+                isClassPattern = true
+                pattern
+            }
+
+            if (!maybeClassFqName.substringAfterLast('.').isFirstChar(::isUpperCase)) {
+                return@forEach
+            }
+
+            val classFileNameWithoutExtension = maybeClassFqName.replace('.', '/')
+            val classFileName = "$classFileNameWithoutExtension.class"
+
+            if (isClassPattern) {
+                val innerClassPattern = "$pattern$*"
+                if (pattern in commandLineIncludePatterns) {
+                    commandLineIncludePatterns.add(innerClassPattern)
+                    (filter as? DefaultTestFilter)?.setCommandLineIncludePatterns(commandLineIncludePatterns)
                 } else {
-                    isClassPattern = true
-                    pattern
+                    filter.includePatterns.add(innerClassPattern)
                 }
+            }
 
-                if (!maybeClassFqName.substringAfterLast('.').isFirstChar(::isUpperCase)) {
-                    return@forEach
-                }
-
-                val classFileNameWithoutExtension = maybeClassFqName.replace('.', '/')
-                val classFileName = "$classFileNameWithoutExtension.class"
-
-                if (isClassPattern) {
-                    val innerClassPattern = "$pattern$*"
-                    if (pattern in commandLineIncludePatterns) {
-                        commandLineIncludePatterns.add(innerClassPattern)
-                        (filter as? DefaultTestFilter)?.setCommandLineIncludePatterns(commandLineIncludePatterns)
-                    } else {
-                        filter.includePatterns.add(innerClassPattern)
-                    }
-                }
-
-                val parentNames = if (jUnit5Enabled) {
-                    /*
-                     * If we run test from inner test class with junit 5 we need
-                     *   to include all containing classes of our class
-                     */
-                    val nestedNames = classFileNameWithoutExtension.split("$")
-                    mutableListOf(nestedNames.first()).also {
-                        for (s in nestedNames.subList(1, nestedNames.size)) {
-                            it += "${it.last()}\$$s"
-                        }
-                    }
-                } else emptyList()
-
-                include { treeElement ->
-                    val path = treeElement.path
-                    if (treeElement.isDirectory) {
-                        classFileNameWithoutExtension.startsWith(path)
-                    } else {
-                        if (jUnit5Enabled) {
-                            path == classFileName || (path.endsWith(".class") && parentNames.any { path.startsWith(it) })
-                        } else {
-                            path == classFileName || (path.endsWith(".class") && path.startsWith("$classFileNameWithoutExtension$"))
-                        }
-                    }
+            include {
+                val path = it.path
+                if (it.isDirectory) {
+                    classFileNameWithoutExtension.startsWith(path)
+                } else {
+                    path == classFileName || (path.endsWith(".class") && path.startsWith("$classFileNameWithoutExtension$"))
                 }
             }
         }
+    }
 
-        if (shouldInstrument) {
-            val instrumentationArgsProperty = project.providers.gradleProperty("kotlin.test.instrumentation.args")
-            val testInstrumenterOutputs = project.tasks.findByPath(":test-instrumenter:jar")!!.outputs.files
-            doFirst {
-                val agent = testInstrumenterOutputs.singleFile
-                val args = instrumentationArgsProperty.orNull?.let { "=$it" }.orEmpty()
-                jvmArgs("-javaagent:$agent$args")
-            }
-            dependsOn(":test-instrumenter:jar")
-        }
-
-        jvmArgs(
-            "-ea",
-            "-XX:+HeapDumpOnOutOfMemoryError",
-            "-XX:+UseCodeCacheFlushing",
-            "-XX:ReservedCodeCacheSize=256m",
-            "-Djna.nosys=true"
-        )
-
-        maxHeapSize = "1600m"
-        systemProperty("idea.is.unit.test", "true")
-        systemProperty("idea.home.path", project.intellijRootDir().canonicalPath)
-        systemProperty("java.awt.headless", "true")
-        environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
-        environment("PROJECT_CLASSES_DIRS", project.testSourceSet.output.classesDirs.asPath)
-        environment("PROJECT_BUILD_DIR", project.buildDir)
-        systemProperty("jps.kotlin.home", project.rootProject.extra["distKotlinHomeDir"]!!)
-        systemProperty("kotlin.ni", if (project.rootProject.hasProperty("newInferenceTests")) "true" else "false")
-        systemProperty("org.jetbrains.kotlin.skip.muted.tests", if (project.rootProject.hasProperty("skipMutedTests")) "true" else "false")
-
-        if (Platform[202].orHigher()) {
-            systemProperty("idea.ignore.disabled.plugins", "true")
-        }
-
-        var subProjectTempRoot: Path? = null
-        val projectName = project.name
-        val teamcity = project.rootProject.findProperty("teamcity") as? Map<*, *>
+    if (project.findProperty("kotlin.test.instrumentation.disable")?.toString()?.toBoolean() != true) {
         doFirst {
-            val systemTempRoot =
-                // TC by default doesn't switch `teamcity.build.tempDir` to 'java.io.tmpdir' so it could cause to wasted disk space
-                // Should be fixed soon on Teamcity side
-                (teamcity?.get("teamcity.build.tempDir") as? String)
-                    ?: System.getProperty("java.io.tmpdir")
-            systemTempRoot.let {
-                val prefix = (projectName + "Project_" + taskName + "_").takeUnless { shortenTempRootName }
-                subProjectTempRoot = Files.createTempDirectory(File(systemTempRoot).toPath(), prefix)
-                systemProperty("java.io.tmpdir", subProjectTempRoot.toString())
+            val agent = tasks.findByPath(":test-instrumenter:jar")!!.outputs.files.singleFile
+            val args = project.findProperty("kotlin.test.instrumentation.args")?.let { "=$it" }.orEmpty()
+            jvmArgs("-javaagent:$agent$args")
+        }
+        dependsOn(":test-instrumenter:jar")
+    }
+
+    jvmArgs(
+        "-ea",
+        "-XX:+HeapDumpOnOutOfMemoryError",
+        "-XX:+UseCodeCacheFlushing",
+        "-XX:ReservedCodeCacheSize=256m",
+        "-Djna.nosys=true"
+    )
+
+    maxHeapSize = "1600m"
+    systemProperty("idea.is.unit.test", "true")
+    systemProperty("idea.home.path", intellijRootDir().canonicalPath)
+    systemProperty("java.awt.headless", "true")
+    environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
+    environment("PROJECT_CLASSES_DIRS", testSourceSet.output.classesDirs.asPath)
+    environment("PROJECT_BUILD_DIR", buildDir)
+    systemProperty("jps.kotlin.home", rootProject.extra["distKotlinHomeDir"]!!)
+    systemProperty("kotlin.ni", if (rootProject.hasProperty("newInferenceTests")) "true" else "false")
+    systemProperty("org.jetbrains.kotlin.skip.muted.tests", if (rootProject.hasProperty("skipMutedTests")) "true" else "false")
+
+    if (Platform[202].orHigher()) {
+        systemProperty("idea.ignore.disabled.plugins", "true")
+    }
+
+    var subProjectTempRoot: Path? = null
+    doFirst {
+        val teamcity = rootProject.findProperty("teamcity") as? Map<Any?, *>
+        val systemTempRoot =
+            // TC by default doesn't switch `teamcity.build.tempDir` to 'java.io.tmpdir' so it could cause to wasted disk space
+            // Should be fixed soon on Teamcity side
+            (teamcity?.get("teamcity.build.tempDir") as? String)
+                ?: System.getProperty("java.io.tmpdir")
+        systemTempRoot.let {
+            val prefix = (project.name + "Project_" + taskName + "_").takeUnless { shortenTempRootName }
+            subProjectTempRoot = Files.createTempDirectory(File(systemTempRoot).toPath(), prefix)
+            systemProperty("java.io.tmpdir", subProjectTempRoot.toString())
+        }
+    }
+
+    doLast {
+        subProjectTempRoot?.let {
+            try {
+                delete(it)
+            } catch (e: Exception) {
+                project.logger.warn("Can't delete test temp root folder $it", e.printStackTrace())
             }
         }
+    }
 
-        val fs = project.serviceOf<FileSystemOperations>()
-        doLast {
-            subProjectTempRoot?.let {
-                try {
-                    fs.delete {
-                        delete(it)
-                    }
-                } catch (e: Exception) {
-                    logger.warn("Can't delete test temp root folder $it", e.printStackTrace())
-                }
-            }
-        }
-
-        if (parallel && !jUnit5Enabled) {
-            maxParallelForks =
-                project.providers.gradleProperty("kotlin.test.maxParallelForks").forUseAtConfigurationTime().orNull?.toInt()
-                    ?: (Runtime.getRuntime().availableProcessors() / if (project.kotlinBuildProperties.isTeamcityBuild) 2 else 4).coerceAtLeast(1)
-        }
-    }.apply { configure(body) }
+    if (parallel) {
+        maxParallelForks =
+            project.findProperty("kotlin.test.maxParallelForks")?.toString()?.toInt()
+                ?: Math.max(Runtime.getRuntime().availableProcessors() / if (kotlinBuildProperties.isTeamcityBuild) 2 else 4, 1)
+    }
+    body()
 }
 
 private inline fun String.isFirstChar(f: (Char) -> Boolean) = isNotEmpty() && f(first())
@@ -259,25 +209,18 @@ private fun Task.useAndroidConfiguration(systemPropertyName: String, configName:
     val configuration = with(project) {
         configurations.getOrCreate(configName)
             .also {
-                if (it.allDependencies.matching { dep ->
-                        dep is ProjectDependency &&
-                                dep.targetConfiguration == configName &&
-                                dep.dependencyProject.path == ":dependencies:android-sdk"
-                    }.count() == 0) {
-                    dependencies.add(
-                        configName,
-                        dependencies.project(":dependencies:android-sdk", configuration = configName)
-                    )
-                }
+                dependencies.add(
+                    configName,
+                    dependencies.project(":dependencies:android-sdk", configuration = configName)
+                )
             }
     }
 
     dependsOn(configuration)
 
     if (this is Test) {
-        val androidFilePath = configuration.singleFile.canonicalPath
         doFirst {
-            systemProperty(systemPropertyName, androidFilePath)
+            systemProperty(systemPropertyName, configuration.singleFile.canonicalPath)
         }
     }
 }
@@ -289,30 +232,3 @@ fun Task.useAndroidSdk() {
 fun Task.useAndroidJar() {
     TaskUtils.useAndroidJar(this)
 }
-
-// Workaround to make PublishToMavenLocal compatible with Gradle configuration cache
-// TODO: remove it when https://github.com/gradle/gradle/pull/16945 merged into used in build Gradle version
-abstract class PublishToMavenLocalSerializable : AbstractPublishToMaven() {
-    private val normalizedPublication = Cached.of { this.computeNormalizedPublication() }
-
-    private fun computeNormalizedPublication(): MavenNormalizedPublication {
-        val publicationInternal: MavenPublicationInternal = publicationInternal
-            ?: throw InvalidUserDataException("The 'publication' property is required")
-        duplicatePublicationTracker.checkCanPublishToMavenLocal(publicationInternal)
-        return publicationInternal.asNormalisedPublication()
-    }
-
-    @TaskAction
-    open fun publish() {
-        val normalizedPublication = normalizedPublication.get()
-        object : PublishOperation(normalizedPublication.name, "mavenLocal") {
-            override fun publish() {
-                val localPublisher = mavenPublishers.getLocalPublisher(
-                    temporaryDirFactory
-                )
-                val validatingPublisher: MavenPublisher = ValidatingMavenPublisher(localPublisher)
-                validatingPublisher.publish(normalizedPublication, null)
-            }
-        }.run()
-    }
-}

buildSrc/src/main/kotlin/testDistribution.kt

@@ -1,30 +0,0 @@
-/*
- * Copyright 2010-2020 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.
- */
-
-import com.gradle.enterprise.gradleplugin.testdistribution.TestDistributionExtension
-import org.gradle.api.tasks.testing.Test
-import org.gradle.internal.os.OperatingSystem
-
-
-fun Test.configureTestDistribution(configure: TestDistributionExtension.() -> Unit = {}) {
-    if (extensions.findByType(TestDistributionExtension::class.java) == null) return
-
-    val isTeamcityBuild = project.kotlinBuildProperties.isTeamcityBuild
-
-    useJUnitPlatform()
-    extensions.configure(TestDistributionExtension::class.java) {
-        enabled.set(true)
-        maxRemoteExecutors.set(20)
-        if (isTeamcityBuild) {
-            requirements.set(setOf("os=${OperatingSystem.current().familyName}"))
-        } else {
-            maxLocalExecutors.set(0)
-        }
-        configure()
-    }
-}
-
-fun Test.isTestDistributionEnabled(): Boolean =
-    extensions.findByType(TestDistributionExtension::class.java)?.enabled?.orNull ?: false