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
This commit is contained in:
+2
-2
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
|
|||||||
import proguard.gradle.ProGuardTask
|
import proguard.gradle.ProGuardTask
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
extra["defaultSnapshotVersion"] = "1.2-SNAPSHOT"
|
extra["defaultSnapshotVersion"] = "1.3-SNAPSHOT"
|
||||||
|
|
||||||
kotlinBootstrapFrom(BootstrapOption.TeamCity("1.2.70-dev-491", onlySuccessBootstrap = false))
|
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 buildNumber by extra(findProperty("build.number")?.toString() ?: defaultSnapshotVersion)
|
||||||
val kotlinVersion by extra(findProperty("deployVersion")?.toString() ?: buildNumber)
|
val kotlinVersion by extra(findProperty("deployVersion")?.toString() ?: buildNumber)
|
||||||
|
|
||||||
val kotlinLanguageVersion by extra("1.2")
|
val kotlinLanguageVersion by extra("1.3")
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
group = "org.jetbrains.kotlin"
|
group = "org.jetbrains.kotlin"
|
||||||
|
|||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
error: unknown API version: 239.42
|
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
|
COMPILATION_ERROR
|
||||||
|
|||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
error: unknown language version: 239.42
|
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
|
COMPILATION_ERROR
|
||||||
|
|||||||
@@ -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 }
|
str.split(".", "-").let { if (it.size >= 2) fromVersionString("${it[0]}.${it[1]}") else null }
|
||||||
|
|
||||||
@JvmField
|
@JvmField
|
||||||
val LATEST_STABLE = KOTLIN_1_2
|
val LATEST_STABLE = KOTLIN_1_3
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
// 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.
|
// as "pre-release" and will not be loaded by release versions of the compiler.
|
||||||
// Change this value before and after every major release
|
// 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";
|
public static final String TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY = "kotlin.test.is.pre.release";
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -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)
|
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(
|
val SNAPSHOT_REPOSITORY = RepositoryDescription(
|
||||||
"sonatype.oss.snapshots",
|
"sonatype.oss.snapshots",
|
||||||
|
|||||||
@@ -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.
|
* Returns the current version of the Kotlin standard library.
|
||||||
*/
|
*/
|
||||||
@kotlin.jvm.JvmField
|
@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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -6,14 +6,14 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToo
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Allow to use declarations only from the specified version of bundled libraries
|
* 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
|
* Default value: null
|
||||||
*/
|
*/
|
||||||
var apiVersion: kotlin.String?
|
var apiVersion: kotlin.String?
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provide source compatibility with specified language version
|
* 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
|
* Default value: null
|
||||||
*/
|
*/
|
||||||
var languageVersion: kotlin.String?
|
var languageVersion: kotlin.String?
|
||||||
|
|||||||
Reference in New Issue
Block a user