summaryrefslogtreecommitdiff
path: root/java/config/kotlin.go
diff options
context:
space:
mode:
author Dave Mankoff <mankoff@google.com> 2025-01-08 03:06:21 +0000
committer Dave Mankoff <mankoff@google.com> 2025-01-09 21:18:41 +0000
commit1a7705d96ddaee5fc829c11bca0c43543b9b4155 (patch)
tree7b8c9ed9736dad3f9c44725f060c298b726b3ec6 /java/config/kotlin.go
parentf8ac19663f24e83d9d4a037f9bbccc93d3ed99bf (diff)
Add kotlin-lang flag.
This allows targets to choose whether they compile with kotlin 1.9 or kotlin 2 Bug: 383569207 Flag: EXEMPT this is a flag itself Test: built system image Change-Id: I1228ed1d8a5f9d6029261e4a867a2301069e315f
Diffstat (limited to 'java/config/kotlin.go')
-rw-r--r--java/config/kotlin.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/java/config/kotlin.go b/java/config/kotlin.go
index bf4c886d1..ffb025d9c 100644
--- a/java/config/kotlin.go
+++ b/java/config/kotlin.go
@@ -21,6 +21,7 @@ var (
KotlincIllegalFlags = []string{
"-no-jdk",
"-no-stdlib",
+ "-language-version",
}
)
@@ -49,12 +50,12 @@ func init() {
"-J--add-opens=java.base/java.util=ALL-UNNAMED", // https://youtrack.jetbrains.com/issue/KT-43704
}, " "))
- pctx.StaticVariable("KotlincGlobalFlags", strings.Join([]string{"-language-version 1.9"}, " "))
+ pctx.StaticVariable("KotlincGlobalFlags", strings.Join([]string{}, " "))
// 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
// platform that are not fully compatible with the kotlinc used in g3 kythe indexers.
// e.g. uninitialized variables are a warning in 1.*, but an error in 2.*
// https://github.com/JetBrains/kotlin/blob/master/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt#L748
- pctx.StaticVariable("KotlincKytheGlobalFlags", strings.Join([]string{"-language-version 1.9"}, " "))
+ pctx.StaticVariable("KotlincKytheGlobalFlags", strings.Join([]string{}, " "))
}