Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Java 11 Example PreCommit GItHub Action #28291

Merged
merged 6 commits into from
Sep 6, 2023
Merged

Fix Java 11 Example PreCommit GItHub Action #28291

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2645e3a
Partially revert #28234 to fix Java 11 Example PreCommit
Abacn Sep 2, 2023
ca12436
Dedup compile args
Abacn Sep 5, 2023
2aae0bc
fix typo
Abacn Sep 5, 2023
1ca7a88
Fix compilerArgs addAll
Abacn Sep 5, 2023
de8e680
Move compileAndRunTestsWithJavaX after errorprone has set up
Abacn Sep 5, 2023
e28e958
Still use --release for java8 option
Abacn Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,8 +1089,9 @@ class BeamModulePlugin implements Plugin<Project> {
options.fork = true
options.forkOptions.javaHome = java11Home as File
options.compilerArgs += ['-Xlint:-path']
options.compilerArgs += ['-source', '11']
options.compilerArgs += ['-target', '11']
// TODO(https://github.com/apache/beam/pull/28234) Investigate why different options need to be set in Java 11/17
// Java11: --release 11; Java17: -source 17 -target 17; (Java 8 both work)
options.compilerArgs.addAll(['--release', '11'])
}
project.tasks.withType(Test) {
useJUnit()
Expand Down