mirror of
https://github.com/apple/pkl.git
synced 2026-01-19 01:47:24 +01:00
408242a44c
This updates the GraalVM and Truffle libraries to 2024.1.2. This also updates the build logic to compile Java sources using Java 21, due to some compile-only dependencies within GraalVM/Truffle using class file version 65. However, the produced artifact is still compatible with Java 17. This also changes the Gradle build logic to use toolchains, and to test the Java libraries with JDK 17 and 21. One consequence of this change is that Truffle is no longer shaded within the fat jars. feat: support for jvm21+ toolchain feat: support for gradle toolchains feat: pass -PnativeArch=native to build with -march=native test: multi-jdk testing support test: support for jvm-test-suite plugin test: add tasks to run jpkl eval on multiple jdks test: make jdk exec tests respect multi-jdk flags and ranges fix: remove mrjar classes at >jvm17 from fatjars fix: use jdk21 to run the tests (needed for Unsafe.ensureInitialized) fix: truffle svm dependency is required after graalvm 24.0.0 fix: warnings for gvm flag usage, renamed truffle svm macro fix: build with --add-modules=jdk.unsupported where needed fix: don't use gu tool for modern graalvm versions fix: catch Throwable instead of deprecated-for-removal ThreadDeath chore: buildinfo changes for JVM targets, toolchains chore: enforce testing at exactly jdk21 chore: enforce build tooling at jdk21+ chore: bump graalvm/truffle libs → 24.1.2 chore: toolchains for buildSrc Signed-off-by: Sam Gammon <sam@elide.dev>
65 lines
2.3 KiB
Kotlin
65 lines
2.3 KiB
Kotlin
/*
|
|
* Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* https://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
@file:Suppress("MemberVisibilityCanBePrivate")
|
|
|
|
import java.util.*
|
|
import org.gradle.jvm.toolchain.JavaLanguageVersion
|
|
|
|
typealias JavaVersionPair = Pair<JavaLanguageVersion, JavaLanguageVersion>
|
|
|
|
// All LTS releases.
|
|
private val ltsReleases =
|
|
sortedSetOf(
|
|
JavaLanguageVersion.of(8),
|
|
JavaLanguageVersion.of(11),
|
|
JavaLanguageVersion.of(17),
|
|
JavaLanguageVersion.of(21),
|
|
)
|
|
|
|
/** Describes an inclusive range of JVM versions, based on the [JavaLanguageVersion] type. */
|
|
@JvmInline
|
|
value class JavaVersionRange private constructor(private val bounds: JavaVersionPair) :
|
|
Iterable<JavaLanguageVersion> {
|
|
@Suppress("unused")
|
|
companion object {
|
|
fun isLTS(version: JavaLanguageVersion): Boolean = version in ltsReleases
|
|
|
|
fun inclusive(floor: JavaLanguageVersion, ceiling: JavaLanguageVersion): JavaVersionRange =
|
|
JavaVersionRange(floor to ceiling)
|
|
|
|
fun startingAt(floor: JavaLanguageVersion): JavaVersionRange =
|
|
inclusive(floor, JavaLanguageVersion.of(PKL_TEST_JDK_MAXIMUM))
|
|
|
|
fun upTo(ceiling: JavaLanguageVersion): JavaVersionRange =
|
|
inclusive(JavaLanguageVersion.of(PKL_TEST_JDK_MINIMUM), ceiling)
|
|
}
|
|
|
|
operator fun contains(version: JavaLanguageVersion): Boolean =
|
|
version >= bounds.first && version <= bounds.second
|
|
|
|
fun asSequence(): Sequence<JavaLanguageVersion> = sequence {
|
|
var current = bounds.first
|
|
while (current <= bounds.second) {
|
|
yield(current)
|
|
current = JavaLanguageVersion.of(current.asInt() + 1)
|
|
}
|
|
}
|
|
|
|
fun asSortedSet(): SortedSet<JavaLanguageVersion> = asSequence().toSortedSet()
|
|
|
|
override fun iterator(): Iterator<JavaLanguageVersion> = asSortedSet().iterator()
|
|
}
|