Merge pull request #5431 from ripcurlx/upgrade-javafax-14

Upgrade Java to v11 and JavaFX to v15
bisq-network · Apr 22, 2021 · 469448a · 469448a
2 parents de76bd0 + 412d485
commit 469448a
Show file tree

Hide file tree

Showing 37 changed files with 947 additions and 1,896 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: java
 jdk:
-    - openjdk10
-    - openjdk12
+    - openjdk11
 
 cache:
     directories:

diff --git a/build.gradle b/build.gradle
@@ -46,29 +46,28 @@ configure(subprojects) {
         httpcoreVersion = '4.4.13'
         ioVersion = '2.6'
         jacksonVersion = '2.12.1'
-        javafxVersion = '11.0.2'
+        javafxVersion = '15'
         javaxAnnotationVersion = '1.2'
         jcsvVersion = '1.4.0'
         jetbrainsAnnotationsVersion = '13.0'
-        jfoenixVersion = '9.0.6'
+        jfoenixVersion = '9.0.10'
         joptVersion = '5.0.4'
         jsonsimpleVersion = '1.1.1'
         jsonrpc4jVersion = '1.6.0.bisq.1'
         junitVersion = '4.12'
         jupiterVersion = '5.7.0'
         kotlinVersion = '1.3.41'
         knowmXchangeVersion = '4.4.2'
-        langVersion = '3.8'
+        langVersion = '3.11'
         logbackVersion = '1.1.11'
         loggingVersion = '1.2'
-        lombokVersion = '1.18.2'
-        mockitoVersion = '3.0.0'
+        lombokVersion = '1.18.12'
+        mockitoVersion = '3.5.15'
         netlayerVersion = '8db4a13' // Commit ID from https://github.com/bisq-network/netlayer/commits/externaltor
         protobufVersion = '3.10.0'
         protocVersion = protobufVersion
         pushyVersion = '0.13.2'
         qrgenVersion = '1.3'
-        sarxosVersion = '0.3.12'
         slf4jVersion = '1.7.30'
         sparkVersion = '2.5.2'
         springBootVersion = '1.5.10.RELEASE'
@@ -382,9 +381,14 @@ configure(project(':desktop')) {
     apply plugin: 'com.github.johnrengelman.shadow'
     apply plugin: 'witness'
     apply from: '../gradle/witness/gradle-witness.gradle'
+    apply from: 'package/package.gradle'
 
     version = '1.6.2-SNAPSHOT'
 
+    jar.manifest.attributes(
+        "Implementation-Title": project.name,
+        "Implementation-Version": version)
+
     mainClassName = 'bisq.desktop.app.BisqAppMain'
 
     tasks.withType(AbstractArchiveTask) {
@@ -402,7 +406,6 @@ configure(project(':desktop')) {
         compile "de.jensd:fontawesomefx-materialdesignfont:$fontawesomefxMaterialdesignfontVersion"
         compile "com.google.guava:guava:$guavaVersion"
         compile "com.googlecode.jcsv:jcsv:$jcsvVersion"
-        compile "com.github.sarxos:webcam-capture:$sarxosVersion"
         compile "org.openjfx:javafx-controls:$javafxVersion:$os"
         compile "org.openjfx:javafx-fxml:$javafxVersion:$os"
         compile "org.openjfx:javafx-swing:$javafxVersion:$os"

diff --git a/core/src/test/java/bisq/core/payment/ReceiptValidatorTest.java b/core/src/test/java/bisq/core/payment/ReceiptValidatorTest.java
@@ -167,7 +167,6 @@ public void testIsValidWhenNationalBankAccount() {
         when(predicates.isEqualPaymentMethods(offer, account)).thenReturn(true);
         when(predicates.isMatchingCountryCodes(offer, account)).thenReturn(true);
         when(predicates.isMatchingSepaOffer(offer, account)).thenReturn(false);
-        when(predicates.isMatchingSepaOffer(offer, account)).thenReturn(false);
         when(predicates.isMatchingSepaInstant(offer, account)).thenReturn(false);
         when(predicates.isOfferRequireSameOrSpecificBank(offer, account)).thenReturn(false);
 

diff --git a/core/src/test/java/bisq/core/util/FeeReceiverSelectorTest.java b/core/src/test/java/bisq/core/util/FeeReceiverSelectorTest.java
@@ -68,17 +68,32 @@ public void testGetAddress() {
     }
 
     @Test
-    public void testGetAddress_noValidReceivers() {
+    public void testGetAddress_noValidReceivers_nullFilter() {
         when(daoFacade.getParamValue(Param.RECIPIENT_BTC_ADDRESS)).thenReturn("default");
 
         when(filterManager.getFilter()).thenReturn(null);
         assertEquals("default", FeeReceiverSelector.getAddress(daoFacade, filterManager));
+    }
+
+    @Test
+    public void testGetAddress_noValidReceivers_filterWithNullList() {
+        when(daoFacade.getParamValue(Param.RECIPIENT_BTC_ADDRESS)).thenReturn("default");
 
         when(filterManager.getFilter()).thenReturn(filterWithReceivers(null));
         assertEquals("default", FeeReceiverSelector.getAddress(daoFacade, filterManager));
+    }
+
+    @Test
+    public void testGetAddress_noValidReceivers_filterWithEmptyList() {
+        when(daoFacade.getParamValue(Param.RECIPIENT_BTC_ADDRESS)).thenReturn("default");
 
         when(filterManager.getFilter()).thenReturn(filterWithReceivers(List.of()));
         assertEquals("default", FeeReceiverSelector.getAddress(daoFacade, filterManager));
+    }
+
+    @Test
+    public void testGetAddress_noValidReceivers_filterWithIllFormedList() {
+        when(daoFacade.getParamValue(Param.RECIPIENT_BTC_ADDRESS)).thenReturn("default");
 
         when(filterManager.getFilter()).thenReturn(filterWithReceivers(List.of("ill-formed")));
         assertEquals("default", FeeReceiverSelector.getAddress(daoFacade, filterManager));