From 5a3834e54d0336bb93c6048a05ea524960a027a5 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 19 Aug 2013 21:02:57 +0400 Subject: [PATCH] Update to IDEA EAP 130.1619 --- idea/src/META-INF/plugin.xml | 2 +- .../jetbrains/jet/plugin/run/JetRunConfigurationProducer.java | 4 +++- update_dependencies.xml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 2632729ebe4..eb217c87984 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -6,7 +6,7 @@ @snapshot@ JetBrains Inc. - + JUnit TestNG-J diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java index f7cac7ca7c4..a358f257e22 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java @@ -34,6 +34,8 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.JetMainDetector; import org.jetbrains.jet.plugin.framework.KotlinFrameworkDetector; +import java.util.List; + public class JetRunConfigurationProducer extends RuntimeConfigurationProducer implements Cloneable { @Nullable private PsiElement mySourceElement; @@ -100,7 +102,7 @@ public class JetRunConfigurationProducer extends RuntimeConfigurationProducer im @Override protected RunnerAndConfigurationSettings findExistingByElement( Location location, - @NotNull RunnerAndConfigurationSettings[] existingConfigurations, + @NotNull List existingConfigurations, ConfigurationContext context ) { FqName startClassFQName = getStartClassFQName(location); diff --git a/update_dependencies.xml b/update_dependencies.xml index f76c056aa3e..30e608292a4 100644 --- a/update_dependencies.xml +++ b/update_dependencies.xml @@ -1,6 +1,6 @@ - - + +