Update bundled Kotlin JPS plugin

^KTIJ-25154 Fixed

1.8.20 is released, we need to update Kotlin JPS plugin and cherry-pick
it to 231

GitOrigin-RevId: 1f2a211bfade4bdbd1720ec19069321fa7822c9a
This commit is contained in:
Nikita Bobko
2023-04-05 15:55:46 +02:00
committed by intellij-monorepo-bot
parent ff5e2f659b
commit e359fe6027
5 changed files with 10 additions and 24 deletions

View File

@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-dist" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-dist-for-ide:1.8.0-release-345" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-dist-for-ide:1.8.20-release-327" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.8.0-release-345/kotlin-dist-for-ide-1.8.0-release-345.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.8.20-release-327/kotlin-dist-for-ide-1.8.20-release-327.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.8.0-release-345/kotlin-dist-for-ide-1.8.0-release-345-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.8.20-release-327/kotlin-dist-for-ide-1.8.20-release-327-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-jps-plugin-classpath" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-plugin-classpath:1.8.0-release-345" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-plugin-classpath:1.8.20-release-327" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.8.0-release-345/kotlin-jps-plugin-classpath-1.8.0-release-345.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.8.20-release-327/kotlin-jps-plugin-classpath-1.8.20-release-327.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.8.0-release-345/kotlin-jps-plugin-classpath-1.8.0-release-345-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.8.20-release-327/kotlin-jps-plugin-classpath-1.8.20-release-327-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="kotlinc.kotlin-jps-plugin-tests" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-plugin-tests-for-ide:1.8.0-release-345" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-plugin-tests-for-ide:1.8.20-release-327" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.8.0-release-345/kotlin-jps-plugin-tests-for-ide-1.8.0-release-345.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.8.20-release-327/kotlin-jps-plugin-tests-for-ide-1.8.20-release-327.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.8.0-release-345/kotlin-jps-plugin-tests-for-ide-1.8.0-release-345-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.8.20-release-327/kotlin-jps-plugin-tests-for-ide-1.8.20-release-327-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -14,18 +14,4 @@ class CustomKotlinCompilerReferenceFirTest : CustomKotlinCompilerReferenceTest6(
override fun testTooltips() {
doTestTooltips(ClassInheritorsTooltip, CallableOverridingsTooltip)
}
override fun testMixedSubtypes() {
// drop after KTIJ-24828
var failed = false
try {
super.testMixedSubtypes()
} catch (e: AssertionFailedError) {
failed = true
}
if (!failed) {
error("Unmute me")
}
}
}

View File

@@ -1,7 +1,7 @@
kotlincVersion=1.9.0-dev-5105
kotlincArtifactsMode=MAVEN
jpsPluginVersion=1.8.0-release-345
jpsPluginVersion=1.8.20-release-327
jpsPluginArtifactsMode=MAVEN
bootstrapWithNative=false