Merge remote-tracking branch 'origin/main' into release

JPro-one · Aug 29, 2024 · 695b6d8 · 695b6d8
2 parents 1fc4851 + 08a69b9
commit 695b6d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,9 +6,9 @@ plugins {
 version = "$projectVersion"
 group = 'one.jpro'
 
-compileJava {
-    sourceCompatibility = 17
-    targetCompatibility = 17
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 repositories {
@@ -22,7 +22,7 @@ javafx {
 
 application {
     // Define the main class for the application.
-    mainClassName = 'one.jpro.hellojpro.HelloJProFXML'
+    mainClass = 'one.jpro.hellojpro.HelloJProFXML'
 }
 
 jpro {

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 projectVersion = 1.0-SNAPSHOT
-jproVersion = 2024.3.1
+jproVersion = 2024.3.2
 javafxPluginVersion = 0.1.0
-javafxVersion = 17.0.12
+javafxVersion = 22.0.2
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME