From 06448b64696d5d2ff311780e8aaa51e03b7f4512 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Thu, 30 Jan 2020 18:20:27 +0300 Subject: [PATCH] Revert "Set local build version to 1.4.255-SNAPSHOT" This reverts commit a8650ccf --- build.gradle.kts | 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/stdlib/src/kotlin/util/KotlinVersion.kt | 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 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 50ea6ff65b4..78931e282f2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import proguard.gradle.ProGuardTask buildscript { - extra["defaultSnapshotVersion"] = "1.4.255-SNAPSHOT" + extra["defaultSnapshotVersion"] = "1.4-SNAPSHOT" val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true kotlinBootstrapFrom(BootstrapOption.BintrayBootstrap("1.4.0-dev-1075", cacheRedirectorEnabled)) 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 b568178afc8..1ac0e2ba664 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 @@ -56,7 +56,7 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes File("libraries/tools/kotlin-gradle-plugin/build/libs").listFiles()?.map { it.name }?.firstOrNull { it.contains("-original.jar") }?.replace( "kotlin-gradle-plugin-", "" - )?.replace("-original.jar", "") ?: "1.4.255-SNAPSHOT" + )?.replace("-original.jar", "") ?: "1.4-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 8fef0fa8080..54040607304 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 @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.utils.ifEmpty 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.4-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..2f91205df8b 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.4-SNAPSHOT ../../pom.xml diff --git a/libraries/examples/browser-example/pom.xml b/libraries/examples/browser-example/pom.xml index 455b71074a5..214909769f0 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.4-SNAPSHOT ../../pom.xml diff --git a/libraries/examples/js-example/pom.xml b/libraries/examples/js-example/pom.xml index 961111f5b12..c3531b0aac3 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.4-SNAPSHOT ../../pom.xml diff --git a/libraries/examples/kotlin-java-example/pom.xml b/libraries/examples/kotlin-java-example/pom.xml index 762e0aca509..4b06baba49f 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.4-SNAPSHOT ../../pom.xml diff --git a/libraries/examples/kotlin-js-library-example/pom.xml b/libraries/examples/kotlin-js-library-example/pom.xml index b1766bbbd17..b2dc4732afd 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.4-SNAPSHOT ../../pom.xml diff --git a/libraries/pom.xml b/libraries/pom.xml index 62a47d81833..2b1b126d080 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -7,7 +7,7 @@ org.jetbrains.kotlin kotlin-project - 1.4.255-SNAPSHOT + 1.4-SNAPSHOT pom Kotlin diff --git a/libraries/stdlib/src/kotlin/util/KotlinVersion.kt b/libraries/stdlib/src/kotlin/util/KotlinVersion.kt index 18106a6aa4a..9382c2e00ea 100644 --- a/libraries/stdlib/src/kotlin/util/KotlinVersion.kt +++ b/libraries/stdlib/src/kotlin/util/KotlinVersion.kt @@ -72,6 +72,6 @@ public class KotlinVersion(val major: Int, val minor: Int, val patch: Int) : Com * Returns the current version of the Kotlin standard library. */ @kotlin.jvm.JvmField - public val CURRENT: KotlinVersion = KotlinVersion(1, 4, 255) // value is written here automatically during build + public val CURRENT: KotlinVersion = KotlinVersion(1, 4, 0) // value is written here automatically during build } } diff --git a/libraries/tools/kotlin-annotation-processing-maven/pom.xml b/libraries/tools/kotlin-annotation-processing-maven/pom.xml index 1868beb593e..ab79aef46c2 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.4-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-bom/pom.xml b/libraries/tools/kotlin-bom/pom.xml index 0858e3dc571..46c9ffdeb47 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.4-SNAPSHOT pom diff --git a/libraries/tools/kotlin-maven-allopen/pom.xml b/libraries/tools/kotlin-maven-allopen/pom.xml index 17ae4b78e6d..e9479c070d2 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.4-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-noarg/pom.xml b/libraries/tools/kotlin-maven-noarg/pom.xml index bfdd1c770c5..e80caa2edf0 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.4-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml index 30824dc2ae2..e4d8d000be6 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.4-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..cdd7859deba 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.4-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..94db01f94f3 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.4-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-maven-serialization/pom.xml b/libraries/tools/kotlin-maven-serialization/pom.xml index 0fe429634fe..3a57acacb01 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.4-SNAPSHOT ../../pom.xml diff --git a/libraries/tools/kotlin-osgi-bundle/pom.xml b/libraries/tools/kotlin-osgi-bundle/pom.xml index e21d9e49b36..34252884187 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.4-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..1604268ac7f 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.4-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..8a231ac5b41 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.4-SNAPSHOT ../pom.xml diff --git a/libraries/tools/maven-archetypes/pom.xml b/libraries/tools/maven-archetypes/pom.xml index 97d0d361f3f..03e311256ca 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.4-SNAPSHOT ../../pom.xml