diff --git a/README.md b/README.md index d91f9f2..f95e8b6 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ especially if you're targeting a specific platform and installation method. The following dependencies are universal: -* [JDK23](https://openjdk.java.net/projects/jdk/23/) +* [JDK24](https://openjdk.java.net/projects/jdk/24/) * [JavaFX](https://openjfx.io) * [Gradle](https://gradle.org) * [FasterXML/jackson](https://github.com/FasterXML/jackson) diff --git a/build.gradle b/build.gradle index 6b1a321..ae1cc83 100644 --- a/build.gradle +++ b/build.gradle @@ -15,8 +15,17 @@ version '1.5.0' def currentOS = DefaultNativePlatform.currentOperatingSystem java { - targetCompatibility = JavaVersion.VERSION_24 - sourceCompatibility = JavaVersion.VERSION_24 + toolchain { + languageVersion = JavaLanguageVersion.of(24) + sourceCompatibility = JavaLanguageVersion.of(24) + vendor = JvmVendorSpec.AMAZON + } +} + +tasks.named("updateDaemonJvm") { + javaToolchains { + vendor = JvmVendorSpec.AMAZON + } } application { @@ -140,8 +149,8 @@ dependencies { implementation 'org.apache.logging.log4j:log4j-core:2.24.3' implementation 'io.github.mkpaz:atlantafx-base:2.0.1' implementation 'com.fasterxml.jackson.core:jackson-databind:2.19.0' - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.12.2' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.12.2' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.13.1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.13.1' } tasks.named('test') { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c8..ff23a68 100644 --- 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.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 239e0ba..90e88b0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,5 +3,5 @@ buildscript { } plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' }