deps: use baselibs instead of baselibs_rust

Author: arkjedrz

Cargo.lock

@@ -21,11 +21,11 @@ signal-hook = "0.3.18"
 
 alive_rs = { path = "score/launch_manager/src/alive/src/rust" } # Temporary API
 health_monitoring_lib = { path = "score/health_monitor/src" }
-score_log = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" }
-score_testing_macros = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" }
-stdout_logger = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" }
-containers = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" }
-thread = { git = "https://github.com/eclipse-score/baselibs_rust.git", tag = "v0.1.1" }
+score_log = { git = "https://github.com/eclipse-score/baselibs.git", rev = "f4f9df39275760a60e54e5e3c5112210e35ae2a3" }
+score_testing_macros = { git = "https://github.com/eclipse-score/baselibs.git", rev = "f4f9df39275760a60e54e5e3c5112210e35ae2a3" }
+stdout_logger = { git = "https://github.com/eclipse-score/baselibs.git", rev = "f4f9df39275760a60e54e5e3c5112210e35ae2a3" }
+containers = { git = "https://github.com/eclipse-score/baselibs.git", rev = "f4f9df39275760a60e54e5e3c5112210e35ae2a3" }
+thread = { git = "https://github.com/eclipse-score/baselibs.git", rev = "f4f9df39275760a60e54e5e3c5112210e35ae2a3" }
 
 [workspace.lints.clippy]
 std_instead_of_core = "warn"

Cargo.toml

@@ -132,11 +132,10 @@ oci.pull(
 )
 use_repo(oci, "debian-test-runtime", "debian-test-runtime_linux_amd64")
 
-bazel_dep(name = "score_baselibs_rust", version = "0.1.2")
 bazel_dep(name = "score_baselibs", version = "0.2.8")
 git_override(
     module_name = "score_baselibs",
-    commit = "d0145e0645d4fe9661a36c348f0e62e13cf73f98",
+    commit = "f4f9df39275760a60e54e5e3c5112210e35ae2a3",
     remote = "https://github.com/eclipse-score/baselibs.git",
 )
 

MODULE.bazel

@@ -34,6 +34,6 @@ cc_binary(
     deps = [
         "//score/health_monitor:health_monitoring_cc",
         "//score/launch_manager:lifecycle_cc",
-        "@score_baselibs_rust//src/log/stdout_logger_cpp_init",
+        "@score_baselibs//src/log/stdout_logger_cpp_init",
     ],
 )

MODULE.bazel.lock

@@ -36,8 +36,8 @@ rust_binary(
     deps = [
         "//score/health_monitor:health_monitoring_rust",
         "//score/launch_manager:lifecycle_rust",
-        "@score_baselibs_rust//src/log/score_log",
-        "@score_baselibs_rust//src/log/stdout_logger",
+        "@score_baselibs//src/log/score_log",
+        "@score_baselibs//src/log/stdout_logger",
         "@score_crates//:clap",
         "@score_crates//:libc",
         "@score_crates//:signal_hook",

examples/cpp_supervised_app/BUILD

@@ -14,14 +14,14 @@
 load("@rules_rust//rust:defs.bzl", "miri_test", "rust_library", "rust_static_library", "rust_test")
 
 COMMON_RUST_DEPS = [
-    "@score_baselibs_rust//src/containers:containers",
-    "@score_baselibs_rust//src/thread:thread",
-    "@score_baselibs_rust//src/log/score_log:score_log",
+    "@score_baselibs//src/containers:containers",
+    "@score_baselibs//src/thread:thread",
+    "@score_baselibs//src/log/score_log:score_log",
     "//score/launch_manager:alive_rust",
 ]
 
 PROC_MACRO_DEPS = [
-    "@score_baselibs_rust//src/testing_macros:score_testing_macros",
+    "@score_baselibs//src/testing_macros:score_testing_macros",
 ]
 
 rust_library(
@@ -72,7 +72,7 @@ rust_test(
     tags = [
         "no-asan",
     ],
-    deps = ["@score_baselibs_rust//src/log/stdout_logger"],
+    deps = ["@score_baselibs//src/log/stdout_logger"],
 )
 
 rust_test(
@@ -99,7 +99,7 @@ rust_test(
     ],
     target_compatible_with = ["@platforms//os:linux"],
     deps = [
-        "@score_baselibs_rust//src/log/stdout_logger",
+        "@score_baselibs//src/log/stdout_logger",
         "@score_crates//:loom",
     ],
 )

examples/rust_supervised_app/BUILD

@@ -50,7 +50,7 @@ cc_binary(
         "//score/launch_manager:lifecycle_cc",
         "//tests/utils/test_helper",
         "@googletest//:gtest_main",
-        "@score_baselibs_rust//src/log/stdout_logger_cpp_init",
+        "@score_baselibs//src/log/stdout_logger_cpp_init",
     ],
 )