diff --git a/src/main/starlark/core/repositories/setup.bzl b/src/main/starlark/core/repositories/setup.bzl index 20e235803..1af34b59a 100644 --- a/src/main/starlark/core/repositories/setup.bzl +++ b/src/main/starlark/core/repositories/setup.bzl @@ -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, diff --git a/src/main/starlark/core/repositories/versions.bzl b/src/main/starlark/core/repositories/versions.bzl index 0f21ef3d1..6fcdbfb42 100644 --- a/src/main/starlark/core/repositories/versions.bzl +++ b/src/main/starlark/core/repositories/versions.bzl @@ -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",