Skip to content

Commit 3f11b70

Browse files
authored
chore: update bazel, empty workspace, ecsact and other deps (#137)
1 parent ec13006 commit 3f11b70

File tree

5 files changed

+24
-42
lines changed

5 files changed

+24
-42
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.3.2
1+
7.2.0

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# bazel
22
/bazel-*
33
/user.bazelrc
4+
*.bazel.lock
45

56
# https://github.com/hedronvision/bazel-compile-commands-extractor
67
/compile_commands.json

MODULE.bazel

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,26 @@ module(
44
compatibility_level = 1,
55
)
66

7-
bazel_dep(name = "ecsact_runtime", version = "0.5.4")
8-
bazel_dep(name = "ecsact_codegen", version = "0.1.3")
7+
bazel_dep(name = "ecsact_runtime", version = "0.6.5")
8+
bazel_dep(name = "ecsact_codegen", version = "0.2.0")
99
bazel_dep(name = "rules_cc", version = "0.0.9")
10-
bazel_dep(name = "ecsact_lang_cpp", version = "0.3.1")
11-
bazel_dep(name = "bazel_skylib", version = "1.4.2")
10+
bazel_dep(name = "ecsact_lang_cpp", version = "0.4.4")
11+
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12+
13+
bazel_dep(name = "toolchains_llvm", version = "1.0.0", dev_dependency = True)
14+
bazel_dep(name = "hedron_compile_commands", dev_dependency = True)
15+
16+
git_override(
17+
module_name = "hedron_compile_commands",
18+
commit = "204aa593e002cbd177d30f11f54cff3559110bb9",
19+
remote = "https://github.com/hedronvision/bazel-compile-commands-extractor.git",
20+
)
21+
22+
llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm", dev_dependency = True)
23+
llvm.toolchain(llvm_version = "17.0.6")
24+
use_repo(llvm, "llvm_toolchain")
25+
26+
register_toolchains(
27+
"@llvm_toolchain//:all",
28+
dev_dependency = True,
29+
)

WORKSPACE.bazel

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +0,0 @@
1-
workspace(name = "ecsact_lang_csharp")
2-
3-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4-
5-
http_archive(
6-
name = "hedron_compile_commands",
7-
sha256 = "f01636585c3fb61c7c2dc74df511217cd5ad16427528ab33bc76bb34535f10a1",
8-
strip_prefix = "bazel-compile-commands-extractor-a14ad3a64e7bf398ab48105aaa0348e032ac87f8",
9-
url = "https://github.com/hedronvision/bazel-compile-commands-extractor/archive/a14ad3a64e7bf398ab48105aaa0348e032ac87f8.tar.gz",
10-
)
11-
12-
load("@hedron_compile_commands//:workspace_setup.bzl", "hedron_compile_commands_setup")
13-
14-
hedron_compile_commands_setup()
15-
16-
http_archive(
17-
name = "com_grail_bazel_toolchain",
18-
sha256 = "670caaefc77a752a8bbd701dfef2207e41efb36c381e99f851c99785651aff81",
19-
strip_prefix = "bazel-toolchain-0d302de75f6ace071ac616fb274481eedcc20e5a",
20-
url = "https://github.com/grailbio/bazel-toolchain/archive/0d302de75f6ace071ac616fb274481eedcc20e5a.zip",
21-
)
22-
23-
load("@com_grail_bazel_toolchain//toolchain:deps.bzl", "bazel_toolchain_dependencies")
24-
25-
bazel_toolchain_dependencies()
26-
27-
load("@com_grail_bazel_toolchain//toolchain:rules.bzl", "llvm_toolchain")
28-
29-
llvm_toolchain(
30-
name = "llvm_toolchain",
31-
llvm_version = "16.0.4",
32-
)
33-
34-
load("@llvm_toolchain//:toolchains.bzl", "llvm_register_toolchains")
35-
36-
llvm_register_toolchains()

bazel/common.bazelrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ common --registry=https://raw.githubusercontent.com/ecsact-dev/bazel_registry/ma
44
common --registry=https://raw.githubusercontent.com/bazelboost/registry/main
55
common --registry=https://bcr.bazel.build
66
build --enable_platform_specific_config
7-
build --incompatible_use_platforms_repo_for_constraints
87
build --incompatible_enable_cc_toolchain_resolution
98
build --incompatible_strict_action_env
109
build --enable_runfiles

0 commit comments

Comments
 (0)