Emmanuel Bourg pushed to branch master at Debian Java Maintainers / groovy
Commits: 3ee4fa2a by Emmanuel Bourg at 2023-09-27T09:38:01+02:00 Fixed the type inference errors when building with source/target level 8 (Closes: #1052733) - - - - - 34339a3f by Emmanuel Bourg at 2023-09-27T09:38:42+02:00 Standards-Version updated to 4.6.2 - - - - - 87b3ef74 by Emmanuel Bourg at 2023-09-27T09:38:50+02:00 Upload to unstable - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/16_fix_type_inference.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +groovy (2.4.21-9) unstable; urgency=medium + + * Team upload. + * Fixed the type inference errors when building with source/target level 8 + (Closes: #1052733) + * Standards-Version updated to 4.6.2 + + -- Emmanuel Bourg <ebo...@apache.org> Wed, 27 Sep 2023 09:38:44 +0200 + groovy (2.4.21-8) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -32,7 +32,7 @@ Build-Depends: maven-repo-helper, testng, unzip -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Vcs-Git: https://salsa.debian.org/java-team/groovy.git Vcs-Browser: https://salsa.debian.org/java-team/groovy Homepage: http://www.groovy-lang.org ===================================== debian/patches/16_fix_type_inference.patch ===================================== @@ -0,0 +1,32 @@ +Description: Fixes the type inference errors when building with the source/target level set to Java 8 +Author: Emmanuel Bourg <ebo...@apache.org> +Forwarded: not-needed +--- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java ++++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java +@@ -11061,7 +11061,7 @@ + */ + @SuppressWarnings("unchecked") + public static <T> T[] plus(T[] left, T[] right) { +- return (T[]) plus(toList(left), toList(right)).toArray(); ++ return (T[]) plus((List<T>) toList(left), (List<T>) toList(right)).toArray(); + } + + /** +@@ -11097,7 +11097,7 @@ + */ + @SuppressWarnings("unchecked") + public static <T> T[] plus(T[] left, Collection<T> right) { +- return (T[]) plus(toList(left), right).toArray(); ++ return (T[]) plus((List<T>) toList(left), right).toArray(); + } + + /** +@@ -11119,7 +11119,7 @@ + */ + @SuppressWarnings("unchecked") + public static <T> T[] plus(T[] left, Iterable<T> right) { +- return (T[]) plus(toList(left), toList(right)).toArray(); ++ return (T[]) plus((List<T>) toList(left), (List<T>) toList(right)).toArray(); + } + + /** ===================================== debian/patches/series ===================================== @@ -16,3 +16,4 @@ failOnError.patch 13_GROOVY_8253.patch remove-GroovyDoc-JANSI-dependency.patch update-to-JLine2-2.13.patch +16_fix_type_inference.patch View it on GitLab: https://salsa.debian.org/java-team/groovy/-/compare/2da7238eeb74079f3d27f5ad1d63765ff4d4aeaa...87b3ef7452a0bf702b5eaa887c4859127d8404be -- View it on GitLab: https://salsa.debian.org/java-team/groovy/-/compare/2da7238eeb74079f3d27f5ad1d63765ff4d4aeaa...87b3ef7452a0bf702b5eaa887c4859127d8404be You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits