|
@@ -86,6 +86,7 @@ public class GlobalBuildInfoPlugin implements Plugin<Project> {
|
|
|
JavaVersion minimumRuntimeVersion = JavaVersion.toVersion(getResourceContents("/minimumRuntimeVersion"));
|
|
|
|
|
|
File runtimeJavaHome = findRuntimeJavaHome();
|
|
|
+ boolean isRuntimeJavaHomeSet = Jvm.current().getJavaHome().equals(runtimeJavaHome) == false;
|
|
|
|
|
|
File rootDir = project.getRootDir();
|
|
|
GitInfo gitInfo = GitInfo.gitInfo(rootDir);
|
|
@@ -93,8 +94,15 @@ public class GlobalBuildInfoPlugin implements Plugin<Project> {
|
|
|
BuildParams.init(params -> {
|
|
|
params.reset();
|
|
|
params.setRuntimeJavaHome(runtimeJavaHome);
|
|
|
- params.setRuntimeJavaVersion(determineJavaVersion("runtime java.home", runtimeJavaHome, minimumRuntimeVersion));
|
|
|
- params.setIsRuntimeJavaHomeSet(Jvm.current().getJavaHome().equals(runtimeJavaHome) == false);
|
|
|
+ // TODO: Temporarily hard-code this to 17 until we upgrade to Gradle 7.3 and bump minimumRuntimeVersion
|
|
|
+ params.setRuntimeJavaVersion(
|
|
|
+ determineJavaVersion(
|
|
|
+ "runtime java.home",
|
|
|
+ runtimeJavaHome,
|
|
|
+ isRuntimeJavaHomeSet ? JavaVersion.VERSION_17 : Jvm.current().getJavaVersion()
|
|
|
+ )
|
|
|
+ );
|
|
|
+ params.setIsRuntimeJavaHomeSet(isRuntimeJavaHomeSet);
|
|
|
JvmInstallationMetadata runtimeJdkMetaData = metadataDetector.getMetadata(getJavaInstallation(runtimeJavaHome).getLocation());
|
|
|
params.setRuntimeJavaDetails(formatJavaVendorDetails(runtimeJdkMetaData));
|
|
|
params.setJavaVersions(getAvailableJavaVersions());
|