From 8ee91c20e9b8faeba8b3e190a71092f299b5f9cd Mon Sep 17 00:00:00 2001
From: Rik van der Kleij <rikvdkleij@gmail.com>
Date: Wed, 28 Jul 2021 21:42:20 +0200
Subject: [PATCH] Version bump and support for 2021.2

---
 .run/IntelliJ-Haskell.run.xml        | 21 ++++++++++-----------
 build.sbt                            |  2 +-
 intellij-haskell/META-INF/plugin.xml | 10 ++++++++--
 project/plugins.sbt                  |  2 +-
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.run/IntelliJ-Haskell.run.xml b/.run/IntelliJ-Haskell.run.xml
index f2b46f579..8a64a9565 100644
--- a/.run/IntelliJ-Haskell.run.xml
+++ b/.run/IntelliJ-Haskell.run.xml
@@ -1,13 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="IntelliJ-Haskell" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType"
-                   show_console_on_std_out="true">
-        <module name="intellij-haskell"/>
-        <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -ea -Ddump.threads.on.long.write.action.waiting=50"/>
-        <option name="PROGRAM_PARAMETERS" value=""/>
-        <alternative-path path="IntelliJ IDEA IU-202.7660.26" alternative-path-enabled="true"/>
-        <predefined_log_file enabled="true" id="idea.log"/>
-        <method v="2">
-            <option name="Make" enabled="true"/>
-        </method>
-    </configuration>
+  <configuration default="false" name="IntelliJ-Haskell" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" show_console_on_std_out="true">
+    <module name="intellij-haskell" />
+    <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -ea -Ddump.threads.on.long.write.action.waiting=50" />
+    <option name="PROGRAM_PARAMETERS" value="" />
+    <alternative-path path="IntelliJ IDEA Community Edition IC-202.8194.7" alternative-path-enabled="true" />
+    <predefined_log_file enabled="true" id="idea.log" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
 </component>
\ No newline at end of file
diff --git a/build.sbt b/build.sbt
index 3937ea625..3df4ff6fb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,5 +1,5 @@
 lazy val commonSettings = Seq(
-  version := "1.0.0-beta85",
+  version := "1.0.0-beta86",
   scalaVersion := "2.13.6"
 )
 
diff --git a/intellij-haskell/META-INF/plugin.xml b/intellij-haskell/META-INF/plugin.xml
index af33fca8a..7d934eefb 100644
--- a/intellij-haskell/META-INF/plugin.xml
+++ b/intellij-haskell/META-INF/plugin.xml
@@ -1,7 +1,7 @@
-<idea-plugin>
+<idea-plugin require-restart="true">
     <id>intellij.haskell</id>
     <name>IntelliJ-Haskell</name>
-    <version>1.0.0-beta85</version>
+    <version>1.0.0-beta86</version>
     <vendor email="rikvdkleij@gmail.com">Rik van der Kleij</vendor>
 
     <description><![CDATA[
@@ -20,6 +20,12 @@
     ]]></description>
 
     <change-notes><![CDATA[
+         <p>1.0.0-beta86</p>
+           <ul>
+            <li>Support for 2021.2</li>
+            <li>Improved support for holes by @mbwgh. See #629. </li>
+            <li>Documentation in code completion by @fantostisch</li>
+           </ul>
         <p>1.0.0-beta85</p>
            <ul>
             <li>Various improvements and fixes</li>
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 382b4e0a4..8d7ffc3c5 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.12.5")
+addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.12.6")
 
 resolvers += Resolver.url("jetbrains-bintray",
   url("https://dl.bintray.com/jetbrains/sbt-plugins/"))(Resolver.ivyStylePatterns)