Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 29 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,45 @@ 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")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dev_dependency? I dont want every repo that uses persistency to be obliged to load trlc especially when it is not using it

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(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need single_version_override here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moreover it cannot be used. The only place where it should be used is reference_integration repo

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)

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")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why was the version downgraded?

bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")

## temporary overrides / tools
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 2 additions & 0 deletions src/cpp/tests/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Expand All @@ -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",
],
)
1 change: 1 addition & 0 deletions tests/test_scenarios/cpp/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ cc_binary(
visibility = ["//visibility:public"],
deps = [
"//src/cpp/src:kvs_cpp",
"@score_logging//score/mw/log",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this required for test_scenarios ? I dont see any tests added . It is becuase the kremotelogging=false is removed?

"@score_test_scenarios//test_scenarios_cpp",
],
)
2 changes: 1 addition & 1 deletion tests/test_scenarios/cpp/src/cit/snapshots.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<int32_t>(obj, "count")};
[[maybe_unused]] auto count{get_field<int32_t>(obj, "count")};
auto params{KvsParameters::from_json(input)};

auto kvs{kvs_instance(params)};
Expand Down
Loading