Skip to content

Update rules_proto to 5.3.0-21.7 #946

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

Merged
merged 1 commit into from
Apr 10, 2023
Merged

Update rules_proto to 5.3.0-21.7 #946

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
20 changes: 0 additions & 20 deletions src/main/starlark/core/repositories/setup.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,9 @@ load("@build_bazel_rules_android//android:rules.bzl", "android_sdk_repository")
load("//src/main/starlark/core/repositories:versions.bzl", "versions")
load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")

# Workaround for https://github.com/bazelbuild/rules_proto/commit/f371ed34ed7f1a8b83cc34ae96db277e0ba4fcb0
load("@rules_proto//proto/private:dependencies.bzl", "maven_dependencies")
load("@bazel_tools//tools/build_defs/repo:java.bzl", "java_import_external")

CORRECTED_RULES_PROTO_SHAS = {
# bad -> good
"ad275e75ee79e6c6388198dcb9acf0db2edee64782e11b508f379c3a2a17d168": "51febfb24af6faa7eb729c880b8ba011cbab8ce55920656a450740b73d343ee2",
"0b16133638b1455bea3449c002c7769c75962007d55e9a39c0bed55128da7f70": "34dc0c5bc98416e95a28b3b18caf74816eaa083b2f9c5702b2300a3763970c7b",
}

def kt_configure():
"""Setup dependencies. Must be called AFTER kt_download_local_dev_dependencies() """

# workaround for https://github.com/bazelbuild/rules_proto/commit/f371ed34ed7f1a8b83cc34ae96db277e0ba4fcb0
for (name, arguments) in maven_dependencies.items():
java_import_external(
name = name,
**{
n: CORRECTED_RULES_PROTO_SHAS.get(str(a), a)
for n, a in arguments.items()
}
)

maven_install(
name = "kotlin_rules_maven",
fetch_sources = True,
Expand Down
4 changes: 2 additions & 2 deletions src/main/starlark/core/repositories/versions.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ versions = struct(
RULES_JVM_EXTERNAL_TAG = "4.4.2",
RULES_JVM_EXTERNAL_SHA = "735602f50813eb2ea93ca3f5e43b1959bd80b213b836a07a62a29d757670b77b",
RULES_PROTO = version(
version = "5.3.0-21.5",
sha256 = "80d3a4ec17354cccc898bfe32118edd934f851b03029d63ef3fc7c8663a7415c",
version = "5.3.0-21.7",
sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
strip_prefix_template = "rules_proto-{version}",
url_templates = [
"https://github.com/bazelbuild/rules_proto/archive/refs/tags/{version}.tar.gz",
Expand Down