Fix 2018.3 EAP build and cover it in version range (#2284)

GoogleCloudPlatform · Oct 11, 2018 · 23a1e3a · 23a1e3a
1 parent 5c51cd7
commit 23a1e3a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/...a/src/com/google/cloud/tools/intellij/appengine/java/cloud/BuildDeploymentSourceType.java b/...a/src/com/google/cloud/tools/intellij/appengine/java/cloud/BuildDeploymentSourceType.java
@@ -114,9 +114,7 @@ public void updateBuildBeforeRunOption(
       return;
     }
 
-    List<BeforeRunTask> buildTasks = editor.getStepsBeforeLaunch();
-
-    if (select && !hasBuildTaskForModule(buildTasks, module)) {
+    if (select && !hasBuildTaskForModule(editor.getStepsBeforeLaunch(), module)) {
       BeforeRunTask buildTask = createBuildTask(module);
       if (buildTask != null) {
         editor.addBeforeLaunchStep(buildTask);

diff --git a/...le/cloud/tools/intellij/appengine/java/ultimate/server/instance/AppEngineServerModel.java b/...le/cloud/tools/intellij/appengine/java/ultimate/server/instance/AppEngineServerModel.java
@@ -358,7 +358,7 @@ public List<String> getAdditionalArguments() {
     return ImmutableList.of();
   }
 
-  @javax.annotation.Nullable
+  @Nullable
   @Override
   public String getProjectId() {
     return null;

diff --git a/google-cloud-core/src/com/google/cloud/tools/intellij/project/ProjectSelectionDialog.java b/google-cloud-core/src/com/google/cloud/tools/intellij/project/ProjectSelectionDialog.java
@@ -33,7 +33,6 @@
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.openapi.ui.ValidationInfo;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.ui.DoubleClickListener;
 import com.intellij.ui.JBProgressBar;
@@ -210,8 +209,9 @@ public void onFailure(Throwable throwable) {
                     String errorMessage =
                         Optional.ofNullable(throwable.getMessage())
                             .orElse(throwable.getClass().getName());
-                    dialogWrapper.setErrorInfoAll(
-                        Collections.singletonList(new ValidationInfo(errorMessage)));
+
+                    dialogWrapper.setErrorText(errorMessage, projectListTable);
+
                     refreshProjectListUi(user);
                   });
             }
@@ -466,6 +466,11 @@ protected JComponent createCenterPanel() {
       return centerPanelWrapper;
     }
 
+    @Override
+    protected void setErrorText(@Nullable String text, @Nullable JComponent component) {
+      super.setErrorText(text, component);
+    }
+
     // IntelliJ API - creates actions (buttons) for "left side" of the dialog bottom panel.
     @NotNull
     @Override
@@ -478,11 +483,6 @@ public void setOKActionEnabled(boolean isEnabled) {
       super.setOKActionEnabled(isEnabled);
     }
 
-    @Override
-    protected void setErrorInfoAll(@NotNull List<ValidationInfo> info) {
-      super.setErrorInfoAll(info);
-    }
-
     @Nullable
     @Override
     protected JButton getButton(@NotNull Action action) {

diff --git a/google-cloud-tools-plugin/resources/META-INF/plugin.xml b/google-cloud-tools-plugin/resources/META-INF/plugin.xml
@@ -35,7 +35,7 @@
   <vendor>Google</vendor>
   <!-- "idea-version since-build" set to cover 2017.1 - 2018.2 -->
   <!-- Set manually because the gradle-intellij-plugin cannot span across major release versions -->
-  <idea-version since-build="171.3780" until-build="182.*"/>
+  <idea-version since-build="171.3780" until-build="183.*"/>
 
   <change-notes>
     <!--Patched in at build time-->