Run kotlin tests on JDK 8 *and later* (#9949)

@deannagarcia fixes #9870
This commit is contained in:
Elliotte Rusty Harold 2022-05-11 16:50:10 +00:00 committed by GitHub
parent b2a51f8525
commit 309e24e86a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -246,8 +246,8 @@ build_java() {
cd ../..
}
# The conformance tests are hard-coded to work with the $ROOT/java directory.
# So this can't run in parallel with two different sets of tests.
# The conformance tests are hard-coded to work with the $ROOT/java directory
# so this can't run in parallel with two different sets of tests.
build_java_with_conformance_tests() {
# Java build needs `protoc`.
internal_build_cpp
@ -257,7 +257,7 @@ build_java_with_conformance_tests() {
cd java/core && $MVN test && $MVN install
cd ../lite && $MVN test && $MVN install
cd ../util && $MVN test && $MVN install && $MVN package assembly:single
if [ "$version" == "jdk8" ]; then
if [ "$version" != "jdk7" ]; then
cd ../kotlin && $MVN test && $MVN install
cd ../kotlin-lite && $MVN test && $MVN install
fi