From 4224c1dd5c7726a003446f35686d5c81b9c0e1bc Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Mon, 29 Sep 2025 15:49:59 -0700 Subject: [PATCH] gradle: remove dependency on EOL jdk23, use jdk11 for test A passthru test of the javaToolchains configuration property was using jdk23. There is a requirement that the JDK version for the test NOT be "the default for any of the gradle versions", so jdk11 is a good choice for the replacement since jdk17 and jdk21 are currently used and jdk25 will be used in the future. --- pkgs/development/tools/build-managers/gradle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index a998bd5becc1..082b55c4c698 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,8 +1,8 @@ { callPackage, + jdk11, jdk17, jdk21, - jdk23, }: let @@ -56,7 +56,7 @@ let tests = { toolchains = let - javaVersion = lib.getVersion jdk23; + javaVersion = lib.getVersion jdk11; javaMajorVersion = lib.versions.major javaVersion; in runCommand "detects-toolchains-from-nix-env" @@ -65,7 +65,7 @@ let nativeBuildInputs = [ (gradle.override { javaToolchains = [ - jdk23 + jdk11 ]; }) ];