Skip to content

Commit c6d56bb

Browse files
committed
Merge pull request #434 from madvay/guava19rc1
Guava 19.0
2 parents 4bcd727 + f6e3512 commit c6d56bb

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

systemTests/externalLibrary1/third_party_guava/build.gradle

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,10 @@ dependencies {
3434
// to be translated and built into a standalone Objective C library.
3535
// j2objcTranslation must always be passed a *source* jar,
3636
// therefore, note the ':sources' classifier.
37-
j2objcTranslation 'com.google.guava:guava:18.0:sources'
37+
j2objcTranslation 'com.google.guava:guava:19.0:sources'
3838
}
3939

4040
j2objcConfig {
41-
// Per https://github.com/google/j2objc/blob/0.9.8.1/guava/README.txt
42-
translatePattern {
43-
exclude 'com/google/common/reflect/ClassPath.java'
44-
}
45-
4641
// For now, default config links in prebuilt Guava; that defeats the point.
4742
translateJ2objcLibs.remove("j2objc_guava.jar")
4843
linkJ2objcLibs.remove("guava")
@@ -55,9 +50,6 @@ j2objcConfig {
5550
"--final-methods-as-functions",
5651
"-q"
5752

58-
// Iterators and the like are common names across packages. This library must
59-
// be compiled with full directory paths.
60-
forceFilenameCollisionCheck false
6153
autoConfigureDeps true
6254
// Almost always there are no tests provided in an external source jar.
6355
testMinExpectedTests 0

0 commit comments

Comments
 (0)