diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2021-03-17 18:09:50 +0100 |
|---|---|---|
| committer |   Miroslav Šulc <fordfrog@gentoo.org> | 2021-03-20 09:29:19 +0100 |
| commit | 7eb968c34b6f4bda3d7a72f1cc8740eaea11144d (patch) | |
| tree | 219e48fe6c9c252c8d3d403a3cbe2cd3ed353af7 /dev-java/hamcrest-core/files | |
| parent | x11-themes/numix-icon-theme: drop 18.07.17, 20.03.20 (diff) | |
| download | gentoo-7eb968c34b6f4bda3d7a72f1cc8740eaea11144d.tar.gz gentoo-7eb968c34b6f4bda3d7a72f1cc8740eaea11144d.tar.bz2 gentoo-7eb968c34b6f4bda3d7a72f1cc8740eaea11144d.zip | |
dev-java/hamcrest-core: jdk 11 + EAPI 7
SRC_URI (:1.3) was from googlecode.com
Allow jdk:11
Closes: https://bugs.gentoo.org/751379
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/19981
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java/hamcrest-core/files')
| -rw-r--r-- | dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch | 42 | ||||
| -rw-r--r-- | dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch | 26 |
2 files changed, 68 insertions, 0 deletions
diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch new file mode 100644 index 000000000000..1e3805eb1755 --- /dev/null +++ b/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch @@ -0,0 +1,42 @@ +diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java +index d435303..962c945 100644 +--- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java ++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java +@@ -1,6 +1,7 @@ + package org.hamcrest.core; + + import java.util.Arrays; ++import java.util.List; + + import org.hamcrest.Description; + import org.hamcrest.Factory; +@@ -32,7 +33,7 @@ public class AllOf<T> extends ShortcutCombination<T> { + */ + @Factory + public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) { +- return allOf(Arrays.asList(matchers)); ++ return allOf((List<Matcher<? super T>>) Arrays.asList(matchers)); + } + + /** +diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java +index e003a7f..4ed9030 100644 +--- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java ++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java +@@ -1,6 +1,7 @@ + package org.hamcrest.core; + + import java.util.Arrays; ++import java.util.List; + + import org.hamcrest.Description; + import org.hamcrest.Factory; +@@ -33,7 +34,7 @@ public class AnyOf<T> extends ShortcutCombination<T> { + */ + @Factory + public static <T> Matcher<T> anyOf(Matcher<? super T>... matchers) { +- return anyOf(Arrays.asList(matchers)); ++ return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers)); + } + + /** diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch new file mode 100644 index 000000000000..b250f1cc7c01 --- /dev/null +++ b/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch @@ -0,0 +1,26 @@ +diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java +index a206b80..d55cf6b 100644 +--- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java ++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java +@@ -57,7 +57,7 @@ public class AllOf<T> extends DiagnosingMatcher<T> { + */
+ @Factory
+ public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
+- return allOf(Arrays.asList(matchers));
++ return allOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+ }
+
+ /**
+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java +index 55d08dd..2a46631 100644 +--- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java ++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java +@@ -47,7 +47,7 @@ public class AnyOf<T> extends ShortcutCombination<T> { + */
+ @Factory
+ public static <T> AnyOf<T> anyOf(Matcher<? super T>... matchers) {
+- return anyOf(Arrays.asList(matchers));
++ return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+ }
+
+ /**
|