sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-04 13:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

upgrade to javafx 17

Browse source
This commit is contained in:
Craig Raw 2021-11-04 15:19:43 +02:00
parent af23f063f2
commit 8f92f9ec38
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -1,7 +1,7 @@
plugins { plugins {
id 'application' id 'application'
id 'org.openjfx.javafxplugin' version '0.0.10'
id 'extra-java-module-info' id 'extra-java-module-info'
id 'com.dua3.javafxgradle7plugin' version '0.0.9'
id 'org.beryx.jlink' version '2.24.0' id 'org.beryx.jlink' version '2.24.0'
} }
@ -29,7 +29,7 @@ tasks.withType(AbstractArchiveTask) {
} }
javafx { javafx {
version = "16" version = "17"
modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.graphics' ] modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.graphics' ]
} }

2
buildSrc/src/main/java/org/gradle/sample/transform/javamodules/ExtraModuleInfoTransform.java
View file

@ -59,7 +59,7 @@ abstract public class ExtraModuleInfoTransform implements TransformAction<ExtraM
String originalJarName = originalJar.getName(); String originalJarName = originalJar.getName();
//Recreate jackson jars as open, non-synthetic modules //Recreate jackson jars as open, non-synthetic modules
if (isModule(originalJar) && !originalJarName.contains("jackson")) { if ((isModule(originalJar) && !originalJarName.contains("jackson")) || originalJarName.startsWith("javafx-")) {
outputs.file(originalJar); outputs.file(originalJar);
} else if (moduleInfo.containsKey(originalJarName)) { } else if (moduleInfo.containsKey(originalJarName)) {
addModuleDescriptor(originalJar, getModuleJar(outputs, originalJar), moduleInfo.get(originalJarName)); addModuleDescriptor(originalJar, getModuleJar(outputs, originalJar), moduleInfo.get(originalJarName));