Skip to content

Commit 06b5678

Browse files
authored
Update toolchains version (#9)
1 parent a9eb7a1 commit 06b5678

File tree

8 files changed

+13
-9
lines changed

8 files changed

+13
-9
lines changed

.bazelrc

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ build:windows --copt=/WX
99
build:windows --copt=/std:c++20
1010
build:windows --copt=/Zc:preprocessor
1111
build:windows --copt=/wd5105
12+
build:windows --cxxopt=/wd4146
1213
build:windows --cxxopt=/wd4267
1314
build:windows --cxxopt=/wd4244
1415

@@ -18,6 +19,7 @@ build:windows_arm --copt=/WX
1819
build:windows_arm --copt=/std:c++20
1920
build:windows_arm --copt=/Zc:preprocessor
2021
build:windows_arm --copt=/wd5105
22+
build:windows_arm --cxxopt=/wd4146
2123
build:windows_arm --cxxopt=/wd4267
2224
build:windows_arm --cxxopt=/wd4244
2325
build:windows_arm --cpu=x64_arm64_windows

MODULE.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module(
22
name = "bzlmodrio-opencv",
3-
version = "4.8.0-1",
3+
version = "2024.4.8.0-1",
44
compatibility_level = 2024,
55
)
66

77
bazel_dep(name = "platforms", version = "0.0.7")
88
bazel_dep(name = "rules_cc", version = "0.0.8")
99
bazel_dep(name = "rules_java", version = "6.4.0")
1010
bazel_dep(name = "rules_bazelrio", version = "0.0.13")
11-
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2023-7")
11+
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1")
1212

1313
setup_bzlmodrio_opencv_cpp_dependencies = use_extension("//:maven_cpp_deps.bzl", "setup_bzlmodrio_opencv_cpp_dependencies")
1414
use_repo(

generate/generate.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ def main():
2525
mandatory_dependencies = create_default_mandatory_settings(GenericCliArgs(args))
2626

2727
clean_existing_version(REPO_DIR)
28-
generate_module_project_files(
29-
REPO_DIR, group, mandatory_dependencies, include_windows_arm_compiler=True
30-
)
28+
generate_module_project_files(REPO_DIR, group, mandatory_dependencies)
3129
generate_group(output_dir, group, force_tests=args.force_tests)
3230

3331

generate/get_opencv_dependencies.py

+2
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ def get_opencv_dependencies():
7676
dependencies=["opencv-cpp"],
7777
)
7878

79+
group.sanitized_version = year + "." + group.sanitized_version
80+
7981
return group
8082

8183

generate/get_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
def main():
55
group = get_opencv_dependencies()
6-
print(group.version)
6+
print(group.year + "." + group.version)
77

88

99
if __name__ == "__main__":

private/non_bzlmod_dependencies/download_dependencies.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ def download_dependencies():
1919
# Roborio Toolchain
2020
http_archive(
2121
name = "rules_bzlmodrio_toolchains",
22-
sha256 = "1c566358f97b093916e150de10b65d6527ad268e5bd8bc0a0a8bfd04b390751a",
23-
url = "https://github.com/bzlmodRio/rules_bzlmodRio_toolchains/releases/download/2023-7/rules_bzlmodRio_toolchains-2023-7.tar.gz",
22+
sha256 = "cd3ff046427e9c6dbc0c86a458c8cf081b8045fc3fb4265d08c0ebfc17f9cb30",
23+
url = "https://github.com/bzlmodRio/rules_bzlmodRio_toolchains/releases/download/2024-1/rules_bzlmodRio_toolchains-2024-1.tar.gz",
2424
)
2525

2626
########################

tests/.bazelrc

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ build:windows --copt=/WX
99
build:windows --copt=/std:c++20
1010
build:windows --copt=/Zc:preprocessor
1111
build:windows --copt=/wd5105
12+
build:windows --cxxopt=/wd4146
1213
build:windows --cxxopt=/wd4267
1314
build:windows --cxxopt=/wd4244
1415

@@ -18,6 +19,7 @@ build:windows_arm --copt=/WX
1819
build:windows_arm --copt=/std:c++20
1920
build:windows_arm --copt=/Zc:preprocessor
2021
build:windows_arm --copt=/wd5105
22+
build:windows_arm --cxxopt=/wd4146
2123
build:windows_arm --cxxopt=/wd4267
2224
build:windows_arm --cxxopt=/wd4244
2325
build:windows_arm --cpu=x64_arm64_windows

tests/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ bazel_dep(name = "rules_cc", version = "0.0.8")
99
bazel_dep(name = "rules_java", version = "6.4.0")
1010
bazel_dep(name = "rules_jvm_external", version = "5.3")
1111
bazel_dep(name = "rules_bazelrio", version = "0.0.13")
12-
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2023-7")
12+
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1")
1313
bazel_dep(name = "rules_pmd", version = "6.43.0")
1414
bazel_dep(name = "rules_checkstyle", version = "10.1")
1515
bazel_dep(name = "rules_wpiformat", version = "2022.30")

0 commit comments

Comments
 (0)