compatibility with IntelliJ 2020.3 (#112)

olada · Dec 13, 2020 · 105dc66 · 105dc66
1 parent 9195309
commit 105dc66
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 group 'de.cofinpro.intellij'
 version '0.8.1'
 
-sourceCompatibility = 1.8
+sourceCompatibility = 1.11
 
 repositories {
     mavenCentral()
@@ -24,11 +24,18 @@ test {
 }
 
 intellij {
-    version '2020.2.3'
+    version '2020.3'
 }
 
 patchPluginXml {
     changeNotes """
+    <p>
+        <h2>Version 0.8.2 (2020-12-13)</h2>
+        <ul>
+            <li>Plugin is now compatible with IntelliJ version 2020.3</li>
+        </ul>
+    </p>
+    
     <p>
         <h2>Version 0.8.1 (2020-10-23)</h2>
         <ul>
@@ -118,5 +125,5 @@ patchPluginXml {
     version = project.version
 
     sinceBuild '193.6494'
-    untilBuild '202.*'
+    untilBuild '203.*'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Sun Dec 13 13:03:01 CET 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/de/cofinpro/intellij/acfeplugin/psi/stub/ElementTypeBase.java b/src/main/java/de/cofinpro/intellij/acfeplugin/psi/stub/ElementTypeBase.java
@@ -6,7 +6,7 @@
 import de.cofinpro.intellij.acfeplugin.FormulaEngineFileType;
 import org.jetbrains.annotations.NotNull;
 
-public abstract class ElementTypeBase<StubT extends StubElement, PsiT extends PsiElement> extends IStubElementType<StubT, PsiT> {
+public abstract class ElementTypeBase<StubT extends StubElement<?>, PsiT extends PsiElement> extends IStubElementType<StubT, PsiT> {
     public ElementTypeBase(@NotNull String debugName) {
         super(debugName, FormulaEngineFileType.INSTANCE.getLanguage());
     }