Skip to content

Commit 666befd

Browse files
committed
fixup! refactor: setJavaVersion becomes configureCompiler, handles release/source/target
1 parent 249533f commit 666befd

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

gradle/java_no_deps.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,16 @@ java {
4848
withSourcesJar()
4949
}
5050

51-
if (project.hasProperty('minJavaVersionForTests') && project.getProperty('minJavaVersionForTests') != JavaVersion.VERSION_1_7) {
52-
def version = JavaVersion.toVersion(project.getProperty('minJavaVersionForTests'))
53-
def name = "java$version.majorVersion"
51+
if (project.hasProperty('minJavaVersionForTests') && project.findProperty('minJavaVersionForTests') != JavaVersion.VERSION_1_7) {
52+
def version = JavaVersion.toVersion(project.findProperty('minJavaVersionForTests'))
53+
def name = "java${version.majorVersion}"
5454
def mainForJavaVersionSourceSet = sourceSets.create("main_$name") {
5555
java.srcDirs = ["${project.projectDir}/src/main/$name"]
5656
}
5757

5858
// Task name is registered when source set was created
5959
tasks.named(mainForJavaVersionSourceSet.compileJavaTaskName, JavaCompile) {
60-
// In Main compile task, keep targeting the minimum target, by default
61-
configureCompiler(it, version.majorVersion.toInteger().intValue(), java.targetCompatibility)
60+
configureCompiler(it, version.majorVersion.toInteger().intValue(), version)
6261
}
6362

6463
// "socket-utils" is only set to compileOnly because the implementation dependency incorrectly adds Java17 classes to all jar prefixes.

0 commit comments

Comments
 (0)