azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Advance version to 1.4

Browse Source
This commit is contained in:
Nikolay Krasko
2019-12-18 13:32:05 +03:00
committed by Dmitriy Novozhilov
parent 55e97fee09
commit ca49672a7a
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -1
View File
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import proguard.gradle.ProGuardTask import proguard.gradle.ProGuardTask
buildscript { buildscript {
extra["defaultSnapshotVersion"] = "1.3-SNAPSHOT" extra["defaultSnapshotVersion"] = "1.4-SNAPSHOT"
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
kotlinBootstrapFrom(BootstrapOption.BintrayBootstrap("1.3.70-dev-1806", cacheRedirectorEnabled)) kotlinBootstrapFrom(BootstrapOption.BintrayBootstrap("1.3.70-dev-1806", cacheRedirectorEnabled))
compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt
+1 -1
View File
@@ -263,7 +263,7 @@ enum class LanguageVersion(val major: Int, val minor: Int) : DescriptionAware {
val FIRST_SUPPORTED = KOTLIN_1_2 val FIRST_SUPPORTED = KOTLIN_1_2
@JvmField @JvmField
val LATEST_STABLE = KOTLIN_1_3 val LATEST_STABLE = KOTLIN_1_4
} }
} }
idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
+1 -1
View File
@@ -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) data class RepositoryDescription(val id: String, val name: String, val url: String, val bintrayUrl: String?, val isSnapshot: Boolean)
const val LAST_SNAPSHOT_VERSION = "1.3-SNAPSHOT" const val LAST_SNAPSHOT_VERSION = "1.4-SNAPSHOT"
val SNAPSHOT_REPOSITORY = RepositoryDescription( val SNAPSHOT_REPOSITORY = RepositoryDescription(
"sonatype.oss.snapshots", "sonatype.oss.snapshots",
libraries/pom.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-project</artifactId> <artifactId>kotlin-project</artifactId>
<version>1.3-SNAPSHOT</version> <version>1.4-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Kotlin</name> <name>Kotlin</name>
libraries/stdlib/src/kotlin/util/KotlinVersion.kt
+1 -1
View File
@@ -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, 3, 0) // value is written here automatically during build public val CURRENT: KotlinVersion = KotlinVersion(1, 4, 0) // value is written here automatically during build
} }
} }