Skip to content

Commit

Permalink
Revert "deps/mobile: Bump bazel -> 6.3.1, rules_java -> 6.4.0, `i…
Browse files Browse the repository at this point in the history
…o_bazel_rules_kotlin` -> 1.8 (envoyproxy#28854)"

This reverts commit b9d9a74.

Signed-off-by: Ryan Northey <ryan@synca.io>
  • Loading branch information
phlax committed Aug 17, 2023
1 parent 98adf91 commit c7147a8
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 303 deletions.
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ build:rbe-engflow --remote_cache=grpcs://envoy.cluster.engflow.com
build:rbe-engflow --remote_executor=grpcs://envoy.cluster.engflow.com
build:rbe-engflow --bes_backend=grpcs://envoy.cluster.engflow.com/
build:rbe-engflow --bes_results_url=https://envoy.cluster.engflow.com/invocation/
build:rbe-engflow --credential_helper=*.engflow.com=%workspace%/bazel/engflow-bazel-credential-helper.sh
build:rbe-engflow --experimental_credential_helper=%workspace%/bazel/engflow-bazel-credential-helper.sh
build:rbe-engflow --grpc_keepalive_time=30s
build:rbe-engflow --remote_timeout=3600s
build:rbe-engflow --bes_timeout=3600s
Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.3.2
6.1.0
293 changes: 0 additions & 293 deletions bazel/rules_java.patch

This file was deleted.

13 changes: 6 additions & 7 deletions mobile/bazel/envoy_mobile_repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,10 @@ def swift_repos():
def kotlin_repos():
http_archive(
name = "rules_java",
sha256 = "241822bf5fad614e3e1c42431002abd9af757136fa590a6a7870c6e0640a82e3",
strip_prefix = "rules_java-6.4.0",
url = "https://github.com/bazelbuild/rules_java/archive/6.4.0.tar.gz",
patch_args = ["-p1"],
patches = ["@envoy//bazel:rules_java.patch"],
sha256 = "19462d64b1586c0d4ea0e87f9325be2514f0eb84e56dbf3245450451b3701581",
strip_prefix = "rules_java-43243982abc76390ef64be62379a1353f9011771",
# TODO(jpsim): Switch back to bazelbuild repo when https://github.com/bazelbuild/rules_java/issues/64 is fixed
url = "https://github.com/jpsim/rules_java/archive/43243982abc76390ef64be62379a1353f9011771.tar.gz",
)

http_archive(
Expand All @@ -81,8 +80,8 @@ def kotlin_repos():

http_archive(
name = "io_bazel_rules_kotlin",
sha256 = "01293740a16e474669aba5b5a1fe3d368de5832442f164e4fbfc566815a8bc3a",
urls = ["https://github.com/bazelbuild/rules_kotlin/releases/download/v1.8/rules_kotlin_release.tgz"],
sha256 = "f033fa36f51073eae224f18428d9493966e67c27387728b6be2ebbdae43f140e",
urls = ["https://github.com/bazelbuild/rules_kotlin/releases/download/v1.7.0-RC-3/rules_kotlin_release.tgz"],
)

http_archive(
Expand Down
2 changes: 1 addition & 1 deletion mobile/tools/what_to_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail
BRANCH_NAME="$GITHUB_REF_NAME"
BASE_COMMIT="$(git merge-base origin/main HEAD)"
CHANGED_FILES="$(git diff "${BASE_COMMIT}" --name-only)"
CHANGE_MATCH='^mobile/|^bazel/repository_locations\.bzl|^\.bazelrc|^\.bazelversion|^\.github/workflows/mobile-*|^\.github/workflows/_env.yml'
CHANGE_MATCH='^mobile/|^bazel/repository_locations\.bzl|^\.bazelrc|^\.github/workflows/mobile-*|^\.github/workflows/_env.yml'

# The logic in this file is roughly:
#
Expand Down

0 comments on commit c7147a8

Please sign in to comment.