MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

update guava to 21.0

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-03-27 16:13:51 +02:00
parent b12ba9273c
commit ca7afcff13
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/Guava.xml
Generated
+2 -2
View File
@@ -1,11 +1,11 @@
<component name="libraryTable">
<library name="Guava">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/guava-19.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/guava-21.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/src/guava-19.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/src/guava-21.0-sources.jar!/" />
</SOURCES>
</library>
</component>
build/groovy/org/jetbrains/intellij/build/IntelliJCoreArtifactsBuilder.groovy
+1 -1
View File
@@ -97,7 +97,7 @@ class IntelliJCoreArtifactsBuilder {
ant.fileset(dir: "$home/lib") {
include(name: "asm-all.jar")
include(name: "guava-19.0.jar")
include(name: "guava-21.0.jar")
include(name: "picocontainer.jar")
include(name: "trove4j.jar")
include(name: "cli-parser-1.1.jar")
java/java-tests/testSrc/com/intellij/codeInspection/StaticPseudoFunctionalStyleMethodTest.java
+5 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,10 +39,10 @@ public class StaticPseudoFunctionalStyleMethodTest extends JavaCodeInsightFixtur
@Override
protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
moduleBuilder.setLanguageLevel(LanguageLevel.JDK_1_8);
moduleBuilder.addLibraryJars("guava-19.0.jar", PathManager.getHomePath().replace(File.separatorChar, '/') + "/community/lib/",
"guava-19.0.jar");
moduleBuilder.addLibraryJars("guava-19.0.jar-2", PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/",
"guava-19.0.jar");
moduleBuilder.addLibraryJars("guava-21.0.jar", PathManager.getHomePath().replace(File.separatorChar, '/') + "/community/lib/",
"guava-21.0.jar");
moduleBuilder.addLibraryJars("guava-21.0.jar-2", PathManager.getHomePath().replace(File.separatorChar, '/') + "/lib/",
"guava-21.0.jar");
moduleBuilder.addJdk(IdeaTestUtil.getMockJdk18Path().getPath());
}
java/typeMigration/test/com/intellij/codeInsight/inspections/GuavaInspectionTest.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ public class GuavaInspectionTest extends JavaCodeInsightFixtureTestCase {
@Override
protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception {
moduleBuilder.setLanguageLevel(LanguageLevel.JDK_1_8);
moduleBuilder.addLibraryJars("guava", PathManager.getHomePathFor(Assert.class) + "/lib/", "guava-19.0.jar");
moduleBuilder.addLibraryJars("guava", PathManager.getHomePathFor(Assert.class) + "/lib/", "guava-21.0.jar");
moduleBuilder.addLibraryJars("jsr305", PathManager.getHomePathFor(Assert.class) + "/lib/", "jsr305.jar");
moduleBuilder.addJdk(IdeaTestUtil.getMockJdk18Path().getPath());
}
lib/guava-19.0.jar
BIN
View File
Binary file not shown.
lib/guava-21.0.jar
BIN
View File
Binary file not shown.
lib/src/guava-19.0-sources.jar
BIN
View File
Binary file not shown.
lib/src/guava-21.0-sources.jar
BIN
View File
Binary file not shown.
python/src/com/jetbrains/python/toolbox/ChainIterable.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
*/
package com.jetbrains.python.toolbox;
import com.google.common.collect.Iterators;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -85,7 +85,7 @@ public class ChainIterable<T> extends ChainedListBase<Iterable<T>> implements It
private static class ChainIterator<T> implements Iterator<T> {
private ChainedListBase<Iterable<T>> myLink; // link of the chain we're currently at
@NotNull private Iterator<T> myCurrent = Iterators.emptyIterator();
@NotNull private Iterator<T> myCurrent = ContainerUtil.emptyIterator();
public ChainIterator(@Nullable ChainedListBase<Iterable<T>> initial) {
myLink = initial;