diff --git a/src/main/starlark/core/repositories/bzlmod_bootstrap.bzl b/src/main/starlark/core/repositories/bzlmod_bootstrap.bzl index e4337b2ab..40da533a6 100644 --- a/src/main/starlark/core/repositories/bzlmod_bootstrap.bzl +++ b/src/main/starlark/core/repositories/bzlmod_bootstrap.bzl @@ -1,10 +1,13 @@ load("@released_rules_kotlin//src/main/starlark/core/repositories:initialize.bzl", "kotlin_repositories") +load("//src/main/starlark/core/repositories:versions.bzl", "versions") def _rules_kotlin_bootstrap_extensions_impl(_): kotlin_repositories( is_bzlmod = True, compiler_repository_name = "released_com_github_jetbrains_kotlin", ksp_repository_name = "released_com_github_google_ksp", + compiler_release = versions.KOTLIN_CURRENT_COMPILER_RELEASE, + ksp_compiler_release = versions.KSP_CURRENT_COMPILER_PLUGIN_RELEASE, ) rules_kotlin_bootstrap_extensions = module_extension( diff --git a/src/main/starlark/core/repositories/bzlmod_setup.bzl b/src/main/starlark/core/repositories/bzlmod_setup.bzl index d4f561616..4e1957bf4 100644 --- a/src/main/starlark/core/repositories/bzlmod_setup.bzl +++ b/src/main/starlark/core/repositories/bzlmod_setup.bzl @@ -29,6 +29,9 @@ def _rules_kotlin_extensions_impl(mctx): repo = repo, ) for repo in ["com_github_jetbrains_kotlin", "com_github_google_ksp"] + ] + [ + # remove js stdlib from toolchain.. + "perl -i -pe 's/Label\\(\"\\/\\/kotlin\\/compiler:kotlin-stdlib-js\"\\),//g' kotlin/internal/toolchains.bzl", ], ) diff --git a/src/main/starlark/core/repositories/versions.bzl b/src/main/starlark/core/repositories/versions.bzl index 3b3e7089e..14da22857 100644 --- a/src/main/starlark/core/repositories/versions.bzl +++ b/src/main/starlark/core/repositories/versions.bzl @@ -61,18 +61,18 @@ versions = struct( sha256 = "a9f923be58fbd32670a17f0b729b1df804af882fa57402165741cb26e5440ca1", ), KOTLIN_CURRENT_COMPILER_RELEASE = version( - version = "2.0.10", + version = "2.0.20", url_templates = [ "https://github.com/JetBrains/kotlin/releases/download/v{version}/kotlin-compiler-{version}.zip", ], - sha256 = "88d7d8bad362ae4e114a8b9668c6887b8c85f48e340883db0e317e47c8dc2f4f", + sha256 = "5f5d2a8ad6a718a002acd0775b67a9e27035872fdbd4b0791e3cb3ea00095931", ), KSP_CURRENT_COMPILER_PLUGIN_RELEASE = version( - version = "2.0.10-1.0.24", + version = "2.0.20-1.0.24", url_templates = [ "https://github.com/google/ksp/releases/download/{version}/artifacts.zip", ], - sha256 = "e6a79e649ee383b372fa982be89686c10ee42b25e60147b3271a70fd75a9eb19", + sha256 = "831e83824c3a0bc5786d6aaf462ad29e0fc1a708e4fc314035f8444d850206d2", ), ANDROID = struct( VERSION = "0.1.1",