Skip to content

Commit e99db26

Browse files
Migrate to crate-universe (#177)
## What is the goal of this PR? We update dependencies and the Bazel build files to reflect the new style of crate imports using crate-universe instead of cargo-raze.
1 parent c838269 commit e99db26

File tree

5 files changed

+12
-25
lines changed

5 files changed

+12
-25
lines changed

WORKSPACE

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ java_deps()
3838
# Load //builder/kotlin
3939
load("@vaticle_dependencies//builder/kotlin:deps.bzl", kotlin_deps = "deps")
4040
kotlin_deps()
41-
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
41+
load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
4242
kotlin_repositories()
43+
load("@io_bazel_rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
4344
kt_register_toolchains()
4445

4546
# Load //builder/python
@@ -54,8 +55,10 @@ load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_regi
5455
rules_rust_dependencies()
5556
rust_register_toolchains(edition = "2021", include_rustc_srcs = True)
5657

57-
load("@vaticle_dependencies//library/crates:crates.bzl", "raze_fetch_remote_crates")
58-
raze_fetch_remote_crates()
58+
load("@vaticle_dependencies//library/crates:crates.bzl", "fetch_crates")
59+
fetch_crates()
60+
load("@crates//:defs.bzl", "crate_repositories")
61+
crate_repositories()
5962

6063
# Load //tool/common
6164
load("@vaticle_dependencies//tool/common:deps.bzl", "vaticle_dependencies_ci_pip",

dependencies/maven/artifacts.snapshot

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@
6464
@maven//:org_checkerframework_checker_qual_3_5_0
6565
@maven//:org_codehaus_mojo_animal_sniffer_annotations
6666
@maven//:org_codehaus_mojo_animal_sniffer_annotations_1_19
67+
@maven//:org_jetbrains_compose_compiler_compiler
68+
@maven//:org_jetbrains_compose_compiler_compiler_1_3_2
6769
@maven//:org_slf4j_slf4j_api
6870
@maven//:org_slf4j_slf4j_api_1_7_2
6971
@maven//:org_zeroturnaround_zt_exec

dependencies/vaticle/repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ def vaticle_dependencies():
2121
git_repository(
2222
name = "vaticle_dependencies",
2323
remote = "https://github.com/vaticle/dependencies",
24-
commit = "16b46048ef215bdd162b2d734a04ad9b6d1545e2", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
24+
commit = "87d228da9d5b0c5a53cc1e0426161916a59a318c", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
2525
)

grpc/rust/BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ rust_tonic_compile(
4343

4444
rust_library(
4545
name = "typedb_protocol",
46+
crate_root = ":typedb_protocol_src",
4647
srcs = [
4748
":typedb_protocol_src",
48-
"lib.rs",
4949
],
5050
deps = [
51-
"@vaticle_dependencies//library/crates:tonic",
52-
"@vaticle_dependencies//library/crates:prost",
51+
"@crates//:tonic",
52+
"@crates//:prost",
5353
],
5454
tags = [
5555
"crate-name=typedb-protocol",

grpc/rust/lib.rs

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)