azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to IDEA EAP 130.1619

Browse Source
This commit is contained in:
Alexander Udalov
2013-08-19 21:02:57 +04:00
parent 3d28c4cdb2
commit 5a3834e54d
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<version>@snapshot@</version> <version>@snapshot@</version>
<vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor> <vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
<idea-version since-build="130.1364" until-build="131.0"/> <idea-version since-build="130.1619" until-build="131.0"/>
<depends optional="true" config-file="junit.xml">JUnit</depends> <depends optional="true" config-file="junit.xml">JUnit</depends>
<depends optional="true" config-file="testng-j.xml">TestNG-J</depends> <depends optional="true" config-file="testng-j.xml">TestNG-J</depends>
idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java
+3 -1
View File
@@ -34,6 +34,8 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.plugin.JetMainDetector; import org.jetbrains.jet.plugin.JetMainDetector;
import org.jetbrains.jet.plugin.framework.KotlinFrameworkDetector; import org.jetbrains.jet.plugin.framework.KotlinFrameworkDetector;
import java.util.List;
public class JetRunConfigurationProducer extends RuntimeConfigurationProducer implements Cloneable { public class JetRunConfigurationProducer extends RuntimeConfigurationProducer implements Cloneable {
@Nullable @Nullable
private PsiElement mySourceElement; private PsiElement mySourceElement;
@@ -100,7 +102,7 @@ public class JetRunConfigurationProducer extends RuntimeConfigurationProducer im
@Override @Override
protected RunnerAndConfigurationSettings findExistingByElement( protected RunnerAndConfigurationSettings findExistingByElement(
Location location, Location location,
@NotNull RunnerAndConfigurationSettings[] existingConfigurations, @NotNull List<RunnerAndConfigurationSettings> existingConfigurations,
ConfigurationContext context ConfigurationContext context
) { ) {
FqName startClassFQName = getStartClassFQName(location); FqName startClassFQName = getStartClassFQName(location);
update_dependencies.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<project name="Update Dependencies" default="update"> <project name="Update Dependencies" default="update">
<property name="jb.buildserver.build.id" value="2007632"/> <property name="jb.buildserver.build.id" value="2030397"/>
<property name="public.buildserver.build.id" value="87877"/> <property name="public.buildserver.build.id" value="89111"/>
<property name="idea.archive.name" value="ideaIC-130.SNAPSHOT.win.zip"/> <property name="idea.archive.name" value="ideaIC-130.SNAPSHOT.win.zip"/>
<property name="idea.sdk.fetch.needed" value="true"/> <property name="idea.sdk.fetch.needed" value="true"/>