upgrade to gradle 7.1, java 16, javafx 16

This commit is contained in:
Craig Raw
2021-06-25 14:56:22 +02:00
parent 6d434722cc
commit 094dd45547
18 changed files with 601 additions and 53 deletions
@@ -90,7 +90,9 @@ public class IOUtils {
// if it is a subdirectory, we just return the directory name
entry = entry.substring(0, checkSubdir);
}
result.add(entry);
if(!entry.isEmpty()) {
result.add(entry);
}
}
}
@@ -1,7 +1,6 @@
package com.sparrowwallet.sparrow.net;
import com.github.arteam.simplejsonrpc.client.Transport;
import com.google.common.collect.Iterables;
import com.google.common.eventbus.Subscribe;
import com.google.common.net.HostAndPort;
import com.sparrowwallet.drongo.KeyPurpose;
@@ -22,7 +22,6 @@ import javafx.stage.DirectoryChooser;
import javafx.stage.FileChooser;
import javafx.stage.Stage;
import javafx.util.Duration;
import net.freehaven.tor.control.TorControlError;
import org.berndpruenster.netlayer.tor.Tor;
import org.controlsfx.control.SegmentedButton;
import org.controlsfx.glyphfont.Glyph;
@@ -19,7 +19,6 @@ import com.sparrowwallet.sparrow.io.Device;
import com.sparrowwallet.sparrow.net.ElectrumServer;
import com.sparrowwallet.sparrow.io.Storage;
import com.sparrowwallet.sparrow.payjoin.Payjoin;
import com.sparrowwallet.sparrow.payjoin.PayjoinReceiverException;
import com.sparrowwallet.sparrow.wallet.Entry;
import com.sparrowwallet.sparrow.wallet.HashIndexEntry;
import com.sparrowwallet.sparrow.wallet.TransactionEntry;
+11 -10
View File
@@ -1,6 +1,7 @@
open module com.sparrowwallet.sparrow {
requires java.desktop;
requires java.net.http;
requires javafx.base;
requires javafx.controls;
requires javafx.fxml;
requires javafx.graphics;
@@ -10,7 +11,6 @@ open module com.sparrowwallet.sparrow {
requires tornadofx.controls;
requires com.sparrowwallet.drongo;
requires com.google.common;
requires flowless;
requires com.google.zxing;
requires com.google.zxing.javase;
requires simple.json.rpc.client;
@@ -18,21 +18,22 @@ open module com.sparrowwallet.sparrow {
requires simple.json.rpc.core;
requires org.jetbrains.annotations;
requires com.fasterxml.jackson.databind;
requires webcam.capture;
requires netlayer.jpms;
requires hummingbird;
requires centerdevice.nsmenufx;
requires jcommander;
requires org.slf4j;
requires bwt.jni;
requires jtorctl;
requires javacsv;
requires jul.to.slf4j;
requires bridj;
requires com.google.gson;
requires org.jdbi.v3.core;
requires org.jdbi.v3.sqlobject;
requires org.flywaydb.core;
requires com.zaxxer.hikari;
requires com.h2database;
requires com.sparrowwallet.hummingbird;
requires org.fxmisc.flowless;
requires com.github.sarxos.webcam.capture;
requires centerdevice.nsmenufx;
requires com.github.JesusMcCloud.jtorctl;
requires com.beust.jcommander;
requires org.slf4j.jul.to.slf4j;
requires net.sourceforge.javacsv;
requires com.nativelibs4java.bridj;
requires org.reactfx.reactfx;
}