From 133e39b78377eb2b4cebced9eb38bc67cc3037c0 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 23 Dec 2020 19:59:52 +0300 Subject: [PATCH] Advance snapshot version 1.4.255 -> 1.5.255 (KTI-421) #KTI-421 Fixed --- gradle.properties | 2 +- .../gradle/MultiplePluginVersionGradleImportingTestCase.kt | 2 +- .../kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt | 2 +- libraries/examples/browser-example-with-library/pom.xml | 2 +- libraries/examples/browser-example/pom.xml | 2 +- libraries/examples/js-example/pom.xml | 2 +- libraries/examples/kotlin-java-example/pom.xml | 2 +- libraries/examples/kotlin-js-library-example/pom.xml | 2 +- libraries/pom.xml | 2 +- libraries/tools/kotlin-annotation-processing-maven/pom.xml | 2 +- libraries/tools/kotlin-bom/pom.xml | 2 +- libraries/tools/kotlin-maven-allopen/pom.xml | 2 +- libraries/tools/kotlin-maven-noarg/pom.xml | 2 +- libraries/tools/kotlin-maven-plugin-test/pom.xml | 2 +- libraries/tools/kotlin-maven-plugin/pom.xml | 2 +- libraries/tools/kotlin-maven-sam-with-receiver/pom.xml | 2 +- libraries/tools/kotlin-maven-serialization/pom.xml | 2 +- libraries/tools/kotlin-osgi-bundle/pom.xml | 2 +- libraries/tools/maven-archetypes/kotlin-archetype-js/pom.xml | 2 +- libraries/tools/maven-archetypes/kotlin-archetype-jvm/pom.xml | 2 +- libraries/tools/maven-archetypes/pom.xml | 2 +- .../kotlin/fir/plugin/AbstractFirAllOpenDiagnosticTest.kt | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/gradle.properties b/gradle.properties index dbb2da7fa85..3c804e7e43a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.parallel=true org.gradle.caching=true cacheRedirectorEnabled=true -defaultSnapshotVersion=1.4.255-SNAPSHOT +defaultSnapshotVersion=1.5.255-SNAPSHOT kotlin.compiler.effectSystemEnabled=true kotlin.compiler.newInferenceEnabled=true diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt index ebabb3c78a2..614d1bcd6fa 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt @@ -64,7 +64,7 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes ?.firstOrNull { it.contains("-original.jar") }?.replace( "kotlin-gradle-plugin-", "" - )?.replace("-original.jar", "") ?: "1.4.255-SNAPSHOT" + )?.replace("-original.jar", "") ?: "1.5.255-SNAPSHOT" @JvmStatic @Parameterized.Parameters(name = "{index}: Gradle-{0}, KotlinGradlePlugin-{1}") diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt index e3e14621492..06de3012bea 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt @@ -49,7 +49,7 @@ private val LOG = Logger.getInstance("#org.jetbrains.kotlin.idea.configuration.C data class RepositoryDescription(val id: String, val name: String, val url: String, val bintrayUrl: String?, val isSnapshot: Boolean) -const val LAST_SNAPSHOT_VERSION = "1.4.255-SNAPSHOT" +const val LAST_SNAPSHOT_VERSION = "1.5.255-SNAPSHOT" val SNAPSHOT_REPOSITORY = RepositoryDescription( "sonatype.oss.snapshots", diff --git a/libraries/examples/browser-example-with-library/pom.xml b/libraries/examples/browser-example-with-library/pom.xml index d9658e48db4..9102ff63085 100644 --- a/libraries/examples/browser-example-with-library/pom.xml +++ b/libraries/examples/browser-example-with-library/pom.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml diff --git a/libraries/examples/browser-example/pom.xml b/libraries/examples/browser-example/pom.xml index 455b71074a5..ccb06af7f30 100644 --- a/libraries/examples/browser-example/pom.xml +++ b/libraries/examples/browser-example/pom.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml diff --git a/libraries/examples/js-example/pom.xml b/libraries/examples/js-example/pom.xml index 961111f5b12..13476016d18 100644 --- a/libraries/examples/js-example/pom.xml +++ b/libraries/examples/js-example/pom.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml diff --git a/libraries/examples/kotlin-java-example/pom.xml b/libraries/examples/kotlin-java-example/pom.xml index 10a0e5b8f31..faa2ede8e26 100644 --- a/libraries/examples/kotlin-java-example/pom.xml +++ b/libraries/examples/kotlin-java-example/pom.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml diff --git a/libraries/examples/kotlin-js-library-example/pom.xml b/libraries/examples/kotlin-js-library-example/pom.xml index cfef7a7122e..cc3cde713c7 100644 --- a/libraries/examples/kotlin-js-library-example/pom.xml +++ b/libraries/examples/kotlin-js-library-example/pom.xml @@ -8,7 +8,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml diff --git a/libraries/pom.xml b/libraries/pom.xml index 542995e8cba..16602a6edf0 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT pom Kotlin diff --git a/libraries/tools/kotlin-annotation-processing-maven/pom.xml b/libraries/tools/kotlin-annotation-processing-maven/pom.xml index 1868beb593e..4c2d2a1b8ac 100755 --- a/libraries/tools/kotlin-annotation-processing-maven/pom.xml +++ b/libraries/tools/kotlin-annotation-processing-maven/pom.xml @@ -16,7 +16,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-bom/pom.xml b/libraries/tools/kotlin-bom/pom.xml index 8b8900bd18f..7e1863f7e61 100644 --- a/libraries/tools/kotlin-bom/pom.xml +++ b/libraries/tools/kotlin-bom/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin kotlin-bom - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT pom diff --git a/libraries/tools/kotlin-maven-allopen/pom.xml b/libraries/tools/kotlin-maven-allopen/pom.xml index 17ae4b78e6d..53b98c078b1 100755 --- a/libraries/tools/kotlin-maven-allopen/pom.xml +++ b/libraries/tools/kotlin-maven-allopen/pom.xml @@ -14,7 +14,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-noarg/pom.xml b/libraries/tools/kotlin-maven-noarg/pom.xml index 0a90a533b46..b32c3ccfcd4 100755 --- a/libraries/tools/kotlin-maven-noarg/pom.xml +++ b/libraries/tools/kotlin-maven-noarg/pom.xml @@ -14,7 +14,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml index 48fcc8b6fec..c584c0f5117 100644 --- a/libraries/tools/kotlin-maven-plugin-test/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml @@ -5,7 +5,7 @@ kotlin-project org.jetbrains.kotlin - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/libraries/tools/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml index 299ecf4d3a7..85e1d0be2a0 100644 --- a/libraries/tools/kotlin-maven-plugin/pom.xml +++ b/libraries/tools/kotlin-maven-plugin/pom.xml @@ -12,7 +12,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml index 7210d0807e2..ac785b99ead 100755 --- a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml +++ b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml @@ -14,7 +14,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-serialization/pom.xml b/libraries/tools/kotlin-maven-serialization/pom.xml index 8acfef86320..4a8cbd297e9 100755 --- a/libraries/tools/kotlin-maven-serialization/pom.xml +++ b/libraries/tools/kotlin-maven-serialization/pom.xml @@ -14,7 +14,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-osgi-bundle/pom.xml b/libraries/tools/kotlin-osgi-bundle/pom.xml index 57c9c2029f0..0bb52cae82a 100644 --- a/libraries/tools/kotlin-osgi-bundle/pom.xml +++ b/libraries/tools/kotlin-osgi-bundle/pom.xml @@ -5,7 +5,7 @@ kotlin-project org.jetbrains.kotlin - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/libraries/tools/maven-archetypes/kotlin-archetype-js/pom.xml b/libraries/tools/maven-archetypes/kotlin-archetype-js/pom.xml index 9232dd61fec..38c2b3eb277 100644 --- a/libraries/tools/maven-archetypes/kotlin-archetype-js/pom.xml +++ b/libraries/tools/maven-archetypes/kotlin-archetype-js/pom.xml @@ -6,7 +6,7 @@ org.jetbrains.kotlin kotlin-archetypes-parent - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../pom.xml diff --git a/libraries/tools/maven-archetypes/kotlin-archetype-jvm/pom.xml b/libraries/tools/maven-archetypes/kotlin-archetype-jvm/pom.xml index 2adc81d4d19..a4720a26c0a 100644 --- a/libraries/tools/maven-archetypes/kotlin-archetype-jvm/pom.xml +++ b/libraries/tools/maven-archetypes/kotlin-archetype-jvm/pom.xml @@ -6,7 +6,7 @@ org.jetbrains.kotlin kotlin-archetypes-parent - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../pom.xml diff --git a/libraries/tools/maven-archetypes/pom.xml b/libraries/tools/maven-archetypes/pom.xml index 97d0d361f3f..e701f3686e6 100644 --- a/libraries/tools/maven-archetypes/pom.xml +++ b/libraries/tools/maven-archetypes/pom.xml @@ -6,7 +6,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.5.255-SNAPSHOT ../../pom.xml diff --git a/plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/AbstractFirAllOpenDiagnosticTest.kt b/plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/AbstractFirAllOpenDiagnosticTest.kt index ee7451086d3..b2a1793f90a 100644 --- a/plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/AbstractFirAllOpenDiagnosticTest.kt +++ b/plugins/fir/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/AbstractFirAllOpenDiagnosticTest.kt @@ -21,7 +21,7 @@ abstract class AbstractFirAllOpenDiagnosticTest : AbstractFirDiagnosticsTest() { override fun updateConfiguration(configuration: CompilerConfiguration) { super.updateConfiguration(configuration) - val jar = File("plugins/fir/fir-plugin-prototype/plugin-annotations/build/libs/plugin-annotations-1.4.255-SNAPSHOT.jar") + val jar = File("plugins/fir/fir-plugin-prototype/plugin-annotations/build/libs/plugin-annotations-1.5.255-SNAPSHOT.jar") if (!jar.exists()) { throw AssertionError("Jar with annotations does not exist. Please run :plugins:fir:fir-plugin-prototype:plugin-annotations:jar") }