Skip to content

Commit 0cef2de

Browse files
authored
Update a bunch of dependencies (#102)
1 parent b9e63f5 commit 0cef2de

File tree

15 files changed

+42
-56
lines changed

15 files changed

+42
-56
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.3.0
1+
9.0.0

.bcr/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
bcr_test_module:
22
module_path: "e2e/smoke"
33
matrix:
4-
platform: ["debian10", "macos", "ubuntu2004", "windows"]
4+
platform: ["debian10", "macos_arm64", "ubuntu2004", "windows"]
55
tasks:
66
run_tests:
77
name: "Run test module"

.github/workflows/ci.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ jobs:
2121
strategy:
2222
matrix:
2323
os: [ubuntu-latest]
24-
bzlmod: [true]
25-
bazel_version: ["7.4.1", "8.0.1"]
24+
bazel_version: ["8.x", "9.x"]
2625
runs-on: ${{ matrix.os }}
2726
steps:
2827
- name: "Checkout the sources"
@@ -39,15 +38,14 @@ jobs:
3938
- name: "Running tests //..."
4039
env:
4140
USE_BAZEL_VERSION: ${{ matrix.bazel_version }}
42-
run: bazel test //... --enable_bzlmod=${{ matrix.bzlmod }}
41+
run: bazel test //...
4342
integration-tests:
4443
strategy:
4544
matrix:
4645
os: [ubuntu-latest]
47-
bzlmod: [true]
4846
directory: [examples/simple-android]
4947
strategy: [local, worker]
50-
bazel_version: ["7.4.1", "8.0.1"]
48+
bazel_version: ["8.x", "9.x"]
5149
runs-on: ${{ matrix.os }}
5250
steps:
5351
- name: "Checkout the sources"
@@ -65,4 +63,4 @@ jobs:
6563
env:
6664
USE_BAZEL_VERSION: ${{ matrix.bazel_version }}
6765
working-directory: ${{ matrix.directory }}
68-
run: bazel test //... --enable_bzlmod=${{ matrix.bzlmod }} --strategy=AndroidLint=${{ matrix.strategy }}
66+
run: bazel test //... --strategy=AndroidLint=${{ matrix.strategy }}

MODULE.bazel

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@ module(
44
compatibility_level = 1,
55
)
66

7-
bazel_dep(name = "rules_android", version = "0.6.1")
8-
bazel_dep(name = "rules_java", version = "8.6.3")
9-
bazel_dep(name = "rules_jvm_external", version = "6.7")
10-
bazel_dep(name = "rules_kotlin", version = "2.1.0")
11-
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12-
bazel_dep(name = "platforms", version = "0.0.8")
13-
bazel_dep(name = "bazel_worker_api", version = "0.0.4")
14-
bazel_dep(name = "bazel_worker_java", version = "0.0.4")
7+
bazel_dep(name = "rules_android", version = "0.7.1")
8+
bazel_dep(name = "rules_java", version = "9.3.0")
9+
bazel_dep(name = "rules_jvm_external", version = "6.9")
10+
bazel_dep(name = "rules_kotlin", version = "2.2.2")
11+
bazel_dep(name = "rules_python", version = "1.7.0")
12+
bazel_dep(name = "bazel_skylib", version = "1.9.0")
13+
bazel_dep(name = "platforms", version = "1.0.0")
14+
bazel_dep(name = "bazel_worker_api", version = "0.0.10")
15+
bazel_dep(name = "bazel_worker_java", version = "0.0.10")
1516

16-
bazel_dep(name = "aspect_bazel_lib", version = "2.11.0", dev_dependency = True)
17-
bazel_dep(name = "buildifier_prebuilt", version = "8.0.0", dev_dependency = True)
17+
bazel_dep(name = "aspect_bazel_lib", version = "2.22.5", dev_dependency = True)
18+
bazel_dep(name = "buildifier_prebuilt", version = "8.2.1.2", dev_dependency = True)
1819

1920
register_toolchains("//toolchains:android_lint_default_toolchain")
2021

e2e/smoke/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
bazel_dep(name = "rules_android_lint", version = "0.0.0", dev_dependency = True)
2-
bazel_dep(name = "bazel_skylib", version = "1.7.1", dev_dependency = True)
2+
bazel_dep(name = "bazel_skylib", version = "1.9.0", dev_dependency = True)
33

44
local_path_override(
55
module_name = "rules_android_lint",

e2e/smoke/WORKSPACE.bazel

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1 @@
1-
# Override http_archive for local testing
2-
local_repository(
3-
name = "rules_android_lint",
4-
path = "../..",
5-
)
6-
7-
#---SNIP--- Below here is re-used in the workspace snippet published on releases
8-
9-
######################
10-
# rules_android_lint setup #
11-
######################
12-
# Fetches the rules_android_lint dependencies.
13-
# If you want to have a different version of some dependency,
14-
# you should fetch it *before* calling this.
15-
# Alternatively, you can skip calling this function, so long as you've
16-
# already fetched all the dependencies.
17-
load("@rules_android_lint//android_lint:repositories.bzl", "rules_android_lint_dependencies")
18-
19-
rules_android_lint_dependencies()
1+
# Marker file for Bazel workspace root

e2e/smoke/WORKSPACE.bzlmod

Lines changed: 0 additions & 2 deletions
This file was deleted.

examples/simple-android/.bazelrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
common --enable_bzlmod
21
common --lockfile_mode=off
32
common --experimental_google_legacy_api
43
test --test_output=all

examples/simple-android/MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ local_path_override(
1212
)
1313

1414
bazel_dep(name = "platforms", version = "1.0.0")
15-
bazel_dep(name = "rules_android", version = "0.6.5")
16-
bazel_dep(name = "rules_jvm_external", version = "6.7")
15+
bazel_dep(name = "rules_android", version = "0.7.1")
16+
bazel_dep(name = "rules_jvm_external", version = "6.9")
1717

1818
remote_android_extensions = use_extension(
1919
"@rules_android//bzlmod_extensions:android_extensions.bzl",
2020
"remote_android_tools_extensions",
2121
)
22-
use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools")
22+
use_repo(remote_android_extensions, "android_tools")
2323

2424
android_sdk_repository_extension = use_extension("@rules_android//rules/android_sdk_repository:rule.bzl", "android_sdk_repository_extension")
2525
use_repo(android_sdk_repository_extension, "androidsdk")
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Marker file for Bazel workspace root

0 commit comments

Comments
 (0)