From c7b709c888070ad9906f4ef96af12be95bad56a8 Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Tue, 30 Jan 2024 15:32:53 +0100 Subject: [PATCH] Workaround https://github.com/bazelbuild/rules_kotlin/issues/1106 --- MODULE.bazel.lock | 9 +++++---- repositories.bzl | 5 ++++- src/tools/bzlmod/utils.bzl | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 9737d29baea7e1..e129eba569ed1f 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -2598,7 +2598,7 @@ "moduleExtensions": { "//:extensions.bzl%bazel_android_deps": { "general": { - "bzlTransitiveDigest": "qv82HsiBe0vb3j0W2aBdQ4TGGrc1P1ojDy0tdHZvJks=", + "bzlTransitiveDigest": "aLFwk5PgjrQ77jnEZTK+g9sZAtuhw7EFhP0uTNQgHns=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2739,7 +2739,7 @@ }, "//:extensions.bzl%bazel_build_deps": { "general": { - "bzlTransitiveDigest": "qv82HsiBe0vb3j0W2aBdQ4TGGrc1P1ojDy0tdHZvJks=", + "bzlTransitiveDigest": "aLFwk5PgjrQ77jnEZTK+g9sZAtuhw7EFhP0uTNQgHns=", "accumulatedFileDigests": { "@@//src/test/tools/bzlmod:MODULE.bazel.lock": "0a80fbbd4241dc7ccd3f7665029acd69a64c8d79fa49108c1c46ef778c857685", "@@//:MODULE.bazel": "15825821d543809fdc03e543f9c92a0ebfb3a53629e60c864f83566e1c41710d" @@ -2856,7 +2856,8 @@ "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~com_github_cncf_udpa", "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~com_google_googleapis", "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~envoy_api", - "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~rules_cc" + "grpc~1.48.1.bcr.1~grpc_repo_deps_ext~rules_cc", + "rules_kotlin~1.9.0~rules_kotlin_extensions~com_github_jetbrains_kotlin" ], "dirname": "derived/repository_cache" } @@ -3120,7 +3121,7 @@ }, "//:extensions.bzl%bazel_test_deps": { "general": { - "bzlTransitiveDigest": "qv82HsiBe0vb3j0W2aBdQ4TGGrc1P1ojDy0tdHZvJks=", + "bzlTransitiveDigest": "aLFwk5PgjrQ77jnEZTK+g9sZAtuhw7EFhP0uTNQgHns=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { diff --git a/repositories.bzl b/repositories.bzl index 8f5a0c50b12b57..0e284f21c43053 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -55,7 +55,10 @@ DIST_ARCHIVE_REPOS = [get_canonical_repo_name(repo) for repo in [ "~grpc_repo_deps_ext~com_google_googleapis", "~grpc_repo_deps_ext~envoy_api", "~grpc_repo_deps_ext~rules_cc", # TODO: Should be removed -]] +]] + [ + # TODO(pcloudy): Remove after https://github.com/bazelbuild/rules_kotlin/issues/1106 is fixed + get_canonical_repo_name("rules_kotlin") + "~rules_kotlin_extensions~com_github_jetbrains_kotlin" +] ################################################################################## # diff --git a/src/tools/bzlmod/utils.bzl b/src/tools/bzlmod/utils.bzl index 92e0155d3313e1..033e34f46a1344 100644 --- a/src/tools/bzlmod/utils.bzl +++ b/src/tools/bzlmod/utils.bzl @@ -80,7 +80,8 @@ def parse_http_artifacts(ctx, lockfile_path, required_repos): for extension in extensions: for _, repo_spec in extension["generatedRepoSpecs"].items(): rule_class = repo_spec["ruleClassName"] - if rule_class == "http_archive" or rule_class == "http_file" or rule_class == "http_jar": + # TODO(pcloudy): Remove "kotlin_compiler_repository" after https://github.com/bazelbuild/rules_kotlin/issues/1106 is fixed + if rule_class == "http_archive" or rule_class == "http_file" or rule_class == "http_jar" or rule_class == "kotlin_compiler_repository": attributes = repo_spec["attributes"] repo_name = attributes["name"]