From 71480e63df6549764e6a4c4945d4ed7f4295811a Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Mon, 11 Nov 2024 23:36:54 +0800 Subject: [PATCH] Support older Android - missing toList from stream --- forge-core/src/main/java/forge/StaticData.java | 9 +++++---- forge-core/src/main/java/forge/util/RSSReader.java | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java index c473e7fd5b3..10712a251d5 100644 --- a/forge-core/src/main/java/forge/StaticData.java +++ b/forge-core/src/main/java/forge/StaticData.java @@ -19,6 +19,7 @@ import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; /** @@ -868,10 +869,10 @@ public class StaticData { CompletableFuture.allOf(futuresArray).join(); futures.clear(); } - List NIF = new ArrayList<>(NIF_Q).stream().sorted().toList(); - List CNI = new ArrayList<>(CNI_Q).stream().sorted().toList(); - List TOK = new ArrayList<>(TOKEN_Q).stream().sorted().toList(); - List sorted_editions = EDITION_Q.stream().distinct().sorted().toList(); + List NIF = new ArrayList<>(NIF_Q).stream().sorted().collect(Collectors.toList()); + List CNI = new ArrayList<>(CNI_Q).stream().sorted().collect(Collectors.toList()); + List TOK = new ArrayList<>(TOKEN_Q).stream().sorted().collect(Collectors.toList()); + List sorted_editions = EDITION_Q.stream().distinct().sorted().collect(Collectors.toList()); for (String edition : sorted_editions) { String[] arr = edition.split("_"); String code = arr[0]; diff --git a/forge-core/src/main/java/forge/util/RSSReader.java b/forge-core/src/main/java/forge/util/RSSReader.java index 2c60a1685d6..9f48af8eba5 100644 --- a/forge-core/src/main/java/forge/util/RSSReader.java +++ b/forge-core/src/main/java/forge/util/RSSReader.java @@ -10,6 +10,7 @@ import java.text.SimpleDateFormat; import java.time.ZonedDateTime; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; public class RSSReader { public static String getCommitLog(String commitsAtom, Date buildDateOriginal, Date maxDate) { @@ -19,7 +20,7 @@ public class RSSReader { RssReader reader = new RssReader(); URL url = new URL(commitsAtom); InputStream inputStream = url.openStream(); - List items = reader.read(inputStream).toList(); + List items = reader.read(inputStream).collect(Collectors.toList()); StringBuilder logs = new StringBuilder(); int c = 0; for (Item i : items) { @@ -55,7 +56,7 @@ public class RSSReader { RssReader reader = new RssReader(); URL url = new URL(releaseAtom); InputStream inputStream = url.openStream(); - List items = reader.read(inputStream).toList(); + List items = reader.read(inputStream).collect(Collectors.toList()); for (Item i : items) { if (i.getLink().isPresent()) { try {