MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Bundle 1.7.0-RC Kotlin JPS plug-in as a default one

Browse Source 
^KTIJ-21635

GitOrigin-RevId: 3499b9736ce4d21633039bc3ad3e9daf5f47e146
This commit is contained in:
Mikhail Zarechenskiy
2022-05-30 20:27:41 +00:00
committed by intellij-monorepo-bot
parent c317fc5bc5
commit 65f2819253
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/kotlinc_kotlin_dist.xml
Generated
+3 -3
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.6.21-release-357" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-dist-for-ide:1.7.0-RC-246" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.6.21-release-357/kotlin-dist-for-ide-1.6.21-release-357.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.7.0-RC-246/kotlin-dist-for-ide-1.7.0-RC-246.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.6.21-release-357/kotlin-dist-for-ide-1.6.21-release-357-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-dist-for-ide/1.7.0-RC-246/kotlin-dist-for-ide-1.7.0-RC-246-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/kotlinc_kotlin_jps_plugin_classpath.xml
Generated
+3 -3
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.6.21-release-357" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-plugin-classpath:1.7.0-RC-246" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.6.21-release-357/kotlin-jps-plugin-classpath-1.6.21-release-357.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.7.0-RC-246/kotlin-jps-plugin-classpath-1.7.0-RC-246.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.6.21-release-357/kotlin-jps-plugin-classpath-1.6.21-release-357-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-classpath/1.7.0-RC-246/kotlin-jps-plugin-classpath-1.7.0-RC-246-sources.jar!/" />
</SOURCES>
</library>
</component>
.idea/libraries/kotlinc_kotlin_jps_plugin_tests.xml
Generated
+3 -3
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.6.21-release-357" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.kotlin:kotlin-jps-plugin-tests-for-ide:1.7.0-RC-246" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.6.21-release-357/kotlin-jps-plugin-tests-for-ide-1.6.21-release-357.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.7.0-RC-246/kotlin-jps-plugin-tests-for-ide-1.7.0-RC-246.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.6.21-release-357/kotlin-jps-plugin-tests-for-ide-1.6.21-release-357-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-jps-plugin-tests-for-ide/1.7.0-RC-246/kotlin-jps-plugin-tests-for-ide-1.7.0-RC-246-sources.jar!/" />
</SOURCES>
</library>
</component>
plugins/kotlin/maven/tests/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenImporterTest.kt
+1 -1
View File
@@ -2212,7 +2212,7 @@ abstract class AbstractKotlinMavenImporterTest : KotlinMavenImportingTestCase()
}
assertEquals(
"The bundled version (1.6.21-release-357) of the Kotlin JPS plugin will be used<br>" +
"The bundled version (1.7.0-RC-246) of the Kotlin JPS plugin will be used<br>" +
"The reason: Kotlin JPS compiler maximum supported version is '$maxVersion' but '$versionToImport' is specified",
text
)
plugins/kotlin/util/project-model-updater/resources/model.properties
+1 -1
View File
@@ -1,4 +1,4 @@
jpsPluginVersion=1.6.21-release-357
jpsPluginVersion=1.7.0-RC-246
kotlincVersion=1.7.20-dev-1059
kotlincArtifactsMode=MAVEN
jpsPluginArtifactsMode=MAVEN