From 596644e00f1b76f35e2adff612e8f1b389b987c4 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 11 Apr 2019 14:36:57 -0700 Subject: Update apkzlib for guava 27.1 Files.fileTreeTraverser() has been replaced with Files.fileTraverser(). Bug: 130306229 Test: m checkbuild Change-Id: I4a0519dc38e236cb32eb16019da11eaeaab35ad5 --- src/main/java/com/android/tools/build/apkzlib/zip/ZFile.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/android/tools/build/apkzlib/zip/ZFile.java b/src/main/java/com/android/tools/build/apkzlib/zip/ZFile.java index b7949b5..cca5f40 100644 --- a/src/main/java/com/android/tools/build/apkzlib/zip/ZFile.java +++ b/src/main/java/com/android/tools/build/apkzlib/zip/ZFile.java @@ -27,6 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Verify; import com.google.common.base.VerifyException; import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -2472,7 +2473,7 @@ public class ZFile implements Closeable { return; } - for (File f : Files.fileTreeTraverser().preOrderTraversal(file).skip(1)) { + for (File f : Iterables.skip(Files.fileTraverser().depthFirstPreOrder(file), 1)) { String path = file.toURI().relativize(f.toURI()).getPath(); InputStream stream; -- cgit v1.2.3