From 30b64759143bbdbacb84844beb0841e0833f4d93 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 9 Feb 2016 16:20:01 +0100
Subject: [PATCH] remove usages of APIs deprecated in 1.0 RC; advance minimum
 required version to 1.0 RC

---
 .idea/externalDependencies.xml                                 | 2 +-
 .../com/intellij/openapi/updateSettings/impl/UpdateChecker.kt  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml
index 4c698556438e..cfea91d7ff11 100644
--- a/.idea/externalDependencies.xml
+++ b/.idea/externalDependencies.xml
@@ -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>
\ No newline at end of file
diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt
index 3810d0550685..cf65c047b42c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt
@@ -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) {