Commit 4b3ff665 authored by Nikita Bobko's avatar Nikita Bobko Committed by intellij-monorepo-bot
Browse files

Split kotlin-stdlib-jdk8 and kotlin-reflect libraries

Kotlin plugin uses own kotlin stdlib artifact (not kotlin stdlib bundled
into IDEA) so we have to use two libraries to make it look more production like

Also this commit should fix broken incremental compilation in kt-212-master
on TeamCity because now we have to bootstrap only kotlinc.kotlin-stdlib.
Previously, we had to bootstrap kotlin-stdlib-jdk8 which caused problems
with incremental compilation because whole monorepo depends on this artifact

GitOrigin-RevId: 23b2a70604c5c578983b0d76cb8634b9ed301a59
parent 084d46d0
Showing with 70 additions and 29 deletions
+70 -29
<component name="libraryTable">
<library name="kotlin-reflect">
<library name="kotlin-reflect" type="repository">
<properties maven-id="org.jetbrains.kotlin:kotlin-reflect:1.5.10-release-896">
<exclude>
<dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib" />
</exclude>
</properties>
<CLASSES>
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-reflect/1.6.255/kotlin-reflect-1.6.255.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.5.10-release-896/kotlin-reflect-1.5.10-release-896.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-reflect/1.6.255/kotlin-reflect-1.6.255-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.5.10-release-896/kotlin-reflect-1.5.10-release-896-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="kotlin-stdlib-jdk8">
<library name="kotlin-stdlib-jdk8" type="repository">
<properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.10-release-896" >
<exclude>
<dependency maven-id="org.jetbrains:annotations" />
</exclude>
</properties>
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/lib/annotations/kotlin" />
<root url="file://$PROJECT_DIR$/community/lib/annotations/kotlin" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.255/kotlin-stdlib-jdk8-1.6.255.jar!/" />
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib/1.6.255/kotlin-stdlib-1.6.255.jar!/" />
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.255/kotlin-stdlib-common-1.6.255.jar!/" />
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.255/kotlin-stdlib-jdk7-1.6.255.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.10-release-896/kotlin-stdlib-jdk8-1.5.10-release-896.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.5.10-release-896/kotlin-stdlib-1.5.10-release-896.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.10-release-896/kotlin-stdlib-common-1.5.10-release-896.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.10-release-896/kotlin-stdlib-jdk7-1.5.10-release-896.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.255/kotlin-stdlib-jdk8-1.6.255-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib/1.6.255/kotlin-stdlib-1.6.255-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.255/kotlin-stdlib-common-1.6.255-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.255/kotlin-stdlib-jdk7-1.6.255-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.10-release-896/kotlin-stdlib-jdk8-1.5.10-release-896-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.5.10-release-896/kotlin-stdlib-1.5.10-release-896-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.10-release-896/kotlin-stdlib-common-1.5.10-release-896-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.10-release-896/kotlin-stdlib-jdk7-1.5.10-release-896-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="kotlinc.kotlin-reflect">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-reflect/1.6.255/kotlin-reflect-1.6.255.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-reflect/1.6.255/kotlin-reflect-1.6.255-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="kotlinc.kotlin-stdlib">
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/lib/annotations/kotlin" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.255/kotlin-stdlib-jdk8-1.6.255.jar!/" />
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib/1.6.255/kotlin-stdlib-1.6.255.jar!/" />
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.255/kotlin-stdlib-common-1.6.255.jar!/" />
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.255/kotlin-stdlib-jdk7-1.6.255.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.255/kotlin-stdlib-jdk8-1.6.255-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib/1.6.255/kotlin-stdlib-1.6.255-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.255/kotlin-stdlib-common-1.6.255-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/../build/repo/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.255/kotlin-stdlib-jdk7-1.6.255-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
......@@ -22,7 +22,7 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="library" exported="" scope="RUNTIME" name="kotlinc.kotlin-compiler-ir" level="project" />
<orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-cli" level="project" />
<orderEntry type="library" scope="TEST" name="kotlinc.kotlin-compiler-tests" level="project" />
......
......@@ -21,7 +21,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="library" name="Guava" level="project" />
<orderEntry type="library" name="JDOM" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-fe10" level="project" />
......
......@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-fe10" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-common" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-ir" level="project" />
......
......@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-fe10" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-common" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-ir" level="project" />
......
......@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-fe10" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-common" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-ir" level="project" />
......
......@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-fe10" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-common" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-ir" level="project" />
......
......@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-fe10" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-common" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-ir" level="project" />
......
......@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="module" module-name="kotlin.core" />
<orderEntry type="module" module-name="kotlin.gradle.gradle-tooling" />
<orderEntry type="module" module-name="kotlin.gradle.gradle-idea" />
......
......@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="library" name="JDOM" level="project" />
<orderEntry type="module" module-name="kotlin.core" />
<orderEntry type="module" module-name="kotlin.maven" />
......
......@@ -20,7 +20,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="library" name="kotlinc.compiler-components-for-jps" level="project" />
<orderEntry type="module" module-name="kotlin.maven" />
<orderEntry type="module" module-name="kotlin.gradle.gradle-idea" />
......
......@@ -20,7 +20,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-fe10" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-common" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-ir" level="project" />
......
......@@ -9,7 +9,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-fe10" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-common" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-ir" level="project" />
......
......@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="module" module-name="kotlin.core" />
<orderEntry type="module" module-name="kotlin.gradle.gradle-idea" />
<orderEntry type="module" module-name="kotlin.compiler-plugins.kotlinx-serialization.common" />
......
......@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="module" module-name="kotlin.maven" />
<orderEntry type="module" module-name="kotlin.compiler-plugins.annotation-based-compiler-support.common" />
<orderEntry type="module" module-name="kotlin.compiler-plugins.annotation-based-compiler-support.maven" />
......
......@@ -20,7 +20,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="library" name="kotlinc.lombok-compiler-plugin" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-fe10" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-common" level="project" />
......
......@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="library" name="kotlinc.kotlin-stdlib" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-fe10" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-common" level="project" />
<orderEntry type="library" exported="" name="kotlinc.kotlin-compiler-ir" level="project" />
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment