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

Update to IDEA 13.1 (134.1007)

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-02-13 16:11:39 +04:00
parent 4c57aa9f23
commit 9f3b73986a
29 changed files with 133 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/hamcrest_core_1_3.xml
Generated
+11
View File
@@ -0,0 +1,11 @@
<component name="libraryTable">
<library name="hamcrest-core-1.3">
<CLASSES>
<root url="jar://$PROJECT_DIR$/dependencies/hamcrest-core.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/dependencies/hamcrest-core-sources.jar!/" />
</SOURCES>
</library>
</component>
build.xml
+2
View File
@@ -357,6 +357,7 @@
<else>
<available property="rtjar" value="${java.home}/lib/rt.jar" file="${java.home}/lib/rt.jar"/>
<available property="jssejar" value="${java.home}/lib/jsse.jar" file="${java.home}/lib/jsse.jar"/>
<available property="rtjar" value="${java.home}/../Classes/classes.jar" file="${java.home}/../Classes/classes.jar"/>
<proguard><![CDATA[
@@ -396,6 +397,7 @@
-dontwarn org.objectweb.asm.** # this is ASM3, the old version that we do not use
-libraryjars '${rtjar}'
-libraryjars '${jssejar}'
-libraryjars '${bootstrap.runtime}'
-target 1.6
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/MockPsiDocumentManager.java
+3 -1
View File
@@ -67,8 +67,10 @@ public class MockPsiDocumentManager extends PsiDocumentManager {
public void commitDocument(@NotNull Document document) {
}
@NotNull
@Override
public CharSequence getLastCommittedText(@NotNull Document document) {
return document.getText();
return document.getImmutableCharSequence();
}
@Override
compiler/testData/asJava/nullabilityAnnotations/Generic.java
+1 -1
View File
@@ -1,4 +1,4 @@
public interface Generic <N, NN> extends jet.JetObject {
public interface Generic <N, NN> extends jet.JetObject {
N a(@jet.runtime.typeinfo.JetValueParameter(name = "n") N n);
@org.jetbrains.annotations.NotNull
compiler/testData/resolve/ResolveToJava2.resolve
+1 -1
View File
@@ -8,7 +8,7 @@ import java.`java::java.util`util.*
fun <T> t(t : T) : T {
`c`c(java.lang.Integer(1))
System.out.`java::java.io.PrintStream.print(Object)`print(t)
System.out.`java::java.io.PrintStream.print(char[])`print(null : CharArray?)
System.out.`java::java.io.PrintStream.print(char[])`print(null : CharArray)
System.out.`java::java.io.PrintStream.print(Object)`print(null : Object?)
System.out.`java::java.io.PrintStream.print(Int)`print(1)
System.out.`java::java.io.PrintStream.print(Double)`print(1.0)
compiler/tests/compiler-tests.iml
+1
View File
@@ -20,6 +20,7 @@
<orderEntry type="module" module-name="descriptor.loader.java" />
<orderEntry type="module" module-name="util" />
<orderEntry type="module" module-name="builtins-serializer" />
<orderEntry type="library" name="hamcrest-core-1.3" level="project" />
</component>
</module>
compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java
+3
View File
@@ -78,6 +78,9 @@ public class IdeaJdkAnnotationsReflectedTest extends KotlinTestWithEnvironment {
for (FqName classFqName : JdkAnnotationsValidityTest.getAffectedClasses("jar://ideaSDK/lib/jdkAnnotations.jar!/")) {
if (new FqName("org.jdom").equals(classFqName.parent())) continue; // filter unrelated jdom annotations
if (new FqName("java.util.concurrent.TransferQueue").equals(classFqName)) continue; // filter JDK7-specific class
if (new FqName("java.util.Objects").equals(classFqName)) continue; // filter JDK7-specific class
if (new FqName("java.nio.file.Files").equals(classFqName)) continue; // filter JDK7-specific class
if (new FqName("java.nio.file.Paths").equals(classFqName)) continue; // filter JDK7-specific class
// the following idea annotation is incorrect
// <item name="java.io.StringWriter void write(java.lang.String) 0">
// <annotation name="org.jetbrains.annotations.NotNull" />
idea/src/META-INF/plugin.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<version>@snapshot@</version>
<vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
<idea-version since-build="133.0" until-build="134.0"/>
<idea-version since-build="134.0" until-build="134.1010"/>
<depends optional="true" config-file="junit.xml">JUnit</depends>
<depends optional="true" config-file="gradle.xml">org.jetbrains.plugins.gradle</depends>
idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java
+2 -1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.plugin.k2jsrun;
import com.intellij.ide.browsers.BrowsersConfiguration;
import com.intellij.ide.browsers.WebBrowserManager;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
@@ -31,7 +32,7 @@ public final class K2JSConfigurationSettings {
private boolean shouldOpenInBrowserAfterTranslation = false;
@NotNull
private BrowsersConfiguration.BrowserFamily browserFamily = BrowsersConfiguration.getInstance().getActiveBrowsers().get(0);
private BrowsersConfiguration.BrowserFamily browserFamily = WebBrowserManager.getInstance().getActiveBrowsers().get(0).getFamily();
public K2JSConfigurationSettings(@NotNull Project project) {
String basePath = project.getBasePath();
idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java
+4 -2
View File
@@ -17,6 +17,8 @@
package org.jetbrains.jet.plugin.k2jsrun;
import com.intellij.ide.browsers.BrowsersConfiguration;
import com.intellij.ide.browsers.WebBrowser;
import com.intellij.ide.browsers.WebBrowserManager;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
import com.intellij.openapi.fileTypes.StdFileTypes;
@@ -137,8 +139,8 @@ public final class K2JSRunConfigurationEditor extends SettingsEditor<K2JSRunConf
}
private void setUpBrowserCombobox() {
for (BrowsersConfiguration.BrowserFamily family : BrowsersConfiguration.getInstance().getActiveBrowsers()) {
browserComboBox.addItem(family);
for (WebBrowser browser : WebBrowserManager.getInstance().getActiveBrowsers()) {
browserComboBox.addItem(browser.getFamily());
}
browserComboBox.setRenderer(new ListCellRendererWrapper<BrowsersConfiguration.BrowserFamily>() {
@Override
idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java
+2 -5
View File
@@ -19,10 +19,7 @@ package org.jetbrains.jet.plugin.liveTemplates;
import com.intellij.codeInsight.completion.*;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.template.TemplateContextType;
import com.intellij.codeInsight.template.impl.LiveTemplateLookupElement;
import com.intellij.codeInsight.template.impl.TemplateImpl;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.codeInsight.template.impl.TemplateSettings;
import com.intellij.codeInsight.template.impl.*;
import com.intellij.openapi.util.Ref;
import com.intellij.patterns.ElementPattern;
import com.intellij.patterns.PlatformPatterns;
@@ -86,7 +83,7 @@ public class JetLiveTemplateCompletionContributor extends CompletionContributor
if (!templatesShown.get()) {
templatesShown.set(true);
for (TemplateImpl possible : templates) {
result.addElement(new LiveTemplateLookupElement(possible, false));
result.addElement(new LiveTemplateLookupElementImpl(possible, false));
}
}
}
idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java
-4
View File
@@ -120,10 +120,6 @@ public class JetInplaceVariableIntroducer extends InplaceVariableIntroducer<JetE
}
SpecifyTypeExplicitlyAction.addTypeAnnotation(myProject, myEditor, myProperty, myExprType);
PsiDocumentManager.getInstance(myProject).commitDocument(myEditor.getDocument());
TemplateState templateState = TemplateManagerImpl.getTemplateState(myEditor);
if (templateState != null) {
templateState.doReformat(myProperty.getTextRange());
}
}
else {
SpecifyTypeExplicitlyAction.removeTypeAnnotation(myProperty);
idea/testData/completion/basic/java/PropertyMetadata.kt
+2 -1
View File
@@ -8,4 +8,5 @@ fun firstFun() {
// INVOCATION_COUNT: 1
// EXIST: { lookupString:"PropertyMetadata", itemText:"PropertyMetadata", tailText:" (jet)" }
// EXIST: { lookupString:"PropertyMetadataImpl", itemText:"PropertyMetadataImpl", tailText:" (jet)" }
// NUMBER: 2
// EXIST: {"lookupString":"PropertyMetadata$$TImpl","tailText":" (jet)","typeText":"","itemText":"PropertyMetadata$$TImpl"}
// NUMBER: 3
idea/testData/completion/injava/ClassesFromNamespace.java
+1 -2
View File
@@ -10,5 +10,4 @@ public class Testing {
// EXIST: LibTrait
// EXIST: LibEnum
// EXIST: LibObject
// EXIST: FooPackage
// NUMBER: 5
// EXIST: FooPackage
idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.results.txt
+1 -2
View File
@@ -1,5 +1,4 @@
Unclassified usage (1: 19) public open class X: A()
Unclassified usage (3: 14) public trait T: A
Unclassified usage (5: 19) public open class Y: X()
Unclassified usage (7: 14) public class Z: Y(), T
Unclassified usage (7: 14) public class Z: Y(), T
Unclassified usage (7: 14) public class Z: Y(), T
idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.results.txt
+1 -2
View File
@@ -1,5 +1,4 @@
Unclassified usage (2: 23) public open class X: A()
Unclassified usage (4: 18) public trait T: A
Unclassified usage (7: 27) public open class Y: X()
Unclassified usage (9: 22) public class Z: Y(), T
Unclassified usage (9: 22) public class Z: Y(), T
Unclassified usage (9: 22) public class Z: Y(), T
idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.results.txt
+1 -2
View File
@@ -1,5 +1,4 @@
Unclassified usage (2: 23) public open class X: A()
Unclassified usage (4: 18) public trait T: A
Unclassified usage (7: 27) public open class Y: X()
Unclassified usage (9: 22) public class Z: Y(), T
Unclassified usage (9: 22) public class Z: Y(), T
Unclassified usage (9: 22) public class Z: Y(), T
idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.results.txt
+1 -2
View File
@@ -1,4 +1,3 @@
Unclassified usage (1: 19) public open class X: A
Unclassified usage (5: 19) public open class Y: X()
Unclassified usage (7: 14) public class Z: Y(), T
Unclassified usage (7: 14) public class Z: Y(), T
Unclassified usage (7: 14) public class Z: Y(), T
idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.results.txt
+1 -2
View File
@@ -1,4 +1,3 @@
Unclassified usage (2: 23) public open class X: A
Unclassified usage (7: 27) public open class Y: X()
Unclassified usage (9: 22) public class Z: Y(), T
Unclassified usage (9: 22) public class Z: Y(), T
Unclassified usage (9: 22) public class Z: Y(), T
idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTestBase.kt
+2 -2
View File
@@ -130,8 +130,8 @@ public abstract class CompletionHandlerTestBase() : JetLightCodeInsightFixtureTe
val lookup = (fixture.getLookup() as LookupImpl)
lookup.setCurrentItem(item)
if (LookupEvent.isSpecialCompletionChar(completionChar)) {
(object : WriteCommandAction.Simple(getProject()) {
protected override fun run(result: Result<Any?>?) {
(object : WriteCommandAction.Simple<Any>(getProject()) {
protected override fun run(result: Result<Any>) {
run()
}
protected override fun run() {
idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java
+1 -1
View File
@@ -186,7 +186,7 @@ public abstract class AbstractOverrideImplementTest extends LightCodeInsightFixt
}
private void generateImplementation(@NotNull final PsiMethod method) {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
WriteCommandAction.runWriteCommandAction(getProject(), new Runnable() {
@Override
public void run() {
PsiClass aClass = ((PsiClassOwner) myFixture.getFile()).getClasses()[0];
idea/tests/org/jetbrains/jet/plugin/codeInsight/LiveTemplatesTest.java
+9 -9
View File
@@ -267,6 +267,14 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
private void typeAndNextTab(String s) {
type(s);
nextTab();
}
private void type(String s) {
myFixture.type(s);
}
private void nextTab() {
UIUtil.invokeAndWaitIfNeeded(new Runnable() {
@Override
public void run() {
@@ -276,7 +284,7 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
nextTab();
getTemplateState().nextTab();
}
});
}
@@ -285,14 +293,6 @@ public class LiveTemplatesTest extends LightCodeInsightFixtureTestCase {
});
}
private void type(String s) {
myFixture.type(s);
}
private void nextTab() {
getTemplateState().nextTab();
}
private void nextTab(int times) {
for (int i = 0; i < times; i++) {
nextTab();
idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java
+1 -1
View File
@@ -33,7 +33,7 @@ import java.util.List;
public class JUnitMembersSearcherTest extends AbstractSearcherTest {
private static final LightProjectDescriptor junitProjectDescriptor =
new JetJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.10.jar"));
new JetJdkAndLibraryProjectDescriptor(new File(PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/junit-4.11.jar"));
public void testJunit3() throws IOException {
doJUnit3test();
j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt
+3 -1
View File
@@ -34,6 +34,8 @@ import com.intellij.psi.codeStyle.CodeStyleManager
import org.jetbrains.jet.JetTestUtils
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.command.WriteCommandAction
import com.intellij.openapi.application.Result
public abstract class AbstractJavaToKotlinConverterPluginTest() : AbstractJavaToKotlinConverterTest("ide.kt", PluginSettings)
public abstract class AbstractJavaToKotlinConverterBasicTest() : AbstractJavaToKotlinConverterTest("kt", TestSettings)
@@ -72,7 +74,7 @@ abstract class AbstractJavaToKotlinConverterTest(
private fun reformat(text: String, project: Project): String {
val convertedFile = JetTestUtils.createFile("converted", text, project)
ApplicationManager.getApplication()!!.runWriteAction {
WriteCommandAction.runWriteCommandAction(project) {
CodeStyleManager.getInstance(project)!!.reformat(convertedFile)
}
return convertedFile.getText()!!
jdk-annotations/java/io/annotations.xml
+18
View File
@@ -603,6 +603,12 @@
<item name="java.io.PipedWriter void write(char[], int, int) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.io.PrintStream void print(char[]) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.io.PrintStream void println(char[]) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.io.PrintStream PrintStream(java.io.File, java.lang.String) 1">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
@@ -642,6 +648,18 @@
<item name="java.io.PrintStream java.io.PrintStream printf(java.util.Locale, java.lang.String, java.lang.Object...)">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.io.PrintStream java.io.PrintStream printf(java.lang.String, java.lang.Object...) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.io.PrintStream java.io.PrintStream printf(java.util.Locale, java.lang.String, java.lang.Object...) 1">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.io.PrintStream java.io.PrintStream format(java.lang.String, java.lang.Object...) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.io.PrintStream java.io.PrintStream format(java.util.Locale, java.lang.String, java.lang.Object...) 1">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.io.PrintStream java.lang.Appendable append(char)">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
jdk-annotations/java/nio/annotations.xml
+15
View File
@@ -24,6 +24,12 @@
<item name="java.nio.ByteBuffer byte[] array()">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.nio.Buffer java.lang.Object array()">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.nio.CharBuffer char[] array()">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.nio.ByteBuffer int compareTo(java.lang.Object) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
@@ -264,6 +270,9 @@
<item name="java.nio.CharBuffer java.nio.CharBuffer wrap(char[], int, int)">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.nio.CharBuffer java.nio.CharBuffer wrap(char[], int, int) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.nio.CharBuffer java.nio.CharBuffer wrap(java.lang.CharSequence)">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
@@ -273,6 +282,9 @@
<item name="java.nio.CharBuffer java.nio.CharBuffer wrap(java.lang.CharSequence, int, int)">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.nio.CharBuffer java.nio.CharBuffer wrap(java.lang.CharSequence, int, int) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.nio.DoubleBuffer int compareTo(java.lang.Object) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
@@ -624,5 +636,8 @@
<item name="java.nio.ShortBuffer java.nio.ShortBuffer wrap(short[], int, int)">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.nio.charset.Charset java.util.SortedMap&lt;java.lang.String,java.nio.charset.Charset&gt; availableCharsets()">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
</root>
jdk-annotations/java/nio/charset/annotations.xml
+3
View File
@@ -141,5 +141,8 @@
<item name="java.nio.charset.Charset java.nio.charset.Charset defaultCharset()">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name='java.nio.charset.Charset java.util.SortedMap&lt;java.lang.String,java.nio.charset.Charset&gt; availableCharsets()'>
<annotation name='org.jetbrains.annotations.NotNull'/>
</item>
</root>
jdk-annotations/java/util/annotations.xml
+36
View File
@@ -2110,6 +2110,9 @@
<item name="java.util.Formatter java.util.Formatter format(java.util.Locale, java.lang.String, java.lang.Object...)">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.Formatter java.util.Formatter format(java.util.Locale, java.lang.String, java.lang.Object...) 1">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.Formatter.BigDecimalLayoutForm java.util.Formatter.BigDecimalLayoutForm valueOf(java.lang.String)">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
@@ -2983,12 +2986,21 @@
<item name="java.util.Random void nextBytes(byte[]) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.Set&lt;java.lang.String&gt; handleKeySet()">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.Enumeration&lt;java.lang.String&gt; getKeys()">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle boolean containsKey(java.lang.String) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.lang.Object getObject(java.lang.String)">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.lang.Object getObject(java.lang.String) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.lang.Object handleGetObject(java.lang.String) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
@@ -2998,15 +3010,33 @@
<item name="java.util.ResourceBundle java.lang.String[] getStringArray(java.lang.String)">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.lang.String getString(java.lang.String) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.lang.String[] getStringArray(java.lang.String) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale) 1">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader) 1">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader) 2">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader, java.util.ResourceBundle.Control) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader, java.util.ResourceBundle.Control) 1">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
@@ -3016,12 +3046,18 @@
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.lang.ClassLoader, java.util.ResourceBundle.Control) 3">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.util.ResourceBundle.Control) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.util.ResourceBundle.Control) 1">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.Locale, java.util.ResourceBundle.Control) 2">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.ResourceBundle.Control) 0">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
<item name="java.util.ResourceBundle java.util.ResourceBundle getBundle(java.lang.String, java.util.ResourceBundle.Control) 1">
<annotation name="org.jetbrains.annotations.NotNull"/>
</item>
update_dependencies.xml
+6 -3
View File
@@ -1,6 +1,6 @@
<project name="Update Dependencies" default="update">
<property name="jb.buildserver.build.id" value="2328799"/>
<property name="public.buildserver.build.id" value="112061"/>
<property name="jb.buildserver.build.id" value="2358260"/>
<property name="public.buildserver.build.id" value="114358"/>
<condition property="os.tag" value="win.zip">
<os family="windows" />
@@ -19,7 +19,7 @@
</and>
</condition>
<property name="idea.build.number" value="133.SNAPSHOT"/>
<property name="idea.build.number" value="134.SNAPSHOT"/>
<property name="idea.archive.name" value="ideaIC-${idea.build.number}.${os.tag}"/>
@@ -144,6 +144,9 @@
<!-- dx.jar -->
<get-maven-library prefix="com/google/android/tools" lib="dx" version="1.7" target.jar.name.base="dx"/>
<!-- hamcrest-core.jar -->
<get-maven-library prefix="org/hamcrest" lib="hamcrest-core" version="1.3" target.jar.name.base="hamcrest-core"/>
<!-- jflex 1.4 -->
<mkdir dir="dependencies/jflex"/>
<get src="https://raw.github.com/JetBrains/intellij-community/master/tools/lexer/jflex-1.4/lib/JFlex.jar"