Emmanuel Bourg pushed to branch master at Debian Java Maintainers / guava-libraries
Commits: 0af32644 by Emmanuel Bourg at 2020-05-19T09:39:43+02:00 Removed the --has-package-version flag (Closes: #960976) - - - - - a4350e5e by Emmanuel Bourg at 2020-05-19T10:12:22+02:00 Restored the compatibility between Guava and Java predicates - - - - - f3917bfc by Emmanuel Bourg at 2020-05-19T10:13:09+02:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - debian/libguava-java.poms - − debian/patches/19-remove-predicate-test-method.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +guava-libraries (29.0-3) unstable; urgency=medium + + * Removed the --has-package-version flag (Closes: #960976) + * Restored the compatibility between Guava and Java predicates + + -- Emmanuel Bourg <[email protected]> Tue, 19 May 2020 10:13:03 +0200 + guava-libraries (29.0-2) unstable; urgency=medium * Build the guava-testlib module (required by Bazel) ===================================== debian/libguava-java.poms ===================================== @@ -26,8 +26,8 @@ # Empty by default. [mh_install] # pom.xml --no-parent --has-package-version -guava/pom.xml --has-package-version --java-lib +guava/pom.xml --java-lib guava-bom/pom.xml --ignore guava-gwt/pom.xml --ignore -guava-testlib/pom.xml --has-package-version --java-lib --package=libguava-testlib-java +guava-testlib/pom.xml --java-lib --package=libguava-testlib-java guava-tests/pom.xml --ignore ===================================== debian/patches/19-remove-predicate-test-method.patch deleted ===================================== @@ -1,85 +0,0 @@ -Description: Removes the compatibility between com.google.common.base.Predicate and - java.util.function.Predicate (introduced in Guava 21) since it breaks - pre Java 8 projects implementing this class -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/guava/src/com/google/common/base/Predicate.java -+++ b/guava/src/com/google/common/base/Predicate.java -@@ -42,7 +42,7 @@ - */ - @FunctionalInterface - @GwtCompatible --public interface Predicate<T> extends java.util.function.Predicate<T> { -+public interface Predicate<T> { - /** - * Returns the result of applying this predicate to {@code input} (Java 8 users, see notes in the - * class documentation above). This method is <i>generally expected</i>, but not absolutely -@@ -74,8 +74,4 @@ - @Override - boolean equals(@Nullable Object object); - -- @Override -- default boolean test(@Nullable T input) { -- return apply(input); -- } - } ---- a/guava/src/com/google/common/collect/Collections2.java -+++ b/guava/src/com/google/common/collect/Collections2.java -@@ -179,7 +179,7 @@ - - @Override - public Spliterator<E> spliterator() { -- return CollectSpliterators.filter(unfiltered.spliterator(), predicate); -+ return CollectSpliterators.filter(unfiltered.spliterator(), predicate::apply); - } - - @Override -@@ -187,7 +187,7 @@ - checkNotNull(action); - unfiltered.forEach( - (E e) -> { -- if (predicate.test(e)) { -+ if (predicate.apply(e)) { - action.accept(e); - } - }); ---- a/guava/src/com/google/common/collect/Iterables.java -+++ b/guava/src/com/google/common/collect/Iterables.java -@@ -193,7 +193,7 @@ - @CanIgnoreReturnValue - public static <T> boolean removeIf(Iterable<T> removeFrom, Predicate<? super T> predicate) { - if (removeFrom instanceof Collection) { -- return ((Collection<T>) removeFrom).removeIf(predicate); -+ return ((Collection<T>) removeFrom).removeIf(predicate::apply); - } - return Iterators.removeIf(removeFrom.iterator(), predicate); - } -@@ -564,7 +564,7 @@ - checkNotNull(action); - unfiltered.forEach( - (T a) -> { -- if (retainIfTrue.test(a)) { -+ if (retainIfTrue.apply(a)) { - action.accept(a); - } - }); -@@ -572,7 +572,7 @@ - - @Override - public Spliterator<T> spliterator() { -- return CollectSpliterators.filter(unfiltered.spliterator(), retainIfTrue); -+ return CollectSpliterators.filter(unfiltered.spliterator(), retainIfTrue::apply); - } - }; - } ---- a/guava/src/com/google/common/base/CharMatcher.java -+++ b/guava/src/com/google/common/base/CharMatcher.java -@@ -367,7 +367,7 @@ - - /** Returns a matcher that matches any character not matched by this matcher. */ - // @Override under Java 8 but not under Java 7 -- @Override -+ //@Override - public CharMatcher negate() { - return new Negated(this); - } ===================================== debian/patches/series ===================================== @@ -11,7 +11,6 @@ 16-preserve-file-tree-traverser.patch 17-preserve-executors.patch 18-preserve-objects-first-non-null.patch -19-remove-predicate-test-method.patch 20-preserve-charmatcher-constants.patch 21-preserve-tostringhelper.patch 22-preserve-futures-methods.patch View it on GitLab: https://salsa.debian.org/java-team/guava-libraries/-/compare/976ed59b778f58d80e1bb44155761bf2765f4346...f3917bfceb34f56dd9c2f7c9f4fcef35e7980177 -- View it on GitLab: https://salsa.debian.org/java-team/guava-libraries/-/compare/976ed59b778f58d80e1bb44155761bf2765f4346...f3917bfceb34f56dd9c2f7c9f4fcef35e7980177 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
