Skip to content

Commit

Permalink
Fix for #113 that includes the PluginException, which apparently the …
Browse files Browse the repository at this point in the history
…plugin classloader throws instead of a LinkageError
  • Loading branch information
groboclown committed Mar 23, 2016
1 parent c57f9e5 commit a23c9e5
Showing 3 changed files with 24 additions and 2 deletions.
14 changes: 14 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# IDEA Community VCS Integration for Perforce

## ::v0.7.10::

### Overview

* Bug fixes.

### Details

* Bug fixes.
* Android Studio and other non-JRE 8 IDEs can fail to load the
plugin. Now, all the class loading errors should be caught
when loading the compatibility libraries. (#113 & #110)


## ::v0.7.9::

### Overview
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@

package net.groboclown.idea.p4ic.compat;

import com.intellij.diagnostic.PluginException;
import com.intellij.openapi.application.ApplicationInfo;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
@@ -97,6 +98,13 @@ private static CompatFactory loadCompatFactory(@NotNull String apiVersion, Class
// or any number of other issues that shouldn't stop
// the plugin from loading.
LOG.warn(e);
} catch (PluginException e) {
// bug #113
// The IDE classes aren't matching up with the expected signatures,
// the classes are compiled with an incompatible JRE,
// or any number of other issues that shouldn't stop
// the plugin from loading.
LOG.warn(e);
}
}
return best;
4 changes: 2 additions & 2 deletions plugin/META-INF/plugin.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<idea-plugin version="2">
<name>Perforce IDEA Community Integration</name>
<id>PerforceIC</id>
<version>0.7.9</version>
<version>0.7.10</version>
<idea-version since-build="IC-135.1286"/>
<category>VCS Integration</category>
<change-notes><![CDATA[
<ol>
<li><em>0.7.9</em>
<li><em>0.7.9 &amp; 0.7.10</em>
<ol>
<li>Android Studio and other non-JRE 8 IDEs can
fail to load the plugin. Now, all the class

0 comments on commit a23c9e5

Please sign in to comment.