Make plugin buildable with 2018.3

ashald · ashald · commit 710482b2b7d8 · 2020-03-30T21:58:35.000-04:00
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -11,3 +11,4 @@ who helped with testing and provided feedback during early stages of development
 * [Dmytro Kostiuchenko](https://github.com/edio)
 * [Kelnor277](https://github.com/Kelnor277)
 * [Andy Elliott](https://github.com/andye2004)
+* [pilzm](https://github.com/pilzm)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning].
 
+## 3.2.1 - 2020-03-30
+
+### Fixed
+
+- Incompatibility with IDEA 2020 ([#38]) - special thanks to [@pilzm](https://github.com/pilzm) for contribution 
+
 ## 3.2.0 - 2019-05-24
 
 ### Added
@@ -113,6 +119,7 @@ This project adheres to [Semantic Versioning].
 [#72]: https://github.com/Ashald/EnvFile/issues/72
 [#81]: https://github.com/Ashald/EnvFile/issues/81
 [#81]: https://github.com/Ashald/EnvFile/issues/83
+[#100]: https://github.com/ashald/EnvFile/issues/100    
 
 [Keep a CHANGELOG]:     http://keepachangelog.com
 [Semantic Versioning]:  http://semver.org/
diff --git a/build.gradle b/build.gradle
@@ -21,10 +21,10 @@ allprojects {
     project.version = scmVersion.version
 
     ext.jetbrains = [
-            version : "2018.2",
-            pycharm : "PythonCore:2018.2.182.3684.2",
-            rubymine: "org.jetbrains.plugins.ruby:2018.2.20180716",
-            goland  : "org.jetbrains.plugins.go:182.3684.59.834"
+            version : "2018.3",
+            pycharm : "PythonCore:2018.3.183.4284.148",
+            rubymine: "org.jetbrains.plugins.ruby:2018.3.20181121",
+            goland  : "org.jetbrains.plugins.go:183.4284.36.1532"
     ]
 }
 
diff --git a/modules/products/goland/src/main/java/net/ashald/envfile/products/goland/GolandRunConfigurationExtension.java b/modules/products/goland/src/main/java/net/ashald/envfile/products/goland/GolandRunConfigurationExtension.java
@@ -23,7 +23,7 @@ protected String getEditorTitle() {
     }
 
     @Override
-    protected void patchCommandLine(@NotNull GoRunConfigurationBase goRunConfigurationBase, @Nullable RunnerSettings runnerSettings, @NotNull GeneralCommandLine generalCommandLine, @NotNull String s) throws ExecutionException {
+    protected void patchCommandLine(@NotNull GoRunConfigurationBase<?> goRunConfigurationBase, @Nullable RunnerSettings runnerSettings, @NotNull GeneralCommandLine generalCommandLine, @NotNull String s) throws ExecutionException {
         Map<String, String> currentEnv = generalCommandLine.getEnvironment();
         Map<String, String> newEnv = EnvFileConfigurationEditor.collectEnv(goRunConfigurationBase, new HashMap<>(currentEnv));
         currentEnv.clear();
@@ -53,17 +53,17 @@ protected void writeExternal(@NotNull GoRunConfigurationBase runConfiguration, @
 
     @Nullable
     @Override
-    protected <P extends GoRunConfigurationBase> SettingsEditor<P> createEditor(@NotNull P configuration) {
+    public <P extends GoRunConfigurationBase<?>> SettingsEditor<P> createEditor(@NotNull P configuration) {
         return new EnvFileConfigurationEditor<P>(configuration);
     }
 
     @Override
-    protected boolean isApplicableFor(@NotNull GoRunConfigurationBase goRunConfigurationBase) {
+    public boolean isApplicableFor(@NotNull GoRunConfigurationBase goRunConfigurationBase) {
         return true;
     }
 
     @Override
-    protected boolean isEnabledFor(@NotNull GoRunConfigurationBase goRunConfigurationBase, @Nullable RunnerSettings runnerSettings) {
+    public boolean isEnabledFor(@NotNull GoRunConfigurationBase goRunConfigurationBase, @Nullable RunnerSettings runnerSettings) {
         return true;
     }
 }
diff --git a/modules/products/idea/src/main/java/net/ashald/envfile/products/idea/IdeaRunConfigurationExtension.java b/modules/products/idea/src/main/java/net/ashald/envfile/products/idea/IdeaRunConfigurationExtension.java
@@ -29,7 +29,7 @@ protected String getEditorTitle() {
 
     @Nullable
     @Override
-    protected <P extends RunConfigurationBase> SettingsEditor<P> createEditor(@NotNull P configuration) {
+    protected <P extends RunConfigurationBase<?>> SettingsEditor<P> createEditor(@NotNull P configuration) {
         return new EnvFileConfigurationEditor<P>(configuration);
     }
 
@@ -89,12 +89,12 @@ public <T extends RunConfigurationBase> void updateJavaParameters(T configuratio
     //
 
     @Override
-    protected boolean isApplicableFor(@NotNull RunConfigurationBase configuration) {
+    public boolean isApplicableFor(@NotNull RunConfigurationBase configuration) {
         return true;
     }
 
     @Override
-    protected boolean isEnabledFor(@NotNull RunConfigurationBase applicableConfiguration, @Nullable RunnerSettings runnerSettings) {
+    public boolean isEnabledFor(@NotNull RunConfigurationBase applicableConfiguration, @Nullable RunnerSettings runnerSettings) {
         return true;
     }
 
diff --git a/modules/products/pycharm/src/main/java/net/ashald/envfile/products/pycharm/PyCharmRunConfigurationExtension.java b/modules/products/pycharm/src/main/java/net/ashald/envfile/products/pycharm/PyCharmRunConfigurationExtension.java
@@ -26,7 +26,7 @@ protected String getEditorTitle() {
 
     @Nullable
     @Override
-    protected <P extends AbstractPythonRunConfiguration> SettingsEditor<P> createEditor(@NotNull P configuration) {
+    protected <P extends AbstractPythonRunConfiguration<?>> SettingsEditor<P> createEditor(@NotNull P configuration) {
         return new EnvFileConfigurationEditor<P>(configuration);
     }
 
@@ -62,12 +62,12 @@ protected void patchCommandLine(@NotNull AbstractPythonRunConfiguration configur
     //
 
     @Override
-    protected boolean isApplicableFor(@NotNull AbstractPythonRunConfiguration configuration) {
+    public boolean isApplicableFor(@NotNull AbstractPythonRunConfiguration configuration) {
         return true;
     }
 
     @Override
-    protected boolean isEnabledFor(@NotNull AbstractPythonRunConfiguration applicableConfiguration, @Nullable RunnerSettings runnerSettings) {
+    public boolean isEnabledFor(@NotNull AbstractPythonRunConfiguration applicableConfiguration, @Nullable RunnerSettings runnerSettings) {
         return true;
     }
 }
diff --git a/modules/products/rubymine/src/main/java/net/ashald/envfile/products/rubymine/RubyMineRunConfigurationExtension.java b/modules/products/rubymine/src/main/java/net/ashald/envfile/products/rubymine/RubyMineRunConfigurationExtension.java
@@ -26,7 +26,7 @@ protected String getEditorTitle() {
 
     @Nullable
     @Override
-    protected <P extends AbstractRubyRunConfiguration> SettingsEditor<P> createEditor(@NotNull P configuration) {
+    protected <P extends AbstractRubyRunConfiguration<?>> SettingsEditor<P> createEditor(@NotNull P configuration) {
         return new EnvFileConfigurationEditor<P>(configuration);
     }
 
@@ -52,7 +52,7 @@ protected void validateConfiguration(@NotNull AbstractRubyRunConfiguration confi
     }
 
     @Override
-    protected void patchCommandLine(@NotNull AbstractRubyRunConfiguration configuration, @Nullable RunnerSettings runnerSettings, @NotNull GeneralCommandLine cmdLine, @NotNull String runnerId) throws ExecutionException {
+    protected void patchCommandLine(@NotNull AbstractRubyRunConfiguration<?> configuration, @Nullable RunnerSettings runnerSettings, @NotNull GeneralCommandLine cmdLine, @NotNull String runnerId) throws ExecutionException {
         Map<String, String> currentEnv = cmdLine.getEnvironment();
         Map<String, String> newEnv = EnvFileConfigurationEditor.collectEnv(configuration, new HashMap<>(currentEnv));
         currentEnv.clear();
@@ -62,12 +62,12 @@ protected void patchCommandLine(@NotNull AbstractRubyRunConfiguration configurat
     //
 
     @Override
-    protected boolean isApplicableFor(@NotNull AbstractRubyRunConfiguration configuration) {
+    public boolean isApplicableFor(@NotNull AbstractRubyRunConfiguration configuration) {
         return true;
     }
 
     @Override
-    protected boolean isEnabledFor(@NotNull AbstractRubyRunConfiguration applicableConfiguration, @Nullable RunnerSettings runnerSettings) {
+    public boolean isEnabledFor(@NotNull AbstractRubyRunConfiguration applicableConfiguration, @Nullable RunnerSettings runnerSettings) {
         return true;
     }
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -38,21 +38,21 @@
     ]]></description>
 
   <change-notes><![CDATA[
-      <a href="https://github.com/Ashald/EnvFile/tree/v3.2.0"><b>v3.2.0</b></a> (2019-05-24)
+      <a href="https://github.com/Ashald/EnvFile/tree/v3.3.0"><b>v3.3.0</b></a> (2019-05-24)
       <br/>
       <br/>
 
-      <b>Added</b>:
+      <b>Fixed</b>:
       <ul>
-        <li>Experimental integration for external system run configurations (such as Gradle)</li>
+        <li>Incompatibility with IDEA 2020</li>
       </ul>
       <br/>
       <br/>
 
     ]]>
   </change-notes>
 
-  <idea-version since-build="181"/>
+  <idea-version since-build="183"/>
 
   <depends>com.intellij.modules.lang</depends>
   <depends optional="true" config-file="">com.intellij.java</depends>

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ allprojects {`
`21`	`21`	`project.version = scmVersion.version`
`22`	`22`
`23`	`23`	`ext.jetbrains = [`
`24`		`- version : "2018.2",`
`25`		`- pycharm : "PythonCore:2018.2.182.3684.2",`
`26`		`- rubymine: "org.jetbrains.plugins.ruby:2018.2.20180716",`
`27`		`- goland : "org.jetbrains.plugins.go:182.3684.59.834"`
	`24`	`+ version : "2018.3",`
	`25`	`+ pycharm : "PythonCore:2018.3.183.4284.148",`
	`26`	`+ rubymine: "org.jetbrains.plugins.ruby:2018.3.20181121",`
	`27`	`+ goland : "org.jetbrains.plugins.go:183.4284.36.1532"`
`28`	`28`	`]`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ protected String getEditorTitle() {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@Override`
`26`		`- protected void patchCommandLine(@NotNull GoRunConfigurationBase goRunConfigurationBase, @Nullable RunnerSettings runnerSettings, @NotNull GeneralCommandLine generalCommandLine, @NotNull String s) throws ExecutionException {`
	`26`	`+ protected void patchCommandLine(@NotNull GoRunConfigurationBase<?> goRunConfigurationBase, @Nullable RunnerSettings runnerSettings, @NotNull GeneralCommandLine generalCommandLine, @NotNull String s) throws ExecutionException {`
`27`	`27`	`Map<String, String> currentEnv = generalCommandLine.getEnvironment();`
`28`	`28`	`Map<String, String> newEnv = EnvFileConfigurationEditor.collectEnv(goRunConfigurationBase, new HashMap<>(currentEnv));`
`29`	`29`	`currentEnv.clear();`
`@@ -53,17 +53,17 @@ protected void writeExternal(@NotNull GoRunConfigurationBase runConfiguration, @`
`53`	`53`
`54`	`54`	`@Nullable`
`55`	`55`	`@Override`
`56`		`- protected <P extends GoRunConfigurationBase> SettingsEditor<P> createEditor(@NotNull P configuration) {`
	`56`	`+ public <P extends GoRunConfigurationBase<?>> SettingsEditor<P> createEditor(@NotNull P configuration) {`
`57`	`57`	`return new EnvFileConfigurationEditor<P>(configuration);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`61`		`- protected boolean isApplicableFor(@NotNull GoRunConfigurationBase goRunConfigurationBase) {`
	`61`	`+ public boolean isApplicableFor(@NotNull GoRunConfigurationBase goRunConfigurationBase) {`
`62`	`62`	`return true;`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- protected boolean isEnabledFor(@NotNull GoRunConfigurationBase goRunConfigurationBase, @Nullable RunnerSettings runnerSettings) {`
	`66`	`+ public boolean isEnabledFor(@NotNull GoRunConfigurationBase goRunConfigurationBase, @Nullable RunnerSettings runnerSettings) {`
`67`	`67`	`return true;`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected String getEditorTitle() {`
`29`	`29`
`30`	`30`	`@Nullable`
`31`	`31`	`@Override`
`32`		`- protected <P extends RunConfigurationBase> SettingsEditor<P> createEditor(@NotNull P configuration) {`
	`32`	`+ protected <P extends RunConfigurationBase<?>> SettingsEditor<P> createEditor(@NotNull P configuration) {`
`33`	`33`	`return new EnvFileConfigurationEditor<P>(configuration);`
`34`	`34`	`}`
`35`	`35`
`@@ -89,12 +89,12 @@ public <T extends RunConfigurationBase> void updateJavaParameters(T configuratio`
`89`	`89`	`//`
`90`	`90`
`91`	`91`	`@Override`
`92`		`- protected boolean isApplicableFor(@NotNull RunConfigurationBase configuration) {`
	`92`	`+ public boolean isApplicableFor(@NotNull RunConfigurationBase configuration) {`
`93`	`93`	`return true;`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`@Override`
`97`		`- protected boolean isEnabledFor(@NotNull RunConfigurationBase applicableConfiguration, @Nullable RunnerSettings runnerSettings) {`
	`97`	`+ public boolean isEnabledFor(@NotNull RunConfigurationBase applicableConfiguration, @Nullable RunnerSettings runnerSettings) {`
`98`	`98`	`return true;`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ protected String getEditorTitle() {`
`26`	`26`
`27`	`27`	`@Nullable`
`28`	`28`	`@Override`
`29`		`- protected <P extends AbstractPythonRunConfiguration> SettingsEditor<P> createEditor(@NotNull P configuration) {`
	`29`	`+ protected <P extends AbstractPythonRunConfiguration<?>> SettingsEditor<P> createEditor(@NotNull P configuration) {`
`30`	`30`	`return new EnvFileConfigurationEditor<P>(configuration);`
`31`	`31`	`}`
`32`	`32`
`@@ -62,12 +62,12 @@ protected void patchCommandLine(@NotNull AbstractPythonRunConfiguration configur`
`62`	`62`	`//`
`63`	`63`
`64`	`64`	`@Override`
`65`		`- protected boolean isApplicableFor(@NotNull AbstractPythonRunConfiguration configuration) {`
	`65`	`+ public boolean isApplicableFor(@NotNull AbstractPythonRunConfiguration configuration) {`
`66`	`66`	`return true;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`@Override`
`70`		`- protected boolean isEnabledFor(@NotNull AbstractPythonRunConfiguration applicableConfiguration, @Nullable RunnerSettings runnerSettings) {`
	`70`	`+ public boolean isEnabledFor(@NotNull AbstractPythonRunConfiguration applicableConfiguration, @Nullable RunnerSettings runnerSettings) {`
`71`	`71`	`return true;`
`72`	`72`	`}`
`73`	`73`	`}`