From 0f5f90cf52a343101e41fc7a59480c318e1cebeb Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 21 Jun 2018 02:59:17 +0300 Subject: [PATCH] Advance project version to 1.3-SNAPSHOT Set LATEST_STABLE language version and current version of stdlib to 1.3, set IS_PRE_RELEASE Remove "EXPERIMENTAL" from 1.3 version description in tests and gradle options --- build.gradle.kts | 4 ++-- compiler/testData/cli/jvm/apiVersionInvalid.out | 2 +- compiler/testData/cli/jvm/languageVersionInvalid.out | 2 +- .../org/jetbrains/kotlin/config/LanguageVersionSettings.kt | 2 +- .../org/jetbrains/kotlin/config/KotlinCompilerVersion.java | 2 +- .../idea/configuration/ConfigureKotlinInProjectUtils.kt | 2 +- libraries/stdlib/src/kotlin/util/KotlinVersion.kt | 2 +- .../org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3c73877658a..4b8901b9027 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile import proguard.gradle.ProGuardTask buildscript { - extra["defaultSnapshotVersion"] = "1.2-SNAPSHOT" + extra["defaultSnapshotVersion"] = "1.3-SNAPSHOT" kotlinBootstrapFrom(BootstrapOption.TeamCity("1.2.70-dev-491", onlySuccessBootstrap = false)) @@ -65,7 +65,7 @@ val defaultSnapshotVersion: String by extra val buildNumber by extra(findProperty("build.number")?.toString() ?: defaultSnapshotVersion) val kotlinVersion by extra(findProperty("deployVersion")?.toString() ?: buildNumber) -val kotlinLanguageVersion by extra("1.2") +val kotlinLanguageVersion by extra("1.3") allprojects { group = "org.jetbrains.kotlin" diff --git a/compiler/testData/cli/jvm/apiVersionInvalid.out b/compiler/testData/cli/jvm/apiVersionInvalid.out index c866c879a5b..0a4a7e92e9c 100644 --- a/compiler/testData/cli/jvm/apiVersionInvalid.out +++ b/compiler/testData/cli/jvm/apiVersionInvalid.out @@ -1,3 +1,3 @@ error: unknown API version: 239.42 -Supported API versions: 1.0, 1.1, 1.2, 1.3 (EXPERIMENTAL), 1.4 (EXPERIMENTAL) +Supported API versions: 1.0, 1.1, 1.2, 1.3, 1.4 (EXPERIMENTAL) COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/languageVersionInvalid.out b/compiler/testData/cli/jvm/languageVersionInvalid.out index d29a38a75e3..fc29ba865f2 100644 --- a/compiler/testData/cli/jvm/languageVersionInvalid.out +++ b/compiler/testData/cli/jvm/languageVersionInvalid.out @@ -1,3 +1,3 @@ error: unknown language version: 239.42 -Supported language versions: 1.0, 1.1, 1.2, 1.3 (EXPERIMENTAL), 1.4 (EXPERIMENTAL) +Supported language versions: 1.0, 1.1, 1.2, 1.3, 1.4 (EXPERIMENTAL) COMPILATION_ERROR diff --git a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt index 9ca771cfa98..0458e3fe08a 100644 --- a/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt +++ b/compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt @@ -214,7 +214,7 @@ enum class LanguageVersion(val major: Int, val minor: Int) : DescriptionAware { str.split(".", "-").let { if (it.size >= 2) fromVersionString("${it[0]}.${it[1]}") else null } @JvmField - val LATEST_STABLE = KOTLIN_1_2 + val LATEST_STABLE = KOTLIN_1_3 } } diff --git a/core/util.runtime/src/org/jetbrains/kotlin/config/KotlinCompilerVersion.java b/core/util.runtime/src/org/jetbrains/kotlin/config/KotlinCompilerVersion.java index bb1ee0e6b0b..7b26d9e3bbe 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/config/KotlinCompilerVersion.java +++ b/core/util.runtime/src/org/jetbrains/kotlin/config/KotlinCompilerVersion.java @@ -27,7 +27,7 @@ public class KotlinCompilerVersion { // Binaries produced by this compiler with that language version (or any future language version) are going to be marked // as "pre-release" and will not be loaded by release versions of the compiler. // Change this value before and after every major release - private static final boolean IS_PRE_RELEASE = false; + private static final boolean IS_PRE_RELEASE = true; public static final String TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY = "kotlin.test.is.pre.release"; 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 a2ff4f0069f..4ef0c918113 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 @@ -46,7 +46,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.2-SNAPSHOT" +const val LAST_SNAPSHOT_VERSION = "1.3-SNAPSHOT" val SNAPSHOT_REPOSITORY = RepositoryDescription( "sonatype.oss.snapshots", diff --git a/libraries/stdlib/src/kotlin/util/KotlinVersion.kt b/libraries/stdlib/src/kotlin/util/KotlinVersion.kt index 52f791ab58e..20b1b1c3764 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, 2, 0) // value is written here automatically during build + public val CURRENT: KotlinVersion = KotlinVersion(1, 3, 0) // value is written here automatically during build } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt index f1a6cfdba5d..a50efa6e3ed 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt @@ -6,14 +6,14 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToo /** * Allow to use declarations only from the specified version of bundled libraries - * Possible values: "1.0", "1.1", "1.2", "1.3 (EXPERIMENTAL)", "1.4 (EXPERIMENTAL)" + * Possible values: "1.0", "1.1", "1.2", "1.3", "1.4 (EXPERIMENTAL)" * Default value: null */ var apiVersion: kotlin.String? /** * Provide source compatibility with specified language version - * Possible values: "1.0", "1.1", "1.2", "1.3 (EXPERIMENTAL)", "1.4 (EXPERIMENTAL)" + * Possible values: "1.0", "1.1", "1.2", "1.3", "1.4 (EXPERIMENTAL)" * Default value: null */ var languageVersion: kotlin.String?