Skip to content

Commit 9428b59

Browse files
committed
[Gradle] Autoprovision jvm for gradle daemon
1 parent 496c38e commit 9428b59

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/toolchain/ArchivedOracleJdkToolchainResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*/
3030
public abstract class ArchivedOracleJdkToolchainResolver extends AbstractCustomJavaToolchainResolver {
3131

32-
private static final Map<Integer, String> ARCHIVED_BASE_VERSIONS = Maps.of(20, "20.0.2", 19, "19.0.2", 18, "18.0.2.1");
32+
private static final Map<Integer, String> ARCHIVED_BASE_VERSIONS = Maps.of(21, "21.0.6", 20, "20.0.2", 19, "19.0.2", 18, "18.0.2.1");
3333

3434
@Override
3535
public Optional<JavaToolchainDownload> resolve(JavaToolchainRequest request) {

build.gradle

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,34 @@ allprojects {
404404
apply plugin: 'elasticsearch.formatting'
405405
}
406406

407+
tasks.named("updateDaemonJvm") {
408+
def myPlatforms = [
409+
BuildPlatformFactory.of(
410+
org.gradle.platform.Architecture.AARCH64,
411+
org.gradle.platform.OperatingSystem.MAC_OS
412+
),
413+
BuildPlatformFactory.of(
414+
org.gradle.platform.Architecture.AARCH64,
415+
org.gradle.platform.OperatingSystem.LINUX
416+
),
417+
BuildPlatformFactory.of(
418+
org.gradle.platform.Architecture.X86_64,
419+
org.gradle.platform.OperatingSystem.LINUX
420+
),
421+
BuildPlatformFactory.of(
422+
org.gradle.platform.Architecture.X86_64,
423+
org.gradle.platform.OperatingSystem.WINDOWS
424+
),
425+
// anyone still using x86 osx?
426+
BuildPlatformFactory.of(
427+
org.gradle.platform.Architecture.X86_64,
428+
org.gradle.platform.OperatingSystem.MAC_OS
429+
)
430+
]
431+
toolchainPlatforms.set(myPlatforms)
432+
languageVersion = JavaLanguageVersion.of(21)
433+
vendor = JvmVendorSpec.ORACLE
434+
}
407435

408436
tasks.register("verifyBwcTestsEnabled") {
409437
doLast {

0 commit comments

Comments
 (0)