Skip to content

Add support for newer JDK versions #1361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for newer JDK versions #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ load("@rules_kotlin//kotlin:core.bzl", "define_kt_toolchain")
define_kt_toolchain(
name = "kotlin_toolchain",
api_version = KOTLIN_LANGUAGE_LEVEL, # "1.1", "1.2", "1.3", "1.4", "1.5" "1.6", "1.7", "1.8", or "1.9"
jvm_target = JAVA_LANGUAGE_LEVEL, # "1.6", "1.8", "9", "10", "11", "12", "13", "15", "16", "17", "18", "19", "20" or "21"
jvm_target = JAVA_LANGUAGE_LEVEL, # "1.6", "1.8", "9", "10", "11", "12", "13", "15", "16", "17", "18", "19", "20", "21", "22", "23", or "24"
language_version = KOTLIN_LANGUAGE_LEVEL, # "1.1", "1.2", "1.3", "1.4", "1.5" "1.6", "1.7", "1.8", or "1.9"
)
```
Expand Down
3 changes: 3 additions & 0 deletions kotlin/internal/toolchains.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ _kt_toolchain = rule(
"19",
"20",
"21",
"22",
"23",
"24",
],
),
"experimental_multiplex_workers": attr.bool(
Expand Down
4 changes: 2 additions & 2 deletions src/main/starlark/core/options/opts.kotlinc.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ default: 'first-only-warn' in language version 2.2+, 'first-only' in version 2.1
args = dict(
default = "",
doc = "The target version of the generated JVM bytecode",
values = ["1.6", "1.8", "9", "10", "11", "12", "13", "15", "16", "17"],
values = ["1.6", "1.8", "9", "10", "11", "12", "13", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24"],
),
type = attr.string,
value_to_flag = None,
Expand All @@ -442,7 +442,7 @@ default: 'first-only-warn' in language version 2.2+, 'first-only' in version 2.1
doc = """Compile against the specified JDK API version, similarly to javac's '-release'. This requires JDK 9 or newer.
The supported versions depend on the JDK used; for JDK 17+, the supported versions are 1.8 and 9–21.
This also sets the value of '-jvm-target' to be equal to the selected JDK version.""",
values = ["1.6", "1.8", "9", "10", "11", "12", "13", "15", "16", "17"],
values = ["1.6", "1.8", "9", "10", "11", "12", "13", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24"],
),
type = attr.string,
value_to_flag = None,
Expand Down