From 2b38882fd49494065c25d63c511d09be6c724198 Mon Sep 17 00:00:00 2001 From: knaccc Date: Thu, 3 Dec 2020 13:47:02 +0000 Subject: [PATCH] Now using JDK 14.0.2+12, JavaFX 15.0.1 Fixed JavaFX thread issue that broke startup i2p-zero v1.20 release ready --- README.md | 14 +++++++------- bin/java-config.sh | 4 ++-- .../org.getmonero.i2p.zero.gui.iml | 16 ++++++++-------- .../org/getmonero/i2p/zero/gui/Controller.java | 8 +++++--- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 432b3be..7ff45a8 100755 --- a/README.md +++ b/README.md @@ -27,14 +27,14 @@ Download the latest binary releases for Mac/Windows/Linux here: https://github.c The zero-dependency distribution sizes are as follows: -OS | Uncompressed size (MB) | Compressed size (MB) | v1.19 Reproducible build SHA-256 +OS | Uncompressed size (MB) | Compressed size (MB) | v1.20 Reproducible build SHA-256 ------------ | ----------------------- | --------------------- | ------------------------------------------------------------------ -Mac | 37.9 | 26.4 | `89d59663efb2c7b23ba33c6045f228d87b2d075a0a7c7474885ff3bf13619744` -Windows | 47.5 | 32.4 | `09f7041b68e34c66cdd786151910e662beaeee7cde45ee6047adf67fc2e1d283` -Linux | 61.5 | 36.3 | `7eb8967e6f691a621e55bd8ef54ceea5fd567a1ed229dd6768c138d749066330` -Mac GUI | 61.2 | 45.8 | `e86b78a0d3f497daa9fd6d90b2210836534422496a2856d309d341b868572631` -Windows GUI | 69.4 | 50.6 | `27dc2013a8a6ecd96a1f3c5d8c3c79484b05db73499231553446104dc1b2ba18` -Linux GUI | 86.6 | 56.5 | `7c296373c14437689edfad9cbae1ea635ca72c6b2cfe224e4b090aced141c721` +Mac | 38.5 | 26.5 | `9d35c9d31e7c8c820736f7437e02d928f325f4197cf19c7720196c1e586ce1a1` +Windows | 47.8 | 32.4 | `37c38e66a1f4935a21c2514eb4692827834ec8bd9c2dfc11d6871f7a07dbdd16` +Linux | 61.3 | 36.6 | `7e7216b281624ec464b55217284017576d109eaba7b35f7e4994ae2a78634de7` +Mac GUI | 61.2 | 45.9 | `9278fce1196555fd9823d74b716cb0370bac26b964a50b4e9a11eae0f2107eb4` +Windows GUI | 70.3 | 50.7 | `20723da50684c6a6581b36f8c7a90e9d63baf0e4848e0b781a343ad1791ab2a0` +Linux GUI | 87.4 | 56.9 | `1852ecf426d87c6931b163964fa55ddc09da60ede217da1f033a6f78acce2ad1` Note: Reproducible builds are currently experimental. Due to JDK differences, Builds on Mac will consistently have different hashes than builds on Linux. Official releases will always be built using Docker. diff --git a/bin/java-config.sh b/bin/java-config.sh index b4c85c4..f462cd6 100644 --- a/bin/java-config.sh +++ b/bin/java-config.sh @@ -11,7 +11,7 @@ fi export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 # Get latest JDK version from https://adoptopenjdk.net/releases.html?variant=openjdk15&jvmVariant=hotspot -JDK_VERSION=14.0.1+7 +JDK_VERSION=14.0.2+12 JDK_MAJOR_VERSION=`echo $JDK_VERSION | cut -f1 -d"." | cut -f1 -d+` JDK_VERSION_URL_ENC=`echo "$JDK_VERSION" | sed 's/+/%2B/g'` JDK_VERSION_URL_ENC2=`echo "$JDK_VERSION" | sed 's/+/_/g'` @@ -28,7 +28,7 @@ JAVA_HOME_MAC=$basedir/import/jdks/mac/jdk-$JDK_VERSION/Contents/Home JAVA_HOME_WIN=$basedir/import/jdks/win/jdk-$JDK_VERSION # JavaFX from https://gluonhq.com/products/javafx/ -JAVAFX_VERSION=14 +JAVAFX_VERSION=15.0.1 JAVAFX_SDK_DOWNLOAD_URL_LINUX=https://download2.gluonhq.com/openjfx/$JAVAFX_VERSION/openjfx-${JAVAFX_VERSION}_linux-x64_bin-sdk.zip JAVAFX_SDK_DOWNLOAD_URL_MAC=https://download2.gluonhq.com/openjfx/$JAVAFX_VERSION/openjfx-${JAVAFX_VERSION}_osx-x64_bin-sdk.zip JAVAFX_SDK_DOWNLOAD_URL_WIN=https://download2.gluonhq.com/openjfx/$JAVAFX_VERSION/openjfx-${JAVAFX_VERSION}_windows-x64_bin-sdk.zip diff --git a/org.getmonero.i2p.zero.gui/org.getmonero.i2p.zero.gui.iml b/org.getmonero.i2p.zero.gui/org.getmonero.i2p.zero.gui.iml index 8f312aa..b9a540f 100644 --- a/org.getmonero.i2p.zero.gui/org.getmonero.i2p.zero.gui.iml +++ b/org.getmonero.i2p.zero.gui/org.getmonero.i2p.zero.gui.iml @@ -11,7 +11,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -74,7 +74,7 @@ - + diff --git a/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Controller.java b/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Controller.java index 817d39f..0361549 100644 --- a/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Controller.java +++ b/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Controller.java @@ -415,9 +415,11 @@ public class Controller { }); }); routerWrapper.start(()->{ - helpTextArea.setText("You are running I2P-zero version " + UpdateCheck.currentVersion + "\n\n" - + "For best performance, please open port " + routerWrapper.routerExternalPort + " on your firewall for incoming UDP and TCP connections. This port has been randomly assigned to you. For privacy reasons, please do not share this port with others.\n\n" - + helpTextArea.getText()); + Platform.runLater(() -> { + helpTextArea.setText("You are running I2P-zero version " + UpdateCheck.currentVersion + "\n\n" + + "For best performance, please open port " + routerWrapper.routerExternalPort + " on your firewall for incoming UDP and TCP connections. This port has been randomly assigned to you. For privacy reasons, please do not share this port with others.\n\n" + + helpTextArea.getText()); + }); }); }