Use APIs suitable for IntelliJ 15.x - despite deprecated status in 20…

…16.2 #124
asciidoctor · Aug 5, 2016 · 7d22150 · 7d22150
1 parent 4d5565b
commit 7d22150
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2" url="https://github.com/asciidoctor/asciidoctor-intellij-plugin">
   <id>org.asciidoctor.intellij.asciidoc</id>
   <name>AsciiDoc</name>
-  <version>0.14</version>
+  <version>0.14.1</version>
   <vendor email="erik.pragt@jworks.nl" url="http://asciidoctor.org">Asciidoctor Project</vendor>
 
   <description><![CDATA[
@@ -15,6 +15,8 @@
 
   <change-notes><![CDATA[
     <ul>
+      <li>0.14.1 make compatible with IntellJ 15.x again.
+        <br />This should include: AppCode 3.3, CLion 1.2, DataGrip 1.0, PhpStorm 10, PyCharm 5, RubyMine 8, WebStorm 11</li>
       <li>0.14 New JavaFX preview and real split view<br />Update to asciidoctorj 1.5.4.1 and asciidoctorj-diagram 1.5.0</li>
       <li>0.13 Updated to asciidoctorj 1.5.3.2, added support for asciidoctor-diagram</li>
       <li>0.12 Bugfixes, new makelink action, table generation improvement, etc.</li>
@@ -56,6 +58,8 @@
   <idea-version since-build="129.000"/> <!--IntelliJ IDEA 12.1, bugfix updates for PyCharm 2.7, PhpStorm/WebStorm 6 -->
   <!-- please see http://confluence.jetbrains.net/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
        on how to target different products -->
+  <!-- <idea-version since-build="143.000"/> --> <!-- IntelliJ IDEA 15, AppCode 3.3, CLion 1.2, DataGrip 1.0, PhpStorm 10, PyCharm 5, RubyMine 8, WebStorm 11 -->
+  <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html -->
   <depends>com.intellij.modules.lang</depends>
 
   <application-components>

diff --git a/README.adoc b/README.adoc
@@ -6,6 +6,11 @@ A plugin for the IntelliJ platform (IntelliJ IDEA, RubyMine, etc) that provides
 
 == Release notes
 
+=== 0.14.1
+
+- make compatible with IntellJ 15.x again. +
+  This should include: AppCode 3.3, CLion 1.2, DataGrip 1.0, PhpStorm 10, PyCharm 5, RubyMine 8, WebStorm 11
+
 === 0.14
 
 - New JavaFX preview and real split view

diff --git a/src/main/java/org/asciidoc/intellij/settings/AsciiDocApplicationSettings.java b/src/main/java/org/asciidoc/intellij/settings/AsciiDocApplicationSettings.java
@@ -5,6 +5,7 @@
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
+import com.intellij.openapi.components.StoragePathMacros;
 import com.intellij.util.messages.Topic;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import com.intellij.util.xmlb.annotations.Property;
@@ -13,7 +14,10 @@
 
 @State(
   name = "AsciidocApplicationSettings",
-  storages = @Storage("asciidoc.xml")
+  storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/asciidoc.xml")
+    // keep the line above to be compatible with IntellJ 15.x editions
+    // use the line below with IntellJ 2016.2.x
+    // @Storage("asciidoc.xml")
 )
 public class AsciiDocApplicationSettings implements PersistentStateComponent<AsciiDocApplicationSettings.State>,
                                                     AsciiDocPreviewSettings.Holder {