commit 1e7438524b7e28c5f58c6ab380a53777c221dc70
author Colin Cross <ccross@android.com> Mon Oct 28 11:37:20 2019 -0700
committer Colin Cross <ccross@android.com> Mon Oct 28 14:55:03 2019 -0700
tree de9725a147ef6cfc138689de3a921c09e70dda3b
parent 74362a4d5e116a521155513db3e6aa2b1a7dff22

Make javaVersion an enum

Remove the hardcoded checks against "1.9" by making javaVersion
an enum and implementing javaVersion.usesJavaModules().

Test: TestClasspath
Change-Id: I559eeb1f45880bb8177269c6d977ee4dfbadce57

java/kotlin.go

diff --git a/java/kotlin.go b/java/kotlin.go
index 8306907..f8ae229 100644
--- a/java/kotlin.go
+++ b/java/kotlin.go
@@ -141,8 +141,8 @@
 	}
 
 	encodedJavacFlags := kaptEncodeFlags([][2]string{
-		{"-source", flags.javaVersion},
-		{"-target", flags.javaVersion},
+		{"-source", flags.javaVersion.String()},
+		{"-target", flags.javaVersion.String()},
 	})
 
 	kotlinName := filepath.Join(ctx.ModuleDir(), ctx.ModuleSubDir(), ctx.ModuleName())