dirty hack to fix incompatibility with IntelliJ 2017.1 (#33)

mjedynak · May 3, 2017 · e7a9a7a · e7a9a7a
1 parent c3275fe
commit e7a9a7a
Show file tree

Hide file tree

Showing 8 changed files with 959 additions and 21 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" url="https://github.com/mjedynak/Builder-Generator">
+<idea-plugin url="https://github.com/mjedynak/Builder-Generator">
     <name>Builder Generator</name>
     <description>
         <![CDATA[
@@ -11,9 +11,14 @@
           </ul>
         ]]>
     </description>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <change-notes>
         <![CDATA[
+           version 1.1.3
+           <br/>
+           <ul>
+           <li>Fix incompatibility with IntelliJ 2017.1 <a href="https://github.com/mjedynak/builder-generator-idea-plugin/issues/33">(issue #33)</li>
+           </ul>
            version 1.1.2
            <br/>
            <ul>
@@ -96,7 +101,7 @@
 
     <vendor email="m.jedynak [at] gmail.com">Michal Jedynak
     </vendor>
-    <idea-version since-build="129.713"/>
+    <idea-version since-build="171.4249.39"/>
 
     <application-components>
     </application-components>

diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'groovy'
 apply plugin: 'idea'
 apply from: 'idea.gradle'
-apply plugin: 'checkstyle'
+//apply plugin: 'checkstyle'
 
 // --- properties ---
-ext.ideaInstallationPath = 'c:/Program Files (x86)/JetBrains/IntelliJ IDEA Community Edition 2016.2'
-ext.ideaJdk = 'IntelliJ IDEA Community Edition IC-162.1812.17'
-sourceCompatibility = 1.6
+ext.ideaInstallationPath = 'C:/Users/Michal/AppData/Local/JetBrains/Toolbox/apps/IDEA-C/ch-0/171.4249.39'
+ext.ideaJdk = 'IntelliJ IDEA Community Edition IC-171.4249.39'
+sourceCompatibility = 1.8
 // --- properties ---
 
 // workaround for http://issues.gradle.org/browse/GRADLE-2538

diff --git a/src/main/java/pl/mjedynak/idea/plugins/builder/action/handler/DisplayChoosersRunnable.java b/src/main/java/pl/mjedynak/idea/plugins/builder/action/handler/DisplayChoosersRunnable.java
@@ -1,13 +1,13 @@
 package pl.mjedynak.idea.plugins.builder.action.handler;
 
 import com.intellij.codeInsight.generation.PsiElementClassMember;
-import com.intellij.ide.util.MemberChooser;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiPackage;
 import pl.mjedynak.idea.plugins.builder.factory.CreateBuilderDialogFactory;
+import pl.mjedynak.idea.plugins.builder.factory.MemberChooser;
 import pl.mjedynak.idea.plugins.builder.factory.MemberChooserDialogFactory;
 import pl.mjedynak.idea.plugins.builder.factory.PsiFieldsForBuilderFactory;
 import pl.mjedynak.idea.plugins.builder.gui.CreateBuilderDialog;