Reland^2 "Target Java 17"
This reverts commit 91ba6c7e01e03bde6e2f24b6d093603391149ae7.
Reason for revert: Relanding Java 17
Change-Id: I6d0e64bb86b9f4a0f41baa33c3226c6316718456
diff --git a/java/java.go b/java/java.go
index 3b0ad8d..6e428cb 100644
--- a/java/java.go
+++ b/java/java.go
@@ -510,14 +510,8 @@
return normalizeJavaVersion(ctx, javaVersion)
} else if ctx.Device() {
return defaultJavaLanguageVersion(ctx, sdkContext.SdkVersion(ctx))
- } else if ctx.Config().TargetsJava17() {
- // Temporary experimental flag to be able to try and build with
- // java version 17 options. The flag, if used, just sets Java
- // 17 as the default version, leaving any components that
- // target an older version intact.
- return JAVA_VERSION_17
} else {
- return JAVA_VERSION_11
+ return JAVA_VERSION_17
}
}