summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolkmar W. Pogatzki <gentoo@pogatzki.net>2021-03-21 23:49:07 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2021-03-23 12:34:52 +0100
commitbd533e235aaed52b228da10d149e3ec5ee54ba3b (patch)
tree6c560a1a37bdf10cb3b2e6e870d798f7613b132c /dev-java/hamcrest-library/files
parentdev-java/hamcrest-core: Switch :1.3 to java-pkg-simple (diff)
downloadgentoo-bd533e235aaed52b228da10d149e3ec5ee54ba3b.tar.gz
gentoo-bd533e235aaed52b228da10d149e3ec5ee54ba3b.tar.bz2
gentoo-bd533e235aaed52b228da10d149e3ec5ee54ba3b.zip
dev-java/hamcrest-library: EAPI 7
Switch to java-pkg-simple Adjustments for java 11 Use mirror://gentoo for SRC_URI Remove obsolete remote-id Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/20062 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java/hamcrest-library/files')
-rw-r--r--dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch b/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch
new file mode 100644
index 000000000000..fb749dfe7d24
--- /dev/null
+++ b/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch
@@ -0,0 +1,44 @@
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+@@ -122,7 +122,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
+ */
+ @Factory
+ public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
+- return containsInAnyOrder(Arrays.asList(itemMatchers));
++ return containsInAnyOrder((List<Matcher<? super T>>) Arrays.asList(itemMatchers));
+ }
+
+ /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
+@@ -138,7 +138,7 @@ public class IsIterableContainingInOrder<E> extends TypeSafeDiagnosingMatcher<It
+ */
+ @Factory
+ public static <E> Matcher<Iterable<? extends E>> contains(Matcher<? super E>... itemMatchers) {
+- return contains(asList(itemMatchers));
++ return contains((List<Matcher<? super E>>) asList(itemMatchers));
+ }
+
+ /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+@@ -55,7 +55,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
+ */
+ @Factory
+ public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
++ return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers));
+ }
+
+ /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+@@ -69,7 +69,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
+ */
+ @Factory
+ public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
+- return arrayContaining(asList(itemMatchers));
++ return arrayContaining((List<Matcher<? super E>>) asList(itemMatchers));
+ }
+
+ /**