Skip to content

Commit f5eb683

Browse files
committed
[Gradle] Autoprovision jvm for gradle daemon (elastic#124071)
With Gradle 8.13 we can now auto provision the jdk used by the gradle daemon. Our configuration relies on jdk21. With this autoprovisioning enabled each gradle build will use adoptium jdk 21 for gradle jvm
1 parent 64a220a commit f5eb683

File tree

3 files changed

+37
-1
lines changed

3 files changed

+37
-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
@@ -407,6 +407,34 @@ allprojects {
407407
apply plugin: 'elasticsearch.formatting'
408408
}
409409

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

411439
tasks.register("verifyBwcTestsEnabled") {
412440
doLast {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainUrl.LINUX.AARCH64=https\://api.adoptium.net/v3/binary/version/jdk-21.0.6+7/linux/aarch64/jdk/hotspot/normal/eclipse?project\=jdk
3+
toolchainUrl.LINUX.X86_64=https\://api.adoptium.net/v3/binary/version/jdk-21.0.6+7/linux/x64/jdk/hotspot/normal/eclipse?project\=jdk
4+
toolchainUrl.MAC_OS.AARCH64=https\://api.adoptium.net/v3/binary/version/jdk-21.0.6+7/mac/aarch64/jdk/hotspot/normal/eclipse?project\=jdk
5+
toolchainUrl.MAC_OS.X86_64=https\://api.adoptium.net/v3/binary/version/jdk-21.0.6+7/mac/x64/jdk/hotspot/normal/eclipse?project\=jdk
6+
toolchainUrl.WINDOWS.X86_64=https\://api.adoptium.net/v3/binary/version/jdk-21.0.6+7/windows/x64/jdk/hotspot/normal/eclipse?project\=jdk
7+
toolchainVendor=ADOPTIUM
8+
toolchainVersion=21

0 commit comments

Comments
 (0)