diff --git a/.bazelrc b/.bazelrc index a3426dda..3f3dbbaa 100644 --- a/.bazelrc +++ b/.bazelrc @@ -26,7 +26,6 @@ build --java_runtime_version=remotejdk_17 build --tool_java_runtime_version=remotejdk_17 build --@score_baselibs//score/json:base_library=nlohmann -build --@score_baselibs//score/mw/log/flags:KRemote_Logging=False # Clippy linting (enabled by default) build --aspects=@score_rust_policies//clippy:linters.bzl%clippy_strict diff --git a/MODULE.bazel b/MODULE.bazel index 289d2438..f1028cf8 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -77,10 +77,37 @@ bazel_dep(name = "google_benchmark", version = "1.9.4", dev_dependency = True) bazel_dep(name = "platforms", version = "1.0.0") ## S-CORE bazel registry -bazel_dep(name = "score_baselibs", version = "0.1.2") +bazel_dep(name = "score_baselibs", version = "0.1.3") +git_override( + module_name = "score_baselibs", + commit = "99d49637a2199f33a71edc479d39970e3bdcb271", + remote = "https://github.com/eclipse-score/baselibs.git", +) + +bazel_dep(name = "score_logging", version = "0.0.3") +git_override( + module_name = "score_logging", + commit = "2b3e56cf12cf582d0c0a235cad3d1d9b9fc1e494", # latest main + remote = "https://github.com/eclipse-score/logging.git", +) + +# TRLC required transitively via: score_logging -> score_communication -> trlc +bazel_dep(name = "trlc", version = "0.0.0") +git_override( + module_name = "trlc", + commit = "650b51a47264a4f232b3341f473527710fc32669", # trlc-2.0.2 release + remote = "https://github.com/bmw-software-engineering/trlc.git", +) + bazel_dep(name = "score_bazel_platforms", version = "0.0.4") +# Override score_docs_as_code to resolve compatibility level conflicts between dependencies bazel_dep(name = "score_docs_as_code", version = "3.0.0", dev_dependency = True) +single_version_override( + module_name = "score_docs_as_code", + version = "3.0.0", +) + bazel_dep(name = "score_platform", version = "0.5.3", dev_dependency = True) bazel_dep(name = "score_process", version = "1.4.0", dev_dependency = True) @@ -88,7 +115,7 @@ bazel_dep(name = "score_python_basics", version = "0.3.4") bazel_dep(name = "score_tooling", version = "1.1.0") # ToDo: implicit dependencies for score_tooling, but needed directly here?? -bazel_dep(name = "aspect_rules_lint", version = "2.0.0") +bazel_dep(name = "aspect_rules_lint", version = "1.10.2") bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2") ## temporary overrides / tools diff --git a/src/cpp/src/BUILD b/src/cpp/src/BUILD index a3a80744..30e8dea8 100644 --- a/src/cpp/src/BUILD +++ b/src/cpp/src/BUILD @@ -49,7 +49,7 @@ cc_library( "//src/cpp/src/internal:error", "@score_baselibs//score/filesystem", "@score_baselibs//score/json", - "@score_baselibs//score/mw/log", + "@score_baselibs//score/mw/log:frontend", "@score_baselibs//score/result", ], ) diff --git a/src/cpp/tests/BUILD b/src/cpp/tests/BUILD index 801697ff..2f3e5d1f 100644 --- a/src/cpp/tests/BUILD +++ b/src/cpp/tests/BUILD @@ -30,6 +30,7 @@ cc_test( "@score_baselibs//score/filesystem", "@score_baselibs//score/filesystem:mock", "@score_baselibs//score/json:mock", + "@score_baselibs//score/mw/log:backend_stub_testutil", "@score_baselibs//score/result", ], ) @@ -47,6 +48,7 @@ cc_test( "@google_benchmark//:benchmark", "@score_baselibs//score/filesystem", "@score_baselibs//score/json", + "@score_baselibs//score/mw/log:backend_stub_testutil", "@score_baselibs//score/result", ], ) diff --git a/tests/test_scenarios/cpp/BUILD b/tests/test_scenarios/cpp/BUILD index 586514b9..25d5109a 100644 --- a/tests/test_scenarios/cpp/BUILD +++ b/tests/test_scenarios/cpp/BUILD @@ -27,6 +27,7 @@ cc_binary( visibility = ["//visibility:public"], deps = [ "//src/cpp/src:kvs_cpp", + "@score_logging//score/mw/log", "@score_test_scenarios//test_scenarios_cpp", ], ) diff --git a/tests/test_scenarios/cpp/src/cit/snapshots.cpp b/tests/test_scenarios/cpp/src/cit/snapshots.cpp index c941602b..ca296f43 100644 --- a/tests/test_scenarios/cpp/src/cit/snapshots.cpp +++ b/tests/test_scenarios/cpp/src/cit/snapshots.cpp @@ -143,7 +143,7 @@ class SnapshotMaxCount : public Scenario void run(const std::string& input) const final { auto obj{get_object(input)}; - auto count{get_field(obj, "count")}; + [[maybe_unused]] auto count{get_field(obj, "count")}; auto params{KvsParameters::from_json(input)}; auto kvs{kvs_instance(params)};