Skip to content
This repository was archived by the owner on Mar 22, 2026. It is now read-only.

Commit 98a2d56

Browse files
committed
[build] 升级 Bazel 规则
1 parent 902223d commit 98a2d56

8 files changed

Lines changed: 83 additions & 235 deletions

File tree

MODULE.bazel

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,22 @@ module(
55
version = "0.3.1-alpha",
66
)
77

8-
bazel_dep(name = "rules_java", version = "9.5.0")
9-
bazel_dep(name = "rules_kotlin", version = "2.2.2")
8+
bazel_dep(name = "rules_java", version = "9.6.1")
9+
bazel_dep(name = "rules_kotlin", version = "2.3.10")
1010
bazel_dep(name = "rules_jvm_external", version = "6.10")
1111
bazel_dep(name = "bazel_skylib", version = "1.9.0")
12-
bazel_dep(name = "bazel_lib", version = "3.2.0")
12+
bazel_dep(name = "bazel_lib", version = "3.2.2")
1313
bazel_dep(name = "platforms", version = "1.0.0")
14-
bazel_dep(name = "rules_rust", version = "0.68.1")
15-
bazel_dep(name = "rules_rust_mdbook", version = "0.68.1")
16-
bazel_dep(name = "rules_python", version = "1.8.4")
14+
bazel_dep(name = "rules_rust", version = "0.69.0")
15+
bazel_dep(name = "rules_rust_mdbook", version = "0.69.0")
16+
bazel_dep(name = "rules_python", version = "1.9.0")
1717
bazel_dep(name = "rules_jni", version = "0.11.1")
18-
bazel_dep(name = "rules_cc", version = "0.2.16")
18+
bazel_dep(name = "rules_cc", version = "0.2.17")
1919
bazel_dep(name = "rules_shell", version = "0.6.1")
2020
bazel_dep(name = "hermetic_cc_toolchain", version = "4.1.0")
2121
bazel_dep(name = "bazel_worker_api", version = "0.0.10")
22-
bazel_dep(name = "with_cfg.bzl", version = "0.14.1")
22+
bazel_dep(name = "with_cfg.bzl", version = "0.14.4")
23+
bazel_dep(name = "protobuf", version = "34.0.bcr.1")
2324

2425
# Our own rules
2526
bazel_dep(name = "rules_mc", version = "0.0.0")
@@ -39,17 +40,6 @@ archive_override(
3940
url = "https://github.com/bazelbuild/rules_android/releases/download/v0.7.1/rules_android-v0.7.1.tar.gz",
4041
)
4142

42-
# Patch protobuf to avoid https://github.com/protocolbuffers/protobuf/issues/21755
43-
bazel_dep(name = "protobuf", version = "33.4")
44-
archive_override(
45-
module_name = "protobuf",
46-
integrity = "sha256-aH6YpHGXO1xf1xF1DEC4uCwK3jP2Sdtl4AspDyk0Wis=",
47-
patch_strip = 1,
48-
patches = ["//third_party/protobuf/patches:retain-linker-array.patch"],
49-
strip_prefix = "protobuf-33.4",
50-
url = "https://github.com/protocolbuffers/protobuf/releases/download/v33.4/protobuf-33.4.bazel.tar.gz",
51-
)
52-
5343
# Patch rules_android_ndk to fix https://github.com/bazelbuild/rules_android_ndk/issues/107
5444
# and https://github.com/bazelbuild/rules_android_ndk/pull/119
5545
bazel_dep(name = "rules_android_ndk", version = "0.1.3")
@@ -87,7 +77,7 @@ git_override(
8777
)
8878

8979
# libraries
90-
bazel_dep(name = "libffi", version = "3.4.7.bcr.3")
80+
bazel_dep(name = "libffi", version = "3.4.7.bcr.4")
9181
bazel_dep(name = "bullet", version = "3.26.0-rc0.bcr.1")
9282
bazel_dep(name = "glfw", version = "3.4.0.bcr.1")
9383
bazel_dep(name = "glm", version = "1.0.3")

MODULE.bazel.lock

Lines changed: 65 additions & 192 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

maven_install.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"org.jetbrains.compose.material:material-icons-core-desktop": 807184435,
5959
"org.jetbrains.compose.ui:ui-desktop": 1355439251,
6060
"org.jetbrains.compose.ui:ui-graphics-desktop": 121106093,
61-
"org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable": -2050093030,
61+
"org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable": 82957657,
6262
"org.jetbrains.kotlin:kotlin-stdlib": 52847824,
6363
"org.jetbrains.kotlin:kotlin-test-junit5": 1682081423,
6464
"org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm": 1304849756,
@@ -370,8 +370,8 @@
370370
"org.jetbrains.compose.ui:ui-unit-desktop:jar:sources": -837295709,
371371
"org.jetbrains.compose.ui:ui-util-desktop": 203160386,
372372
"org.jetbrains.compose.ui:ui-util-desktop:jar:sources": -1646845979,
373-
"org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable": -1948516580,
374-
"org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:jar:sources": 1334105458,
373+
"org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable": -965425504,
374+
"org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:jar:sources": -479112860,
375375
"org.jetbrains.kotlin:kotlin-reflect": -196767604,
376376
"org.jetbrains.kotlin:kotlin-reflect:jar:sources": -360624647,
377377
"org.jetbrains.kotlin:kotlin-stdlib": 611564394,
@@ -1500,10 +1500,10 @@
15001500
},
15011501
"org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable": {
15021502
"shasums": {
1503-
"jar": "bd6b2db8bbf5ef1c12888ae885b72054e70cea7ef4d6e8bb5eca4faa0539393f",
1504-
"sources": "0c1a7ad3991be34d03555140c304f15c67748f5be71a8e79dc393b745e442202"
1503+
"jar": "b6b9c87d05379548034c15d7717ed380e7f6909af4f117150ada746fb7441cfa",
1504+
"sources": "ab0ac3cd5742081f8ed1fc709e9961033ffdcc0d793a391b6100f2b407fea582"
15051505
},
1506-
"version": "2.2.21"
1506+
"version": "2.3.10"
15071507
},
15081508
"org.jetbrains.kotlin:kotlin-reflect": {
15091509
"shasums": {

module/combine.MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
44
maven.install(
55
artifacts = [
6-
"org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:2.2.21",
6+
"org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:2.3.10",
77
"androidx.compose.runtime:runtime-desktop:1.10.0",
88
"androidx.compose.runtime:runtime-saveable-desktop:1.10.0",
99
"androidx.collection:collection-jvm:1.5.0",

third_party/protobuf/BUILD.bazel

Whitespace-only changes.

third_party/protobuf/patches/BUILD.bazel

Whitespace-only changes.

third_party/protobuf/patches/retain-linker-array.patch

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

touchcontroller/common/platform/provider/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ cc_jni_library(
3636
platforms = select({
3737
"//:config_release": [
3838
"@//platforms:linux_x86_64",
39-
# TODO: add arm64 after solving libffi issue
39+
"@//platforms:linux_arm64",
4040
],
4141
"//conditions:default": [
4242
"@//platforms:linux_x86_64",

0 commit comments

Comments
 (0)