|
|
@@ -38,7 +38,6 @@ import org.gradle.api.artifacts.ModuleDependency
|
|
|
import org.gradle.api.artifacts.ModuleVersionIdentifier
|
|
|
import org.gradle.api.artifacts.ProjectDependency
|
|
|
import org.gradle.api.artifacts.ResolvedArtifact
|
|
|
-import org.gradle.api.artifacts.SelfResolvingDependency
|
|
|
import org.gradle.api.artifacts.dsl.RepositoryHandler
|
|
|
import org.gradle.api.execution.TaskExecutionGraph
|
|
|
import org.gradle.api.plugins.JavaPlugin
|
|
|
@@ -212,6 +211,7 @@ class BuildPlugin implements Plugin<Project> {
|
|
|
project.rootProject.ext.minimumRuntimeVersion = minimumRuntimeVersion
|
|
|
project.rootProject.ext.inFipsJvm = inFipsJvm
|
|
|
project.rootProject.ext.gradleJavaVersion = JavaVersion.toVersion(gradleJavaVersion)
|
|
|
+ project.rootProject.ext.java9Home = findJavaHome("9")
|
|
|
}
|
|
|
|
|
|
project.targetCompatibility = project.rootProject.ext.minimumRuntimeVersion
|
|
|
@@ -225,6 +225,7 @@ class BuildPlugin implements Plugin<Project> {
|
|
|
project.ext.javaVersions = project.rootProject.ext.javaVersions
|
|
|
project.ext.inFipsJvm = project.rootProject.ext.inFipsJvm
|
|
|
project.ext.gradleJavaVersion = project.rootProject.ext.gradleJavaVersion
|
|
|
+ project.ext.java9Home = project.rootProject.ext.java9Home
|
|
|
}
|
|
|
|
|
|
private static String getPaddedMajorVersion(JavaVersion compilerJavaVersionEnum) {
|