remove usages of APIs deprecated in 1.0 RC; advance minimum required version to 1.0 RC

This commit is contained in:
Dmitry Jemerov
2016-02-09 16:21:16 +01:00
parent 18b7aab93c
commit 30b6475914
2 changed files with 2 additions and 3 deletions
+1 -1
View File
@@ -9,6 +9,6 @@
<plugin id="com.intellij.properties" />
<plugin id="com.intellij.uiDesigner" />
<plugin id="org.intellij.groovy" />
<plugin id="org.jetbrains.kotlin" min-version="1.0.0-beta-4584" max-version="1.1" />
<plugin id="org.jetbrains.kotlin" min-version="1.0.0-rc-1036" max-version="1.1" />
</component>
</project>
@@ -277,11 +277,10 @@ object UpdateChecker {
* Returns a list of plugins which are currently installed or were installed in the previous installation from which
* we're importing the settings.
*/
@Suppress("DEPRECATION_ERROR")
private fun collectUpdateablePlugins(): MutableMap<PluginId, IdeaPluginDescriptor> {
val updateable = ContainerUtil.newTroveMap<PluginId, IdeaPluginDescriptor>()
updateable += PluginManagerCore.getPlugins().filter { !it.isBundled }.toMapBy { it.pluginId }
updateable += PluginManagerCore.getPlugins().filter { !it.isBundled }.associateBy { it.pluginId }
val onceInstalled = PluginManager.getOnceInstalledIfExists()
if (onceInstalled != null) {