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

'Configure kotlin' should set 1.2-SNAPSHOT version in build.gradle for snapshot version of kotlin plugin

Browse Source
This commit is contained in:
Natalia Selezneva
2018-02-27 11:10:30 +03:00
parent cdcb651c8e
commit 2486be0f86
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt
+1 -1
View File
@@ -69,7 +69,7 @@ abstract class GradleKotlinFrameworkSupportProvider(
var kotlinVersion = bundledRuntimeVersion() var kotlinVersion = bundledRuntimeVersion()
val additionalRepository = getRepositoryForVersion(kotlinVersion) val additionalRepository = getRepositoryForVersion(kotlinVersion)
if (isSnapshot(bundledRuntimeVersion())) { if (isSnapshot(bundledRuntimeVersion())) {
kotlinVersion = "1.1-SNAPSHOT" kotlinVersion = LAST_SNAPSHOT_VERSION
} }
if (additionalRepository != null) { if (additionalRepository != null) {
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt
+1 -1
View File
@@ -52,7 +52,7 @@ abstract class KotlinDslGradleKotlinFrameworkSupportProvider(
var kotlinVersion = bundledRuntimeVersion() var kotlinVersion = bundledRuntimeVersion()
val additionalRepository = getRepositoryForVersion(kotlinVersion) val additionalRepository = getRepositoryForVersion(kotlinVersion)
if (isSnapshot(bundledRuntimeVersion())) { if (isSnapshot(bundledRuntimeVersion())) {
kotlinVersion = "1.1-SNAPSHOT" kotlinVersion = LAST_SNAPSHOT_VERSION
} }
if (additionalRepository != null) { if (additionalRepository != null) {
idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
+2
View File
@@ -43,6 +43,8 @@ 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"
val SNAPSHOT_REPOSITORY = RepositoryDescription( val SNAPSHOT_REPOSITORY = RepositoryDescription(
"sonatype.oss.snapshots", "sonatype.oss.snapshots",
"Sonatype OSS Snapshot Repository", "Sonatype OSS Snapshot Repository",