Unverified Commit bb5ef571 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge: gradle: add test for toolchain functionality (#391822)

parents 7edfd82b 205f8269

pkgs/development/tools/build-managers/gradle/default.nix

+29 −1
Original line number Diff line number Diff line 
{

  jdk11,

  jdk17,

  jdk21,

  jdk23,

}:



rec {
@@ -251,6 +253,7 @@ rec { 
      concatTextFile,

      makeSetupHook,

      nix-update-script,

      runCommand,

    }:

    gradle-unwrapped: updateAttrPath:

    lib.makeOverridable (
@@ -281,8 +284,33 @@ rec { 
        passthru =

          {

            fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; };

            inherit (gradle) jdk tests;

            inherit (gradle) jdk;

            unwrapped = gradle;

            tests = {

              toolchains =

                runCommand "detects-toolchains-from-nix-env"

                  {

                    # Use JDKs that are not the default for any of the gradle versions

                    nativeBuildInputs = [

                      (gradle.override {

                        javaToolchains = [

                          jdk11

                          jdk23

                        ];

                      })

                    ];

                    src = ./tests/java-application;

                  }

                  ''

                    cp -a $src/* .

                    env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \

                      gradle javaToolchains --no-daemon --quiet --console plain > $out

                    cat $out | grep "Language Version:   11"

                    cat $out | grep "Detected by:        environment variable 'JAVA_TOOLCHAIN_NIX_0'"

                    cat $out | grep "Language Version:   23"

                    cat $out | grep "Detected by:        environment variable 'JAVA_TOOLCHAIN_NIX_1'"

                  '';

            } // gradle.tests;

          }

          // lib.optionalAttrs (updateAttrPath != null) {

            updateScript = nix-update-script {

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -7682,7 +7682,7 @@ with pkgs; 














  gnumake = callPackage ../development/tools/build-managers/gnumake { };















  gradle-packages = import ../development/tools/build-managers/gradle {













    inherit jdk17 jdk21;













    inherit jdk11 jdk17 jdk21 jdk23;















  };















  gradleGen = gradle-packages.gen;















  wrapGradle = callPackage gradle-packages.wrapGradle { };