Skip to content

Commit

Permalink
build!: Update rules_kotlin dep to 1.9.6. (#7)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: Kotlin language version updated to 2.0
  • Loading branch information
SanjayVas authored Sep 5, 2024
1 parent 4039db8 commit cb086cd
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 90 deletions.
8 changes: 5 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module(
repo_name = "wfa_rules_kotlin_jvm",
)

KOTLIN_RELEASE_VERSION = "1.8.22"
KOTLIN_RELEASE_VERSION = "2.0.0" # Compatible with rules_kotlin version.

KOTLINX_COROUTINES_VERSION = "1.7.3"
KOTLINX_COROUTINES_VERSION = "1.8.1"

GRPC_JAVA_VERSION = "1.60.2"

Expand All @@ -27,7 +27,7 @@ bazel_dep(
)
bazel_dep(
name = "rules_kotlin",
version = "1.9.0",
version = "1.9.6",
)
bazel_dep(
name = "rules_jvm_external",
Expand Down Expand Up @@ -82,3 +82,5 @@ http_file(
version = GRPC_JAVA_VERSION,
),
)

register_toolchains("//kotlin:kotlin_toolchain")
110 changes: 26 additions & 84 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion kotlin/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@rules_kotlin//kotlin:core.bzl", "kt_kotlinc_options")
load("@rules_kotlin//kotlin:core.bzl", "define_kt_toolchain", "kt_kotlinc_options")

package(default_visibility = ["//visibility:public"])

Expand All @@ -7,3 +7,9 @@ kt_kotlinc_options(
include_stdlibs = "none",
x_optin = ["kotlin.RequiresOptIn"],
)

define_kt_toolchain(
name = "kotlin_toolchain",
jvm_target = "11",
kotlinc_options = ":default_opts",
)
2 changes: 0 additions & 2 deletions kotlin/internal/library.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ def kt_jvm_library(
name,
deps = None,
exports = None,
kotlinc_opts = Label("//kotlin:default_opts"),
**kwargs):
deps = deps or []
exports = exports or []
Expand All @@ -37,6 +36,5 @@ def kt_jvm_library(
name = name,
deps = deps + _STDLIBS,
exports = exports + _STDLIBS,
kotlinc_opts = kotlinc_opts,
**kwargs
)

0 comments on commit cb086cd

Please sign in to comment.