diff --git a/build.gradle b/build.gradle index 45514ba5..7c21d22e 100644 --- a/build.gradle +++ b/build.gradle @@ -51,10 +51,10 @@ dependencies { implementation('com.zaxxer:HikariCP:4.0.3') { exclude group: 'org.slf4j' } - implementation('org.jdbi:jdbi3-core:3.20.0') { + implementation('org.jdbi:jdbi3-core:3.49.5') { exclude group: 'org.slf4j' } - implementation('org.jdbi:jdbi3-sqlobject:3.20.0') { + implementation('org.jdbi:jdbi3-sqlobject:3.49.5') { exclude group: 'org.slf4j' } implementation('org.flywaydb:flyway-core:9.22.3') @@ -407,21 +407,6 @@ extraJavaModuleInfo { module('com.google.guava:listenablefuture|empty-to-avoid-conflict-with-guava', 'com.google.guava.listenablefuture') module('com.google.code.findbugs:jsr305', 'com.google.code.findbugs.jsr305') module('j2objc-annotations-2.8.jar', 'com.google.j2objc.j2objc.annotations', '2.8') - module('org.jdbi:jdbi3-core', 'org.jdbi.v3.core') { - exports('org.jdbi.v3.core') - exports('org.jdbi.v3.core.mapper') - exports('org.jdbi.v3.core.statement') - exports('org.jdbi.v3.core.result') - exports('org.jdbi.v3.core.h2') - exports('org.jdbi.v3.core.spi') - requires('io.leangen.geantyref') - requires('java.sql') - requires('org.slf4j') - requires('com.github.benmanes.caffeine') - } - module('io.leangen.geantyref:geantyref', 'io.leangen.geantyref') { - exports('io.leangen.geantyref') - } module('org.fxmisc.richtext:richtextfx', 'org.fxmisc.richtext') { exports('org.fxmisc.richtext') exports('org.fxmisc.richtext.event') diff --git a/drongo b/drongo index b25289b7..3b069c12 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit b25289b7b5d80e3f1c81546914ebf5c95a1bd446 +Subproject commit 3b069c12ca39f65521628e7b4299d72883205fca diff --git a/src/main/java/com/sparrowwallet/sparrow/io/Storage.java b/src/main/java/com/sparrowwallet/sparrow/io/Storage.java index 15efe196..dd7d737d 100644 --- a/src/main/java/com/sparrowwallet/sparrow/io/Storage.java +++ b/src/main/java/com/sparrowwallet/sparrow/io/Storage.java @@ -684,7 +684,7 @@ public class Storage { public static Executor getSingleThreadedExecutor() { if(singleThreadedExecutor == null) { - BasicThreadFactory factory = new BasicThreadFactory.Builder().namingPattern("LoadWalletService-single").daemon(true).priority(Thread.MIN_PRIORITY).build(); + BasicThreadFactory factory = BasicThreadFactory.builder().namingPattern("LoadWalletService-single").daemon(true).priority(Thread.MIN_PRIORITY).build(); singleThreadedExecutor = Executors.newSingleThreadScheduledExecutor(factory); } diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 8aa8e538..3c8073ef 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -27,6 +27,7 @@ open module com.sparrowwallet.sparrow { requires com.google.gson; requires org.jdbi.v3.core; requires org.jdbi.v3.sqlobject; + requires io.leangen.geantyref; requires org.flywaydb.core; requires com.zaxxer.hikari; requires com.h2database;