summaryrefslogtreecommitdiff
path: root/java/config/kotlin.go
diff options
context:
space:
mode:
author Dave Mankoff <mankoff@google.com> 2024-10-02 18:47:24 +0000
committer Dave Mankoff <mankoff@google.com> 2024-11-01 14:55:11 +0000
commit0a3ef84335088feccba395822a66a13b7eb49faa (patch)
tree95c0c6ca149597143814c5c33e9d67e8f6a5fde2 /java/config/kotlin.go
parent840880cf7627d2342f78c9b25419eaf059b43799 (diff)
Change compose Compiler. New Soong Exclude_common_Srcs.
Default the kotlin compiler to use language-version 1.9, as the kotlin compiler is being upgraded to 2.0.21, but not all of the code yet compiles with 2.0. Test: m Bug: 369137871 Change-Id: I1539860eaa39c858fe6f327a434a2e93f4e05018
Diffstat (limited to 'java/config/kotlin.go')
-rw-r--r--java/config/kotlin.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/config/kotlin.go b/java/config/kotlin.go
index 302d021db..bf4c886d1 100644
--- a/java/config/kotlin.go
+++ b/java/config/kotlin.go
@@ -49,7 +49,7 @@ func init() {
"-J--add-opens=java.base/java.util=ALL-UNNAMED", // https://youtrack.jetbrains.com/issue/KT-43704
}, " "))
- pctx.StaticVariable("KotlincGlobalFlags", strings.Join([]string{}, " "))
+ pctx.StaticVariable("KotlincGlobalFlags", strings.Join([]string{"-language-version 1.9"}, " "))
// Use KotlincKytheGlobalFlags to prevent kotlinc version skew issues between android and
// g3 kythe indexers.
// This is necessary because there might be instances of kotlin code in android