external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6564 from kevlahnota/master2

Browse Source 
Support older Android
This commit is contained in:
kevlahnota
2024-11-11 23:42:41 +08:00
committed by GitHub
parent cc346ca600 71480e63df
commit 1dc5c582f8
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-core/src/main/java/forge/StaticData.java
View File

@@ -19,6 +19,7 @@ import java.util.*;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/** /**
@@ -868,10 +869,10 @@ public class StaticData {
CompletableFuture.allOf(futuresArray).join(); CompletableFuture.allOf(futuresArray).join();
futures.clear(); futures.clear();
} }
List<String> NIF = new ArrayList<>(NIF_Q).stream().sorted().toList(); List<String> NIF = new ArrayList<>(NIF_Q).stream().sorted().collect(Collectors.toList());
List<String> CNI = new ArrayList<>(CNI_Q).stream().sorted().toList(); List<String> CNI = new ArrayList<>(CNI_Q).stream().sorted().collect(Collectors.toList());
List<String> TOK = new ArrayList<>(TOKEN_Q).stream().sorted().toList(); List<String> TOK = new ArrayList<>(TOKEN_Q).stream().sorted().collect(Collectors.toList());
List<String> sorted_editions = EDITION_Q.stream().distinct().sorted().toList(); List<String> sorted_editions = EDITION_Q.stream().distinct().sorted().collect(Collectors.toList());
for (String edition : sorted_editions) { for (String edition : sorted_editions) {
String[] arr = edition.split("_"); String[] arr = edition.split("_");
String code = arr[0]; String code = arr[0];

5
forge-core/src/main/java/forge/util/RSSReader.java
View File

@@ -10,6 +10,7 @@ import java.text.SimpleDateFormat;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
public class RSSReader { public class RSSReader {
public static String getCommitLog(String commitsAtom, Date buildDateOriginal, Date maxDate) { public static String getCommitLog(String commitsAtom, Date buildDateOriginal, Date maxDate) {
@@ -19,7 +20,7 @@ public class RSSReader {
RssReader reader = new RssReader(); RssReader reader = new RssReader();
URL url = new URL(commitsAtom); URL url = new URL(commitsAtom);
InputStream inputStream = url.openStream(); InputStream inputStream = url.openStream();
List<Item> items = reader.read(inputStream).toList(); List<Item> items = reader.read(inputStream).collect(Collectors.toList());
StringBuilder logs = new StringBuilder(); StringBuilder logs = new StringBuilder();
int c = 0; int c = 0;
for (Item i : items) { for (Item i : items) {
@@ -55,7 +56,7 @@ public class RSSReader {
RssReader reader = new RssReader(); RssReader reader = new RssReader();
URL url = new URL(releaseAtom); URL url = new URL(releaseAtom);
InputStream inputStream = url.openStream(); InputStream inputStream = url.openStream();
List<Item> items = reader.read(inputStream).toList(); List<Item> items = reader.read(inputStream).collect(Collectors.toList());
for (Item i : items) { for (Item i : items) {
if (i.getLink().isPresent()) { if (i.getLink().isPresent()) {
try { try {