Skip to content

Commit

Permalink
Update bazel to latest version
Browse files Browse the repository at this point in the history
Apply bazel patch to rules_jvm to create missing
targets.

Change-Id: I397c33f5f71e025ec8db4252dfae422d3881c0ff
  • Loading branch information
hsudhof committed Aug 29, 2023
1 parent f5f41ee commit c64bcee
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
11 changes: 7 additions & 4 deletions repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ load("//third_party:bazel_buildtools.bzl", "buildtools_sha256", "buildtools_vers
load("//third_party:bazel_skylib.bzl", "skylib_sha256", "skylib_version")

def copybara_repositories():
RULES_JVM_EXTERNAL_TAG = "4.2"
RULES_JVM_EXTERNAL_TAG = "5.2"

RULES_JVM_EXTERNAL_SHA = "cd1a77b7b02e8e008439ca76fd34f5b07aecb8c752961f9640dea15e9e5ba1ca"
RULES_JVM_EXTERNAL_SHA = "f86fd42a809e1871ca0aabe89db0d440451219c3ce46c58da240c7dcdc00125f"

maybe(
http_archive,
Expand All @@ -36,9 +36,11 @@ def copybara_repositories():
maybe(
http_archive,
name = "rules_jvm_external",
sha256 = RULES_JVM_EXTERNAL_SHA,
# sha256 = RULES_JVM_EXTERNAL_SHA,
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
patches = ["@io_bazel//third_party:rules_jvm_external_5.2.patch"],
patch_args= ["-p1"],
)

# LICENSE: The Apache Software License, Version 2.0
Expand Down Expand Up @@ -170,7 +172,7 @@ def copybara_repositories():
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.29.0/bazel-gazelle-v0.29.0.tar.gz",
],
)

# LICENSE: The Apache Software License, Version 2.0
maybe(
http_archive,
Expand All @@ -181,3 +183,4 @@ def copybara_repositories():
],
build_file = Label("//external/third_party:jcommander.BUILD"),
)

4 changes: 2 additions & 2 deletions third_party/bazel.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@

# This file is autogenerated by copybara, please do not edit.

bazel_version = "2ede453768850315d02b584b0e2bf505f3c25fee"
bazel_sha256 = "1bc063db4fc1e2ce8088ce90cdebc3bdb9d80f94a2f39a3bd7582a42ebd04d18"
bazel_version = "c1165a994343cb2c5ff9ffa7e97b0ce565b8967b"
bazel_sha256 = "357461450ac88fd48bcb30259c95beac839e7a23237511a8aea8293c4e4dcf9e"

0 comments on commit c64bcee

Please sign in to comment.