Skip to content

Commit be19630

Browse files
shs96cshs96c
committed
Bump the version of guava to 18
1 parent a009c52 commit be19630

File tree

13 files changed

+9
-12
lines changed

13 files changed

+9
-12
lines changed

Diff for: ‎.idea/libraries/guava_libraries.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎.idea/modules.xml

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎java/client/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.3.jar"/>
88
<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>
99
<classpathentry kind="lib" path="/third-party/java/testng/testng-6.8.5.jar" sourcepath="/third-party/java/testng/testng-6.8.5-sources.jar"/>
10-
<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-15.0.jar" sourcepath="/third-party/java/guava-libraries/guava-15.0-sources.jar"/>
10+
<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-18.0.jar" sourcepath="/third-party/java/guava-libraries/guava-18.0-sources.jar"/>
1111
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.15.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.15-sources.jar"/>
1212
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.15.jar"/>
1313
<classpathentry kind="lib" path="/third-party/java/jna/jna-3.4.0.jar" sourcepath="/third-party/java/jna/jna-3.4.0-src.jar"/>

Diff for: ‎java/client/src/org/openqa/selenium/remote/BUCK

-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ java_library(name = 'remote',
8686
],
8787
deps = [
8888
':http-session-id',
89-
'//java/client/src/org/openqa/selenium/browserlaunchers:proxies',
9089
'//java/client/src/org/openqa/selenium/io:io',
9190
'//java/client/src/org/openqa/selenium/net:net',
9291
'//third_party/java/apache-httpclient:apache-httpclient',

Diff for: ‎java/client/test/org/openqa/selenium/BUCK

-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ java_library(name = 'tests',
8888
deps = [
8989
':helpers',
9090
'//java/client/src/org/openqa/selenium:webdriver-api',
91-
'//java/client/src/org/openqa/selenium/browserlaunchers:proxies',
9291
'//java/client/src/org/openqa/selenium/ie:ie',
9392
'//java/client/src/org/openqa/selenium/io:io',
9493
'//java/client/src/org/openqa/selenium/net:net',

Diff for: ‎java/client/test/org/openqa/selenium/support/ui/ExpectedConditionsTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
/**
3535
* Tests for {@link ExpectedConditions}.
3636
*/
37+
@SuppressWarnings("unchecked")
3738
public class ExpectedConditionsTest {
3839

3940
@Mock private WebDriver mockDriver;
@@ -229,7 +230,7 @@ public void waitingForVisibilityOfAllElementsLocatedByThrowsTimeoutExceptionWhen
229230

230231
@Test
231232
public void waitingForVisibilityOfAllElementsReturnsListOfElements() {
232-
List webElements = Lists.newArrayList(mockElement);
233+
List<WebElement> webElements = Lists.newArrayList(mockElement);
233234
when(mockElement.isDisplayed()).thenReturn(true);
234235

235236
List<WebElement> returnedElements = wait.until(visibilityOfAllElements(webElements));

Diff for: ‎java/server/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<classpathentry kind="lib" path="/third-party/java/bouncycastle/bcpkix-jdk15on-1.48.jar" sourcepath="/third-party/java/bouncycastle/bcpkix-jdk15on-1.48-sources.jar"/>
2222
<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.14.jar" sourcepath="/third-party/java/webbit/webbit-0.4.14-src.jar"/>
2323
<classpathentry kind="lib" path="/third-party/java/netty/netty-3.5.7.Final.jar"/>
24-
<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-15.0.jar" sourcepath="/third-party/java/guava-libraries/guava-15.0-sources.jar"/>
24+
<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-18.0.jar" sourcepath="/third-party/java/guava-libraries/guava-18.0-sources.jar"/>
2525
<classpathentry kind="lib" path="/third-party/java/mockito/mockito-core-1.9.5.jar"/>
2626
<classpathentry kind="output" path="build/production"/>
2727
</classpath>

Diff for: ‎third_party/java/guava-libraries/BUCK

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
prebuilt_jar(name = 'guava-libraries',
2-
binary_jar = 'guava-15.0.jar',
3-
source_jar = 'guava-15.0-sources.jar',
2+
binary_jar = 'guava-18.0.jar',
3+
source_jar = 'guava-18.0-sources.jar',
44
visibility = ['PUBLIC'],
55
)

Diff for: ‎third_party/java/guava-libraries/build.desc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

22
java_library(name = "guava-libraries",
3-
deps = [ "guava-15.0.jar" ])
3+
deps = [ "guava-18.0.jar" ])

Diff for: ‎third_party/java/guava-libraries/guava-15.0-sources.jar

-1.18 MB
Binary file not shown.

Diff for: ‎third_party/java/guava-libraries/guava-15.0.jar

-2.07 MB
Binary file not shown.

Diff for: ‎third_party/java/guava-libraries/guava-18.0-sources.jar

1.22 MB
Binary file not shown.

Diff for: ‎third_party/java/guava-libraries/guava-18.0.jar

2.15 MB
Binary file not shown.

0 commit comments

Comments
 (0)