update build.gradle

Glavo · Glavo · commit f3193019435c · 2019-11-20T02:11:45.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -26,11 +26,11 @@ repositories {
 
 String javafx(String moduleName) {
     if (jforeign.Platform.isWindows()) {
-        return "org.openjfx:javafx-$moduleName:11:win"
+        return "org.openjfx:javafx-$moduleName:13:win"
     } else if (jforeign.Platform.isMac()) {
-        return "org.openjfx:javafx-$moduleName:11:mac"
+        return "org.openjfx:javafx-$moduleName:13:mac"
     } else if (jforeign.Platform.isUnix()) {
-        return "org.openjfx:javafx-$moduleName:11:linux"
+        return "org.openjfx:javafx-$moduleName:13:linux"
     }
 }
 
@@ -78,5 +78,12 @@ jlink {
         launcher {
             name = 'ClassViewer'
         }
+        if(!jforeign.Platform.isWindows()) {
+            project.tasks.getByName('jlink').doLast {
+                delete {
+                    delete "$imageDir/bin/ClassViewer.bat"
+                }
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,11 @@ repositories {`
`26`	`26`
`27`	`27`	`String javafx(String moduleName) {`
`28`	`28`	`if (jforeign.Platform.isWindows()) {`
`29`		`- return "org.openjfx:javafx-$moduleName:11:win"`
	`29`	`+ return "org.openjfx:javafx-$moduleName:13:win"`
`30`	`30`	`} else if (jforeign.Platform.isMac()) {`
`31`		`- return "org.openjfx:javafx-$moduleName:11:mac"`
	`31`	`+ return "org.openjfx:javafx-$moduleName:13:mac"`
`32`	`32`	`} else if (jforeign.Platform.isUnix()) {`
`33`		`- return "org.openjfx:javafx-$moduleName:11:linux"`
	`33`	`+ return "org.openjfx:javafx-$moduleName:13:linux"`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`@@ -78,5 +78,12 @@ jlink {`
`78`	`78`	`launcher {`
`79`	`79`	`name = 'ClassViewer'`
`80`	`80`	`}`
	`81`	`+ if(!jforeign.Platform.isWindows()) {`
	`82`	`+ project.tasks.getByName('jlink').doLast {`
	`83`	`+ delete {`
	`84`	`+ delete "$imageDir/bin/ClassViewer.bat"`
	`85`	`+ }`
	`86`	`+ }`
	`87`	`+ }`
`81`	`88`	`}`
`82`	`89`	`}`