Add openJDK 20 compatibility

bisq-network · Jul 14, 2023 · c14f67e · c14f67e
1 parent bacc72d
commit c14f67e
Show file tree

Hide file tree

Showing 17 changed files with 993 additions and 214 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
         matrix:
             os: [ubuntu-latest, macOS-latest, windows-latest]
-            java: [ '11', '11.0.3', '15', '15.0.5']
+            java: [ '11.0.19', '15.0.10', '17.0.7', '20.0.1']
     name: Test Java ${{ matrix.Java }}, ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3.5.3
@@ -23,7 +23,8 @@ jobs:
       uses: actions/setup-java@v3.11.0
       with:
         java-version: ${{ matrix.java }}
-        distribution: 'zulu'
+        java-package: jdk+fx
+        distribution: zulu
 
     - name: Build with Gradle
       uses: gradle/gradle-build-action@v2.5.1

diff --git a/build-logic/gradle-tasks/build.gradle b/build-logic/gradle-tasks/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.7.10'
-    id 'org.gradle.kotlin.kotlin-dsl' version '2.4.1'
+    id 'org.jetbrains.kotlin.jvm' version '1.8.20'
+    id 'org.gradle.kotlin.kotlin-dsl' version '4.0.14'
 }
 
 repositories {

diff --git a/build-logic/tor-binary/build.gradle b/build-logic/tor-binary/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'org.jetbrains.kotlin.jvm' version '1.7.10'
-    id 'org.gradle.kotlin.kotlin-dsl' version '2.4.1'
+    id 'org.jetbrains.kotlin.jvm' version '1.8.20'
+    id 'org.gradle.kotlin.kotlin-dsl' version '4.0.14'
 }
 
 repositories {

diff --git a/build.gradle b/build.gradle
@@ -7,8 +7,8 @@ buildscript {
     dependencies {
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
         classpath 'com.google.gradle:osdetector-gradle-plugin:1.6.0'
-        classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
-        classpath 'org.openjfx:javafx-plugin:0.0.10'
+        classpath 'com.github.johnrengelman:shadow:8.1.1'
+        classpath 'org.openjfx:javafx-plugin:0.0.14'
     }
 }
 
@@ -26,7 +26,7 @@ configure(subprojects) {
     apply plugin: 'com.google.osdetector'
 
     ext { // in alphabetical order
-        javafxVersion = '16'
+        javafxVersion = '20.0.1'
 
         os = osdetector.os == 'osx' ? 'mac' : osdetector.os == 'windows' ? 'win' : osdetector.os
     }
@@ -83,6 +83,10 @@ configure([project(':cli'),
                 script.text = script.text.replace(
                     'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=8g -Xss1280k -XX:+UseG1GC ' +
                     '-XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication ' +
+                    '--add-opens=javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED ' +
+                    '--add-opens=javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED ' +
+                    '--add-opens=javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED ' +
+                    '--add-opens=java.base/java.lang.reflect=ALL-UNNAMED ' +
                     '-Djava.net.preferIPv4Stack=true"')
             }
 

diff --git a/desktop/src/main/java/bisq/desktop/components/SeparatedPhaseBars.java b/desktop/src/main/java/bisq/desktop/components/SeparatedPhaseBars.java
@@ -20,8 +20,6 @@
 import bisq.core.dao.state.model.governance.DaoPhase;
 import bisq.core.locale.Res;
 
-import com.jfoenix.controls.JFXProgressBar;
-
 import javafx.scene.control.Label;
 import javafx.scene.control.ProgressBar;
 import javafx.scene.layout.HBox;
@@ -44,7 +42,7 @@
 @Slf4j
 public class SeparatedPhaseBars extends VBox {
     // Last day for creating github compensation request issue, as decided by general consensus
-    private static final double LAST_COMP_REQ_GH_ISSUE = (double) 18 / 25;
+//    private static final double LAST_COMP_REQ_GH_ISSUE = (double) 18 / 25;
     private double labelMinWidth = 150;
     private double breakMinWidth = 20;
     private int totalDuration;
@@ -70,14 +68,14 @@ public SeparatedPhaseBars(List<SeparatedPhaseBarsItem> items) {
             item.setTitleLabel(titleLabel);
             titlesBars.getChildren().addAll(titleLabel);
 
-            JFXProgressBar progressBar = new JFXProgressBar();
+            ProgressBar progressBar = new ProgressBar();
             progressBar.setMinHeight(9);
             progressBar.setMaxHeight(9);
             progressBar.progressProperty().bind(item.progressProperty);
             progressBar.setOpacity(item.isShowBlocks() ? 1 : 0.25);
-            if (item.phase.name().startsWith("PROPOSAL")) {
-                progressBar.setSecondaryProgress(LAST_COMP_REQ_GH_ISSUE);
-            }
+//            if (item.phase.name().startsWith("PROPOSAL")) {
+//                progressBar.setSecondaryProgress(LAST_COMP_REQ_GH_ISSUE);
+//            }
             progressBars.getChildren().add(progressBar);
             item.setProgressBar(progressBar);
         });

diff --git a/desktop/src/main/java/bisq/desktop/main/MainView.java b/desktop/src/main/java/bisq/desktop/main/MainView.java
@@ -59,7 +59,6 @@
 
 import com.jfoenix.controls.JFXBadge;
 import com.jfoenix.controls.JFXComboBox;
-import com.jfoenix.controls.JFXProgressBar;
 
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
@@ -573,7 +572,7 @@ private VBox createSplashScreen() {
         };
         model.getWalletServiceErrorMsg().addListener(walletServiceErrorMsgListener);
 
-        btcSyncIndicator = new JFXProgressBar();
+        btcSyncIndicator = new ProgressBar();
         btcSyncIndicator.setPrefWidth(305);
         btcSyncIndicator.progressProperty().bind(model.getCombinedSyncProgress());
 
@@ -825,7 +824,7 @@ private AnchorPane createFooter() {
             p2pNetworkProgressBar.setProgress(0);
         });
 
-        p2pNetworkProgressBar = new JFXProgressBar(-1);
+        p2pNetworkProgressBar = new ProgressBar(-1);
         p2pNetworkProgressBar.setMaxHeight(2);
         p2pNetworkProgressBar.prefWidthProperty().bind(p2PNetworkLabel.widthProperty());
 

diff --git a/desktop/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java b/desktop/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java
@@ -57,8 +57,6 @@
 
 import de.jensd.fx.fontawesome.AwesomeIcon;
 
-import com.jfoenix.controls.JFXProgressBar;
-
 import javafx.stage.Stage;
 
 import javafx.scene.control.Label;
@@ -157,7 +155,7 @@ public void initialize() {
         addConfidenceColumn();
         addTxTypeColumn();
 
-        chainSyncIndicator = new JFXProgressBar();
+        chainSyncIndicator = new ProgressBar();
         chainSyncIndicator.setPrefWidth(120);
         chainSyncIndicator.setProgress(-1);
         chainSyncIndicator.setPadding(new Insets(-6, 0, -10, 5));

diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendLogFilesWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/SendLogFilesWindow.java
@@ -32,10 +32,9 @@
 
 import bisq.common.UserThread;
 
-import com.jfoenix.controls.JFXProgressBar;
-
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
+import javafx.scene.control.ProgressBar;
 import javafx.scene.control.Separator;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
@@ -138,7 +137,7 @@ private void addContent() {
         addWizardsToGridPane(step3);
         addRegionToGridPane();
 
-        JFXProgressBar progressBar = new JFXProgressBar();
+        ProgressBar progressBar = new ProgressBar();
         progressBar.setMinHeight(19);
         progressBar.setMaxHeight(19);
         progressBar.setPrefWidth(9305);

diff --git a/...n/java/bisq/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java b/...n/java/bisq/desktop/main/overlays/windows/downloadupdate/DisplayUpdateDownloadWindow.java
@@ -29,14 +29,11 @@
 import bisq.core.user.CookieKey;
 import bisq.core.user.User;
 
-import bisq.common.UserThread;
 import bisq.common.config.Config;
 import bisq.common.util.Utilities;
 
 import com.google.common.base.Joiner;
 
-import com.jfoenix.controls.JFXProgressBar;
-
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
@@ -150,7 +147,7 @@ private void addContent() {
         downloadingFileLabel.setOpacity(0.2);
         GridPane.setHalignment(downloadingFileLabel, HPos.LEFT);
 
-        progressBar = new JFXProgressBar(0L);
+        progressBar = new ProgressBar(0L);
         progressBar.setMaxHeight(4);
         progressBar.managedProperty().bind(progressBar.visibleProperty());
 

diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java
@@ -50,8 +50,6 @@
 import de.jensd.fx.fontawesome.AwesomeDude;
 import de.jensd.fx.fontawesome.AwesomeIcon;
 
-import com.jfoenix.controls.JFXProgressBar;
-
 import javafx.scene.control.Label;
 import javafx.scene.control.ProgressBar;
 import javafx.scene.control.ScrollPane;
@@ -350,7 +348,7 @@ protected void addTradeInfoBlock() {
         timeLeftTextField = labelTextFieldVBoxTuple3.second;
         timeLeftTextField.setMinWidth(400);
 
-        timeLeftProgressBar = new JFXProgressBar(0);
+        timeLeftProgressBar = new ProgressBar(0);
         timeLeftProgressBar.setOpacity(0.7);
         timeLeftProgressBar.setMinHeight(9);
         timeLeftProgressBar.setMaxHeight(9);

diff --git a/gradle/README.md b/gradle/README.md
@@ -8,9 +8,9 @@ Visit the [Gradle website](https://gradle.org/releases/) and decide the:
 
 Adjust the following command with tha arguments above and execute it twice:
 
-    ./gradlew wrapper --gradle-version 6.6.1 \
+    ./gradlew wrapper --gradle-version 8.2 \
         --distribution-type all \
-        --gradle-distribution-sha256-sum 11657af6356b7587bfb37287b5992e94a9686d5c8a0a1b60b87b9928a2decde5
+        --gradle-distribution-sha256-sum 5022b0b25fe182b0e50867e77f484501dba44feeea88f5c1f13b6b4660463640
 
 The first execution should automatically update:
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -38,7 +38,7 @@ junit-jupiter = { strictly = '5.7.0' }
 kotlin = { strictly = '1.3.41' }
 logback = { strictly = '1.1.11' }
 lombok = { strictly = '1.18.22' }
-mockito = { strictly = '4.0.0' }
+mockito = { strictly = '5.4.0' }
 natpryce-make-it-easy = { strictly = '4.0.1' }
 netlayer = { strictly = '0.7.6' }
 protobuf = { strictly = '3.19.1' }