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

Change snapshot version in gradle configurator and AddKotlinLib quick fixes.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-05-11 18:46:59 +03:00
parent 4cbd2fbe62
commit bf2576e25c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinJavaFrameworkSupportProvider.kt
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2016 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ class GradleKotlinJavaFrameworkSupportProvider() : GradleFrameworkSupportProvide
val additionalRepository: String? = when { val additionalRepository: String? = when {
kotlinVersion == "@snapshot@" -> { kotlinVersion == "@snapshot@" -> {
kotlinVersion = "0.1-SNAPSHOT" kotlinVersion = "1.1-SNAPSHOT"
KotlinWithGradleConfigurator.SNAPSHOT_REPOSITORY KotlinWithGradleConfigurator.SNAPSHOT_REPOSITORY
} }
isEap(kotlinVersion) -> { isEap(kotlinVersion) -> {
idea/src/org/jetbrains/kotlin/idea/inspections/AddKotlinLibQuickFix.kt
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2016 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -200,7 +200,7 @@ abstract class AddKotlinLibQuickFix(element: KtElement) : KotlinQuickFixAction<K
val pluginVersion = bundledRuntimeVersion() val pluginVersion = bundledRuntimeVersion()
if ("@snapshot@" == pluginVersion) { if ("@snapshot@" == pluginVersion) {
return "0.1-SNAPSHOT" return "1.1-SNAPSHOT"
} }
return pluginVersion return pluginVersion
} }