diff --git a/build.gradle b/build.gradle index 9369a62..22202b0 100644 --- a/build.gradle +++ b/build.gradle @@ -38,8 +38,8 @@ allprojects { subproject -> withSourcesJar() modularity.inferModulePath = true toolchain { - languageVersion = JavaLanguageVersion.of(23) - vendor = JvmVendorSpec.ORACLE + languageVersion = JavaLanguageVersion.of(21) + vendor = JvmVendorSpec.GRAAL_VM } } diff --git a/gradle.properties b/gradle.properties index 71902e9..d97a028 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.caching=true rbcs.version = 0.2.0 -lys.version = 2025.02.28 +lys.version = 2025.03.03 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven docker.registry.url=gitea.woggioni.net diff --git a/rbcs-cli/build.gradle b/rbcs-cli/build.gradle index 2f04bb6..ad291c3 100644 --- a/rbcs-cli/build.gradle +++ b/rbcs-cli/build.gradle @@ -12,6 +12,7 @@ plugins { import net.woggioni.gradle.envelope.EnvelopePlugin import net.woggioni.gradle.envelope.EnvelopeJarTask import net.woggioni.gradle.graalvm.NativeImageConfigurationTask +import net.woggioni.gradle.graalvm.NativeImageTask import net.woggioni.gradle.graalvm.NativeImagePlugin import net.woggioni.gradle.graalvm.UpxTask import net.woggioni.gradle.graalvm.JlinkPlugin @@ -90,11 +91,6 @@ Provider envelopeJarTaskProvider = tasks.named(EnvelopePlugin.E } tasks.named(NativeImagePlugin.CONFIGURE_NATIVE_IMAGE_TASK_NAME, NativeImageConfigurationTask) { - javaLauncher = javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(21) - vendor = JvmVendorSpec.ORACLE - } - mainClass = "net.woggioni.rbcs.cli.graal.GraalNativeImageConfiguration" classpath = project.files( configurations.configureNativeImageRuntimeClasspath, @@ -108,6 +104,10 @@ tasks.named(NativeImagePlugin.CONFIGURE_NATIVE_IMAGE_TASK_NAME, NativeImageConfi } nativeImage { + toolchain { + languageVersion = JavaLanguageVersion.of(23) + vendor = JvmVendorSpec.GRAAL_VM + } mainClass = mainClassName // mainModule = mainModuleName useMusl = true