Skip to content

Commit 89e3b05

Browse files
committed
Update @typedb_dependencies with new macro names for external deps
1 parent e78fae8 commit 89e3b05

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

WORKSPACE

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ load("//dependencies/typedb:repositories.bzl", "typedb_dependencies")
1313
typedb_dependencies()
1414

1515
# Load //builder/python
16-
load("@typedb_dependencies//builder/python:deps.bzl", python_deps = "deps")
17-
python_deps()
16+
load("@typedb_dependencies//builder/python:deps.bzl", "rules_python")
17+
rules_python()
1818
load("@rules_python//python:repositories.bzl", "py_repositories")
1919
py_repositories()
2020

@@ -23,20 +23,20 @@ load("@typedb_dependencies//builder/bazel:deps.bzl", "bazel_toolchain")
2323
bazel_toolchain()
2424

2525
# Load //builder/java
26-
load("@typedb_dependencies//builder/java:deps.bzl", java_deps = "deps")
27-
java_deps()
26+
load("@typedb_dependencies//builder/java:deps.bzl", "rules_jvm_external")
27+
rules_jvm_external()
2828

2929
# Load //builder/kotlin
30-
load("@typedb_dependencies//builder/kotlin:deps.bzl", kotlin_deps = "deps")
31-
kotlin_deps()
30+
load("@typedb_dependencies//builder/kotlin:deps.bzl", "io_bazel_rules_kotlin")
31+
io_bazel_rules_kotlin()
3232
load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
3333
kotlin_repositories()
3434
load("@io_bazel_rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
3535
kt_register_toolchains()
3636

3737
# Load //builder/antlr
38-
load("@typedb_dependencies//builder/antlr:deps.bzl", antlr_deps = "deps", "antlr_version")
39-
antlr_deps()
38+
load("@typedb_dependencies//builder/antlr:deps.bzl", "rules_antlr", "antlr_version")
39+
rules_antlr()
4040

4141
load("@rules_antlr//antlr:lang.bzl", "JAVA")
4242
load("@rules_antlr//antlr:repositories.bzl", "rules_antlr_dependencies")
@@ -98,21 +98,22 @@ load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
9898
rules_pkg_dependencies()
9999

100100
# Load //pip
101-
load("@typedb_bazel_distribution//pip:deps.bzl", pip_deps = "deps")
102-
pip_deps()
101+
load("@typedb_bazel_distribution//pip:deps.bzl", "typedb_bazel_distribution_pip")
102+
typedb_bazel_distribution_pip()
103103
load("@typedb_bazel_distribution_pip//:requirements.bzl", "install_deps")
104104
install_deps()
105105

106106
# Load //github
107-
load("@typedb_bazel_distribution//github:deps.bzl", github_deps = "deps")
108-
github_deps()
107+
load("@typedb_bazel_distribution//github:deps.bzl", "ghr_osx_zip", "ghr_linux_tar")
108+
ghr_osx_zip()
109+
ghr_linux_tar()
109110

110111
# Load //maven
111112
load("@typedb_bazel_distribution//maven:deps.bzl", typedb_bazel_distribution_maven_artifacts = "maven_artifacts")
112113

113114
# Load @typedb_bazel_distribution_cloudsmith
114-
load("@typedb_bazel_distribution//common/uploader:deps.bzl", uploader_dpes = "deps")
115-
uploader_dpes()
115+
load("@typedb_bazel_distribution//common/uploader:deps.bzl", "typedb_bazel_distribution_uploader")
116+
typedb_bazel_distribution_uploader()
116117
load("@typedb_bazel_distribution_uploader//:requirements.bzl", install_uploader_deps = "install_deps")
117118
install_uploader_deps()
118119

@@ -123,7 +124,7 @@ install_uploader_deps()
123124
load("//dependencies/typedb:repositories.bzl", "typedb_behaviour")
124125
typedb_behaviour()
125126

126-
load("@typedb_dependencies//common/java:artifacts.bzl", typedb_common_java_maven_artifacts = "maven_artifacts")
127+
load("@typedb_dependencies//common/java:artifacts.bzl", typedb_common_maven_artifacts = "maven_artifacts")
127128
load("@typedb_dependencies//tool/common:deps.bzl", typedb_dependencies_tool_maven_artifacts = "maven_artifacts")
128129

129130
############################
@@ -134,7 +135,7 @@ load("//dependencies/maven:artifacts.bzl", typeql_artifacts = "artifacts")
134135
load("@typedb_dependencies//library/maven:rules.bzl", "maven")
135136
maven(
136137
typedb_bazel_distribution_maven_artifacts +
137-
typedb_common_java_maven_artifacts +
138+
typedb_common_maven_artifacts +
138139
typedb_dependencies_tool_maven_artifacts +
139140
typeql_artifacts
140141
)

dependencies/typedb/repositories.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ def typedb_dependencies():
88
git_repository(
99
name = "typedb_dependencies",
1010
remote = "https://github.com/typedb/typedb-dependencies",
11-
commit = "dee26c1fb578eb0d5064f8a8e04d5d6ff22cdb24", # sync-marker: do not remove this comment, this is used for sync-dependencies by @typedb_dependencies
11+
commit = "554bf8c574b6740dd9c4aae78191402fde413a90", # sync-marker: do not remove this comment, this is used for sync-dependencies by @typedb_dependencies
1212
)
1313

1414
def typedb_behaviour():
1515
git_repository(
1616
name = "typedb_behaviour",
1717
remote = "https://github.com/typedb/typedb-behaviour",
18-
commit = "35b74ab0c89f834dec5cba35fbf64ea19f9b1d68", # sync-marker: do not remove this comment, this is used for sync-dependencies by @typedb_behaviour
18+
commit = "3706a2ac688986baedde07161ad38a686d1183c4", # sync-marker: do not remove this comment, this is used for sync-dependencies by @typedb_behaviour
1919
)

0 commit comments

Comments
 (0)