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

Wizard: get current Kotlin version from compiler

Browse Source 
#KT-35693 fixed
This commit is contained in:
Ilya Kirillov
2020-02-10 16:18:29 +03:00
parent 50c2c38624
commit 152def62cb
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaKotlinVersionProviderService.kt
+5 -6
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.tools.projectWizard.wizard.service package org.jetbrains.kotlin.tools.projectWizard.wizard.service
import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.idea.KotlinPluginUtil import org.jetbrains.kotlin.idea.KotlinPluginUtil
import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion
import org.jetbrains.kotlin.tools.projectWizard.core.TaskResult import org.jetbrains.kotlin.tools.projectWizard.core.TaskResult
@@ -20,12 +21,10 @@ import java.net.URL
import java.util.stream.Collectors import java.util.stream.Collectors
class IdeaKotlinVersionProviderService : KotlinVersionProviderService, IdeaWizardService { class IdeaKotlinVersionProviderService : KotlinVersionProviderService, IdeaWizardService {
override fun getKotlinVersion(): Version { override fun getKotlinVersion(): Version =
if (KotlinPluginUtil.isSnapshotVersion()) { KotlinCompilerVersion.getVersion()?.let { Version.fromString(it) }
return VersionsDownloader.getLatestEapOrStableKotlinVersion() ?: KotlinVersionProviderServiceImpl.DEFAULT ?: VersionsDownloader.getLatestEapOrStableKotlinVersion()
} ?: KotlinVersionProviderServiceImpl.DEFAULT
return KotlinPluginUtil.getPluginVersion().let { Version.fromString(it) }
}
} }
private object VersionsDownloader { private object VersionsDownloader {