@@ -1132,6 +1132,8 @@ class BeamModulePlugin implements Plugin<Project> {
11321132 project. javaVersion = ' 17'
11331133 } else if (JavaVersion . VERSION_21 . equals(configuration. requireJavaVersion)) {
11341134 project. javaVersion = ' 21'
1135+ } else if (JavaVersion . VERSION_25 . equals(configuration. requireJavaVersion)) {
1136+ project. javaVersion = ' 25'
11351137 } else {
11361138 throw new GradleException (
11371139 " requireJavaVersion has to be supported LTS version greater than the default Java version. Actual: " +
@@ -1154,6 +1156,9 @@ class BeamModulePlugin implements Plugin<Project> {
11541156 } else if (requireJavaVersion. compareTo(JavaVersion . VERSION_21 ) <= 0 &&
11551157 project. hasProperty(' java21Home' )) {
11561158 forkJavaVersion = ' 21'
1159+ } else if (requireJavaVersion. compareTo(JavaVersion . VERSION_25 ) <= 0 &&
1160+ project. hasProperty(' java25Home' )) {
1161+ forkJavaVersion = ' 25'
11571162 } else {
11581163 logger. config(" Module ${ project.name} disabled. To enable, either " +
11591164 " compile on newer Java version or pass java${ project.javaVersion} Home project property" )
@@ -1582,7 +1587,7 @@ class BeamModulePlugin implements Plugin<Project> {
15821587 options. encoding = " UTF-8"
15831588 // If compiled on newer JDK, set byte code compatibility
15841589 if (requireJavaVersion. compareTo(JavaVersion . current()) < 0 ) {
1585- def compatVersion = project. javaVersion == ' 1.8 ' ? ' 8 ' : project. javaVersion
1590+ def compatVersion = project. javaVersion == ' 11 ' ? ' 11 ' : project. javaVersion
15861591 options. compilerArgs + = [' --release' , compatVersion]
15871592 // TODO(https://github.com/apache/beam/issues/23901): Fix
15881593 // optimizerOuterThis breakage
@@ -1616,7 +1621,7 @@ class BeamModulePlugin implements Plugin<Project> {
16161621 }
16171622
16181623 // if specified test java version, modify the compile and runtime versions accordingly
1619- if ([' 8 ' , ' 11' , ' 17' , ' 21' , ' 25' ]. contains(project. findProperty(' testJavaVersion' ))) {
1624+ if ([' 11' , ' 17' , ' 21' , ' 25' ]. contains(project. findProperty(' testJavaVersion' ))) {
16201625 String ver = project. getProperty(' testJavaVersion' )
16211626 def testJavaHome = project. getProperty(" java${ ver} Home" )
16221627
0 commit comments