Skip to content

Commit 32e6a44

Browse files
committed
Bump the guava version to 15.
1 parent 7ff4763 commit 32e6a44

File tree

12 files changed

+10
-10
lines changed

12 files changed

+10
-10
lines changed

.idea/libraries/guava_libraries.xml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<classpathentry kind="lib" path="/third-party/java/android/android-14.jar"/>
88
<classpathentry kind="lib" path="/third-party/java/servlet-api/servlet-api-2.5-6.1.9.jar" sourcepath="/third-party/java/servlet-api/servlet-api-2.5-6.1.9-sources.jar"/>
99
<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.14.jar" sourcepath="/third-party/java/webbit/webbit-0.4.14-src.jar"/>
10-
<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-14.0.jar" sourcepath="/third-party/java/guava-libraries/guava-14.0-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"/>
1111
<classpathentry kind="output" path="bin/classes"/>
1212
</classpath>

android/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<copy file="${build.location}/android/server-nodeps.jar" todir="libs" />
3535
<copy file="${build.location}/third_party/java/webbit/webbit-standalone.jar" tofile="libs/webbit-server.jar" />
36-
<copy file="${third_party.location}/java/guava-libraries/guava-14.0.jar" todir="libs/" />
36+
<copy file="${third_party.location}/java/guava-libraries/guava-15.0.jar" todir="libs/" />
3737
<copy file="${third_party.location}/java/json/json-20080701.jar" todir="libs/" />
3838

3939
<import file="${sdk.dir}/tools/ant/build.xml" />

android/prebuilt/android-server.apk

-41.8 KB
Binary file not shown.

java/client/.classpath

Lines changed: 1 addition & 1 deletion
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-14.0.jar" sourcepath="/third-party/java/guava-libraries/guava-14.0-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"/>
1111
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.12.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.12-sources.jar"/>
1212
<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.12.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"/>

java/server/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
<classpathentry kind="lib" path="/third-party/java/bouncycastle/bcpkix-jdk15on-1.48.jar" sourcepath="/third-party/java/bouncycastle/bcpkix-jdk15on-1.48-sources.jar"/>
2121
<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.14.jar" sourcepath="/third-party/java/webbit/webbit-0.4.14-src.jar"/>
2222
<classpathentry kind="lib" path="/third-party/java/netty/netty-3.5.7.Final.jar"/>
23-
<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-14.0.jar" sourcepath="/third-party/java/guava-libraries/guava-14.0-sources.jar"/>
23+
<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-15.0.jar" sourcepath="/third-party/java/guava-libraries/guava-15.0-sources.jar"/>
2424
<classpathentry kind="output" path="build/production"/>
2525
</classpath>

third_party/java/guava-libraries/BUCK

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
prebuilt_jar(name = 'guava-libraries',
2-
binary_jar = 'guava-14.0.jar',
3-
source_jar = 'guava-14.0-sources.jar',
2+
binary_jar = 'guava-15.0.jar',
3+
source_jar = 'guava-15.0-sources.jar',
44
visibility = ['PUBLIC'],
55
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

22
java_library(name = "guava-libraries",
3-
deps = [ "guava-14.0.jar" ])
3+
deps = [ "guava-15.0.jar" ])
Binary file not shown.
-2.09 MB
Binary file not shown.

0 commit comments

Comments
 (0)