Skip to content

Commit fc32250

Browse files
updates for Gradle and Java(FX)16
1 parent 475c23d commit fc32250

6 files changed

Lines changed: 107 additions & 79 deletions

File tree

build.gradle

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
// set JAVA_HOME=C:\Program Files\Java\jdk-11.0.5+10
2+
// set JAVA_HOME=C:\Program Files\Java\jdk-16+36
23

34
plugins {
45
id 'application'
56
id 'org.openjfx.javafxplugin' version '0.0.9'
6-
id 'org.beryx.runtime' version '1.11.6'
7-
id 'org.unbroken-dome.xjc' version '1.4.3'
7+
id 'org.beryx.runtime' version '1.12.2'
8+
// id 'org.unbroken-dome.xjc' version '1.4.3'
9+
id 'org.unbroken-dome.xjc' version '2.0.0' // https://github.com/unbroken-dome/gradle-xjc-plugin
810
}
911

1012
dependencies {
@@ -41,7 +43,7 @@ dependencies {
4143
implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.3'
4244

4345
// test dependencies
44-
testCompile group: 'junit', name: 'junit', version: '4.13'
46+
testImplementation group: 'junit', name: 'junit', version: '4.13'
4547
}
4648

4749
repositories {
@@ -53,8 +55,11 @@ javafx {
5355
modules = ['javafx.controls']
5456
}
5557

56-
xjcGenerate {
58+
/* xjcGenerate {
5759
source = fileTree('src/main/resources') { include '*.xsd' }
60+
} */
61+
xjc {
62+
// srcDirName = 'src/main/resources'
5863
}
5964

6065
version = '21.04.09'
@@ -92,11 +97,11 @@ runtime {
9297
installerName = applicationName
9398
// Set the environment property BADASS_JLINK_JPACKAGE_HOME or explicitly configure the below property
9499
def os = org.gradle.internal.os.OperatingSystem.current()
95-
if(os.macOsX) {
100+
/* if(os.macOsX) {
96101
jpackageHome = '/Library/Java/JavaVirtualMachines/jdk-14-jpackage.jdk/Contents/Home'
97102
} else if(os.windows) {
98103
jpackageHome = 'C:/Program Files/Java/jdk-16-ea+28'
99-
}
104+
} */
100105
jvmArgs = []
101106
// jvmArgs = ['-Dfxgl.sliding.puzzle.dummy=nothingElse', '-Dfxgl.sliding.puzzle.title=somethingElse']
102107
installerOptions = [

gradle/wrapper/gradle-wrapper.jar

5.43 KB
Binary file not shown.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Mon Jun 15 10:34:44 CEST 2020
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-2-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 68 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 26 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)