Skip to content

Commit 714cece

Browse files
committed
Streamline macro names for external workspaces
1 parent dee26c1 commit 714cece

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

WORKSPACE

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,26 @@ load("@rules_rust//rust:defs.bzl", "rust_common")
1919
rust_register_toolchains(edition = "2021", rust_analyzer_version = rust_common.default_version)
2020

2121
# Load //builder/python
22-
load("//builder/python:deps.bzl", python_deps = "deps")
23-
python_deps()
22+
load("//builder/python:deps.bzl", "rules_python")
23+
rules_python()
2424
load("@rules_python//python:repositories.bzl", "py_repositories")
2525
py_repositories()
2626

2727
# Load //builder/java
28-
load("//builder/java:deps.bzl", java_deps = "deps")
29-
java_deps()
28+
load("//builder/java:deps.bzl", "rules_jvm_external")
29+
rules_jvm_external()
3030
load("//library/maven:rules.bzl", "maven")
3131

3232
# Load //builder/kotlin
33-
load("//builder/kotlin:deps.bzl", kotlin_deps = "deps")
34-
kotlin_deps()
33+
load("//builder/kotlin:deps.bzl", "io_bazel_rules_kotlin")
34+
io_bazel_rules_kotlin()
3535
load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
3636
kotlin_repositories()
3737
load("@io_bazel_rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
3838
kt_register_toolchains()
3939

4040
# Load //common
41-
load("//common/java:artifacts.bzl", typedb_common_java_maven_artifacts = "maven_artifacts")
41+
load("//common/java:artifacts.bzl", typedb_common_maven_artifacts = "maven_artifacts")
4242

4343
load("//library/ortools/cc:deps.bzl", "google_or_tools_mac", "google_or_tools_linux", "google_or_tools_windows")
4444
google_or_tools_mac()
@@ -64,8 +64,8 @@ load("//tool/sonarcloud:deps.bzl", "sonarcloud_dependencies")
6464
sonarcloud_dependencies()
6565

6666
# Load //tool/swig
67-
load("//tool/swig:deps.bzl", swig_deps = "deps")
68-
swig_deps()
67+
load("//tool/swig:deps.bzl", "swig")
68+
swig()
6969

7070
###################################
7171
# Load @typedb_bazel_distribution #
@@ -82,14 +82,14 @@ load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
8282
rules_pkg_dependencies()
8383

8484
# Load @typedb_bazel_distribution_cloudsmith
85-
load("@typedb_bazel_distribution//common/uploader:deps.bzl", uploader_dpes = "deps")
86-
uploader_dpes()
87-
load("@typedb_bazel_distribution_uploader//:requirements.bzl", install_uploader_deps = "install_deps")
88-
install_uploader_deps()
85+
load("@typedb_bazel_distribution//common/uploader:deps.bzl", "typedb_bazel_distribution_uploader")
86+
typedb_bazel_distribution_uploader()
87+
load("@typedb_bazel_distribution_uploader//:requirements.bzl", uploader_install_deps = "install_deps")
88+
uploader_install_deps()
8989

9090
# Load Maven artifacts
9191
maven(
92-
typedb_common_java_maven_artifacts +
92+
typedb_common_maven_artifacts +
9393
common_tool_maven_artifacts
9494
)
9595

builder/java/deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_jar")
77

8-
def deps():
8+
def rules_jvm_external():
99
RULES_JVM_EXTERNAL_TAG = "5.3"
1010
RULES_JVM_EXTERNAL_SHA ="d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac"
1111

builder/kotlin/deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
66

7-
def deps():
7+
def io_bazel_rules_kotlin():
88
http_archive(
99
name = "io_bazel_rules_kotlin",
1010
sha256 = "5766f1e599acf551aa56f49dab9ab9108269b03c557496c54acaf41f98e2b8d6",

builder/python/deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
77

8-
def deps(use_patched_version=False):
8+
def rules_python(use_patched_version=False):
99
http_archive(
1010
name = "rules_python",
1111
sha256 = "c6fb25d0ba0246f6d5bd820dd0b2e66b339ccc510242fd4956b9a639b548d113",

distribution/deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ def typedb_bazel_distribution():
99
git_repository(
1010
name = "typedb_bazel_distribution",
1111
remote = "https://github.com/typedb/bazel-distribution",
12-
commit = "94c4f7b1dda39bf187f73c6ea035971c4c91528b", # sync-marker: do not remove this comment, this is used for sync-dependencies by @typedb_bazel_distribution
12+
commit = "f607a9ae3a90bab1c7a21c9a0d775894c1c07b8e", # sync-marker: do not remove this comment, this is used for sync-dependencies by @typedb_bazel_distribution
1313
)

tool/swig/deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
77

8-
def deps():
8+
def swig():
99
http_archive(
1010
name = "swig",
1111
urls = ["http://prdownloads.sourceforge.net/swig/swig-4.1.1.tar.gz"],

0 commit comments

Comments
 (0)