Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
- uses: graalvm/setup-graalvm@v1
with:
distribution: 'graalvm'
java-version: 21
java-version: 25
github-token: ${{ secrets.GITHUB_TOKEN }}
native-image-job-reports: true

Expand Down Expand Up @@ -276,7 +276,7 @@ jobs:
- uses: graalvm/setup-graalvm@v1
with:
distribution: 'graalvm'
java-version: 24
java-version: 25
github-token: ${{ secrets.GITHUB_TOKEN }}
native-image-job-reports: true

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ de-mannodermaus-junit5 = "2.0.1"
dokka = "2.2.0"
eclipse-osgi = "3.24.100"
graalvm = "25.0.2"
graalvm-plugin = "0.11.5"
graalvm-plugin = "1.0.0"
guava = "33.5.0-jre"
hamcrest-library = "3.0"
http-client5 = "5.6"
Expand Down
42 changes: 42 additions & 0 deletions okcurl/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import kotlinx.validation.ApiValidationExtension
import okhttp3.buildsupport.testJavaVersion
import org.graalvm.buildtools.gradle.dsl.GraalVMExtension
import org.graalvm.buildtools.gradle.tasks.BuildNativeImageTask
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import ru.vyarus.gradle.plugin.animalsniffer.AnimalSnifferExtension
import java.nio.file.Files

plugins {
kotlin("jvm")
Expand Down Expand Up @@ -90,6 +92,46 @@ configure<GraalVMExtension> {
} else {
buildArgs("--no-fallback")
}

javaLauncher.set(
javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(25))
vendor.set(JvmVendorSpec.GRAAL_VM)
},
)
}
}
}

// https://github.com/gradle/gradle/issues/28583
tasks.named<BuildNativeImageTask>("nativeCompile") {
// Gradle's "Copy" task cannot handle symbolic links, see https://github.com/gradle/gradle/issues/3982. That is why
// links contained in the GraalVM distribution archive get broken during provisioning and are replaced by empty
// files. Address this by recreating the links in the toolchain directory.
val toolchainDir =
options.get().javaLauncher.get().executablePath.asFile.parentFile.run {
if (name == "bin") parentFile else this
}

val toolchainFiles = toolchainDir.walkTopDown().filter { it.isFile }
val emptyFiles = toolchainFiles.filter { it.length() == 0L }

// Find empty toolchain files that are named like other toolchain files and assume these should have been links.
val links =
toolchainFiles.mapNotNull { file ->
emptyFiles.singleOrNull { it != file && it.name == file.name }?.let {
file to it
}
}

// Fix up symbolic links.
links.forEach { (target, link) ->
logger.quiet("Fixing up '$link' to link to '$target'.")

if (link.delete()) {
Files.createSymbolicLink(link.toPath(), target.toPath())
} else {
logger.warn("Unable to delete '$link'.")
}
}
}
Loading