[Git][java-team/libhamcrest-java][master] 3 commits: Fixed the type inference errors when building with source/target level 8 (Closes: #1052743)
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Wed Sep 27 07:21:02 BST 2023
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libhamcrest-java
Commits:
775c0fe4 by Emmanuel Bourg at 2023-09-27T08:18:29+02:00
Fixed the type inference errors when building with source/target level 8 (Closes: #1052743)
- - - - -
1ec23f61 by Emmanuel Bourg at 2023-09-27T08:18:39+02:00
Standards-Version updated to 4.6.2
- - - - -
e8f4ed6d by Emmanuel Bourg at 2023-09-27T08:20:17+02:00
Upload to unstable
- - - - -
4 changed files:
- debian/changelog
- debian/control
- + debian/patches/06-type-inference-fix.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libhamcrest-java (2.2-2) unstable; urgency=medium
+
+ * Fixed the type inference errors when building with source/target level 8
+ (Closes: #1052743)
+ * Standards-Version updated to 4.6.2
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 27 Sep 2023 08:20:10 +0200
+
libhamcrest-java (2.2-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -16,7 +16,7 @@ Build-Depends:
junit4,
libeasymock-java,
libjmock-java
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/libhamcrest-java.git
Vcs-Browser: https://salsa.debian.org/java-team/libhamcrest-java
Homepage: http://hamcrest.org
=====================================
debian/patches/06-type-inference-fix.patch
=====================================
@@ -0,0 +1,116 @@
+Description: Fixes the type inference errors when building with the source/target level set to Java 8
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
++++ b/hamcrest/src/main/java/org/hamcrest/core/AllOf.java
+@@ -46,7 +46,7 @@
+ * <pre>assertThat("myValue", allOf(startsWith("my"), containsString("Val")))</pre>
+ */
+ public static <T> Matcher<T> allOf(Iterable<Matcher<? super T>> matchers) {
+- return new AllOf<>(matchers);
++ return new AllOf<>((java.util.List) matchers);
+ }
+
+ /**
+@@ -56,6 +56,6 @@
+ */
+ @SafeVarargs
+ public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
+- return allOf(Arrays.asList(matchers));
++ return allOf((java.util.List) Arrays.asList(matchers));
+ }
+ }
+--- a/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
++++ b/hamcrest/src/main/java/org/hamcrest/core/AnyOf.java
+@@ -36,7 +36,7 @@
+ * <pre>assertThat("myValue", anyOf(startsWith("foo"), containsString("Val")))</pre>
+ */
+ public static <T> AnyOf<T> anyOf(Iterable<Matcher<? super T>> matchers) {
+- return new AnyOf<>(matchers);
++ return new AnyOf<>((java.util.List) matchers);
+ }
+
+ /**
+@@ -46,6 +46,6 @@
+ */
+ @SafeVarargs
+ public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {
+- return anyOf(Arrays.asList(matchers));
++ return anyOf((java.util.List) Arrays.asList(matchers));
+ }
+ }
+--- a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
+@@ -67,7 +67,7 @@
+ */
+ @SafeVarargs
+ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+- return arrayContainingInAnyOrder(asList(itemMatchers));
++ return arrayContainingInAnyOrder((List) asList(itemMatchers));
+ }
+
+ /**
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+@@ -98,7 +98,7 @@
+ */
+ @SafeVarargs
+ public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
+- return containsInAnyOrder(Arrays.asList(itemMatchers));
++ return containsInAnyOrder((List) Arrays.asList(itemMatchers));
+ }
+
+ /**
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+@@ -73,7 +73,7 @@
+ * the matchers that must be satisfied by the items in the examined array
+ */
+ public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
+- return arrayContaining(asList(itemMatchers));
++ return arrayContaining((List) asList(itemMatchers));
+ }
+
+ /**
+--- a/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
++++ b/hamcrest/src/main/java/org/hamcrest/core/CombinableMatcher.java
+@@ -57,7 +57,7 @@
+ this.first = matcher;
+ }
+ public CombinableMatcher<X> and(Matcher<? super X> other) {
+- return new CombinableMatcher<>(first).and(other);
++ return new CombinableMatcher<>(first).and((Matcher) other);
+ }
+ }
+
+@@ -76,7 +76,7 @@
+ this.first = matcher;
+ }
+ public CombinableMatcher<X> or(Matcher<? super X> other) {
+- return new CombinableMatcher<>(first).or(other);
++ return new CombinableMatcher<>(first).or((Matcher) other);
+ }
+ }
+ }
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsIterableContainingInRelativeOrder.java
+@@ -99,7 +99,7 @@
+ */
+ @SafeVarargs
+ public static <E> Matcher<Iterable<? extends E>> containsInRelativeOrder(Matcher<? super E>... itemMatchers) {
+- return containsInRelativeOrder(asList(itemMatchers));
++ return containsInRelativeOrder((List) asList(itemMatchers));
+ }
+
+ /**
+--- a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
++++ b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+@@ -59,7 +59,7 @@
+ * a list of matchers, each of which must be satisfied by an entry in an examined array
+ */
+ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
++ return arrayContainingInAnyOrder((List) Arrays.asList(itemMatchers));
+ }
+
+ /**
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
04-gradle-build.patch
05-backward-compatibility.patch
+06-type-inference-fix.patch
View it on GitLab: https://salsa.debian.org/java-team/libhamcrest-java/-/compare/d0edd2e45e18f9435a276a918b25b08ce77c8e49...e8f4ed6dc857d4bf587e1aee87fba95d26fcbfed
--
View it on GitLab: https://salsa.debian.org/java-team/libhamcrest-java/-/compare/d0edd2e45e18f9435a276a918b25b08ce77c8e49...e8f4ed6dc857d4bf587e1aee87fba95d26fcbfed
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20230927/355c69e4/attachment.htm>
More information about the pkg-java-commits
mailing list