Move to OpenJFX 17
This commit is contained in:
Dmitry Isaenko
parent
ff77c117ad
commit
2ee0362980
3 changed files with 23 additions and 17 deletions
11
README.md
11
README.md
|
|
@ -36,7 +36,7 @@ Sometimes I add new posts about this project [on my home page](https://developer
|
|||
|
||||
* [Pablo Curiel (DarkMatterCore)](https://github.com/DarkMatterCore)
|
||||
* [wolfposd](https://github.com/wolfposd)
|
||||
|
||||
* [agungrbudiman](https://github.com/agungrbudiman)
|
||||
|
||||
* French by [Stephane Meden (JackFromNice)](https://github.com/JackFromNice)
|
||||
* Italian by [unbranched](https://github.com/unbranched)
|
||||
|
|
@ -74,8 +74,6 @@ Awoo Installer uses the same command-set (or 'protocol') to [Adubbz/Tinfoil](htt
|
|||
|
||||
A lot of other forks/apps uses the same command-set. To stop speculating about the name it's now called 'Awoo'. It WAS called 'TinFoil' before. Not any more.
|
||||
|
||||
Also, please go to 'Settings' tab of NS-USBloader after first installation and check 'Allow XCI / NSZ / XCZ files selection for Awoo' option. This installer can install not only NSPs but a way more formats!
|
||||
|
||||
### Usage
|
||||
##### Linux:
|
||||
|
||||
|
|
@ -112,6 +110,13 @@ Set 'Security & Privacy' settings if needed.
|
|||
|
||||
*Please note: JDK 11 is recommended for using on MacOS. There are few really weird issues already reported from JDK 14 users on Mac.*
|
||||
|
||||
##### macOS on Apple Silicon (ARM)
|
||||
|
||||
1. Some users [tested](https://github.com/developersu/ns-usbloader/issues/91) this application with [Zulu-JDK with FX support](https://www.azul.com/downloads/zulu-community/?version=java-11-lts&os=macos&architecture=arm-64-bit&package=jdk-fx)
|
||||
2. Try OpenJDK 17 that has m1 support.
|
||||
|
||||
You should try it too while we're waiting for platform support at OpenJDK/Oracle JDKs.
|
||||
|
||||
##### Windows:
|
||||
|
||||
* [Download and install Java JRE](http://java.com/download/) (8u60 or higher)
|
||||
|
|
|
|||
24
pom.xml
24
pom.xml
|
|
@ -60,28 +60,28 @@
|
|||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-controls</artifactId>
|
||||
<version>16</version>
|
||||
<version>17</version>
|
||||
<classifier>linux</classifier>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-media</artifactId>
|
||||
<version>16</version>
|
||||
<version>17</version>
|
||||
<classifier>linux</classifier>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-fxml</artifactId>
|
||||
<version>16</version>
|
||||
<version>17</version>
|
||||
<classifier>linux</classifier>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-graphics</artifactId>
|
||||
<version>16</version>
|
||||
<version>17</version>
|
||||
<classifier>linux</classifier>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
|
@ -89,28 +89,28 @@
|
|||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-controls</artifactId>
|
||||
<version>16</version>
|
||||
<version>17</version>
|
||||
<classifier>win</classifier>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-media</artifactId>
|
||||
<version>16</version>
|
||||
<version>17</version>
|
||||
<classifier>win</classifier>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-fxml</artifactId>
|
||||
<version>16</version>
|
||||
<version>17</version>
|
||||
<classifier>win</classifier>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-graphics</artifactId>
|
||||
<version>16</version>
|
||||
<version>17</version>
|
||||
<classifier>win</classifier>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
|
@ -118,28 +118,28 @@
|
|||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-controls</artifactId>
|
||||
<version>16</version>
|
||||
<version>17</version>
|
||||
<classifier>mac</classifier>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-media</artifactId>
|
||||
<version>16</version>
|
||||
<version>17</version>
|
||||
<classifier>mac</classifier>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-fxml</artifactId>
|
||||
<version>16</version>
|
||||
<version>17</version>
|
||||
<classifier>mac</classifier>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-graphics</artifactId>
|
||||
<version>16</version>
|
||||
<version>17</version>
|
||||
<classifier>mac</classifier>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ import java.util.ResourceBundle;
|
|||
|
||||
public class NSLMain extends Application {
|
||||
|
||||
public static final String appVersion = "v5.1";
|
||||
public static final String appVersion = "v5.2";
|
||||
public static boolean isCli;
|
||||
|
||||
@Override
|
||||
|
|
@ -67,7 +67,8 @@ public class NSLMain extends Application {
|
|||
|
||||
primaryStage.setOnCloseRequest(e->{
|
||||
if (MediatorControl.getInstance().getTransferActive())
|
||||
if(! ServiceWindow.getConfirmationWindow(rb.getString("windowTitleConfirmExit"), rb.getString("windowBodyConfirmExit")))
|
||||
if(! ServiceWindow.getConfirmationWindow(rb.getString("windowTitleConfirmExit"),
|
||||
rb.getString("windowBodyConfirmExit")))
|
||||
e.consume();
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue