Update bazel-distribution to the latest with new workspace name @type…

…db_bazel_distribution

WORKSPACE

@@ -64,12 +64,12 @@ sonarcloud_dependencies()
 load("//tool/swig:deps.bzl", swig_deps = "deps")
 swig_deps()
 
-# Load @vaticle_bazel_distribution
-load("//distribution:deps.bzl", "vaticle_bazel_distribution")
-vaticle_bazel_distribution()
+# Load @typedb_bazel_distribution
+load("//distribution:deps.bzl", "typedb_bazel_distribution")
+typedb_bazel_distribution()
 
-# Load //@vaticle_bazel_distribution//common
-load("@vaticle_bazel_distribution//common:deps.bzl", "rules_pkg")
+# Load //@typedb_bazel_distribution//common
+load("@typedb_bazel_distribution//common:deps.bzl", "rules_pkg")
 rules_pkg()
 load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
 rules_pkg_dependencies()
@@ -90,5 +90,5 @@ crate_repositories()
 # Create @vaticle_typedb_workspace_refs #
 ###############################################
 
-load("@vaticle_bazel_distribution//common:rules.bzl", "workspace_refs")
+load("@typedb_bazel_distribution//common:rules.bzl", "workspace_refs")
 workspace_refs(name = "typedb_dependencies_workspace_refs")

builder/java/rules.bzl

@@ -111,11 +111,11 @@ def host_compatible_java_test(name, deps = [], native_libraries_deps = [], **kwa
 def native_dep_for_host_platform(name):
     name = _expand_label(name)
     return select({
-         "@vaticle_bazel_distribution//platform:is_linux_arm64": [name + "-linux-arm64"],
-         "@vaticle_bazel_distribution//platform:is_linux_x86_64": [name + "-linux-x86_64"],
-         "@vaticle_bazel_distribution//platform:is_mac_arm64": [name + "-mac-arm64"],
-         "@vaticle_bazel_distribution//platform:is_mac_x86_64": [name + "-mac-x86_64"],
-         "@vaticle_bazel_distribution//platform:is_windows": [name + "-windows"],
+         "@typedb_bazel_distribution//platform:is_linux_arm64": [name + "-linux-arm64"],
+         "@typedb_bazel_distribution//platform:is_linux_x86_64": [name + "-linux-x86_64"],
+         "@typedb_bazel_distribution//platform:is_mac_arm64": [name + "-mac-arm64"],
+         "@typedb_bazel_distribution//platform:is_mac_x86_64": [name + "-mac-x86_64"],
+         "@typedb_bazel_distribution//platform:is_windows": [name + "-windows"],
          "//conditions:default": ["INVALID"],
      })
 

builder/rust/cargo/BUILD

@@ -21,9 +21,9 @@ kt_jvm_library(
         "ManifestWriter.kt",
     ],
     deps = [
-        "@vaticle_bazel_distribution//common",
-        "@vaticle_bazel_distribution//common/shell",
-        "@vaticle_bazel_distribution//common/util",
+        "@typedb_bazel_distribution//common",
+        "@typedb_bazel_distribution//common/shell",
+        "@typedb_bazel_distribution//common/util",
 
         "@maven//:com_electronwill_night_config_core",
         "@maven//:com_electronwill_night_config_toml",

builder/rust/cargo/project_aspect.bzl

@@ -170,7 +170,7 @@ def _copy_to_bin(ctx, src, dst):
     )
 
 def _should_generate_cargo_project(ctx, target):
-    return (str(target.label).startswith("@vaticle") or str(target.label).startswith("//")
+    return (str(target.label).startswith("@typedb") or str(target.label).startswith("//")
         or str(target.label).startswith("@//")) and \
         ctx.rule.kind in _TARGET_TYPES and _TARGET_TYPES[ctx.rule.kind] in ["bin", "lib", "test"]
 

builder/rust/rules.bzl

@@ -24,9 +24,9 @@ def rust_cxx_bridge(name, src, deps = []):
             "$(location %s.cc)" % src,
         ],
         tool = select({
-            "@vaticle_bazel_distribution//platform:is_mac": "@cxxbridge_mac//file",
-            "@vaticle_bazel_distribution//platform:is_linux": "@cxxbridge_linux//file",
-            "@vaticle_bazel_distribution//platform:is_windows": "@cxxbridge_windows//file",
+            "@typedb_bazel_distribution//platform:is_mac": "@cxxbridge_mac//file",
+            "@typedb_bazel_distribution//platform:is_linux": "@cxxbridge_linux//file",
+            "@typedb_bazel_distribution//platform:is_windows": "@cxxbridge_windows//file",
 #            "//conditions:default": [name + "-mac"],
         }),
     )

builder/swig/csharp.bzl

@@ -173,7 +173,7 @@ def swig_csharp(name, native_lib_name, lib, namespace, nullable_context, target_
             linkshared = True,
             linkopts = select({
                 # TODO: move http certificate/encryption libraries into arguments
-                "@vaticle_bazel_distribution//platform:is_windows": ["ntdll.lib", "secur32.lib", "crypt32.lib", "ncrypt.lib"],
+                "@typedb_bazel_distribution//platform:is_windows": ["ntdll.lib", "secur32.lib", "crypt32.lib", "ncrypt.lib"],
                 "//conditions:default": [],
             }),
         )
@@ -185,9 +185,9 @@ def swig_csharp(name, native_lib_name, lib, namespace, nullable_context, target_
     native.alias(
         name = native_lib_name,
         actual = select({
-            "@vaticle_bazel_distribution//platform:is_mac": ("lib" + native_lib_name + ".dylib"),
-            "@vaticle_bazel_distribution//platform:is_linux": ("lib" + native_lib_name + ".so"),
-            "@vaticle_bazel_distribution//platform:is_windows": (native_lib_name + ".dll"),
+            "@typedb_bazel_distribution//platform:is_mac": ("lib" + native_lib_name + ".dylib"),
+            "@typedb_bazel_distribution//platform:is_linux": ("lib" + native_lib_name + ".so"),
+            "@typedb_bazel_distribution//platform:is_windows": (native_lib_name + ".dll"),
         })
     )
 

builder/swig/go.bzl

@@ -145,8 +145,8 @@ def swig_go(name, lib, package_name, shared_lib_name=None, tags=[], **kwargs):
             srcs = [swig_wrapper_name],
             linkshared = True,
             linkopts = select({
-                    "@vaticle_bazel_distribution//platform:is_windows": ["ntdll.lib", "secur32.lib", "crypt32.lib", "ncrypt.lib"],
-                    "@vaticle_bazel_distribution//platform:is_mac": ["-framework CoreFoundation", "-install_name go/{filename}".format(filename=shared_lib_filename)],
+                    "@typedb_bazel_distribution//platform:is_windows": ["ntdll.lib", "secur32.lib", "crypt32.lib", "ncrypt.lib"],
+                    "@typedb_bazel_distribution//platform:is_mac": ["-framework CoreFoundation", "-install_name go/{filename}".format(filename=shared_lib_filename)],
                     "//conditions:default": [],
                 }),
         )
@@ -158,9 +158,9 @@ def swig_go(name, lib, package_name, shared_lib_name=None, tags=[], **kwargs):
     native.alias(
         name = "lib" + shared_lib_name,
         actual = select({
-            "@vaticle_bazel_distribution//platform:is_mac": ("lib" + shared_lib_name + ".dylib"),
-            "@vaticle_bazel_distribution//platform:is_linux": ("lib" + shared_lib_name + ".so"),
-            "@vaticle_bazel_distribution//platform:is_windows": (shared_lib_name + ".dll"),
+            "@typedb_bazel_distribution//platform:is_mac": ("lib" + shared_lib_name + ".dylib"),
+            "@typedb_bazel_distribution//platform:is_linux": ("lib" + shared_lib_name + ".so"),
+            "@typedb_bazel_distribution//platform:is_windows": (shared_lib_name + ".dll"),
         })
     )
 

builder/swig/java.bzl

@@ -152,9 +152,9 @@ def swig_java_wrapper(**kwargs):
     # cf. https://github.com/bazelbuild/bazel/issues/287
     _swig_java_wrapper(
         jni_md_header = select({
-            "@vaticle_bazel_distribution//platform:is_mac": Label("@bazel_tools//tools/jdk:jni_md_header-darwin"),
-            "@vaticle_bazel_distribution//platform:is_linux": Label("@bazel_tools//tools/jdk:jni_md_header-linux"),
-            "@vaticle_bazel_distribution//platform:is_windows": Label("@bazel_tools//tools/jdk:jni_md_header-windows"),
+            "@typedb_bazel_distribution//platform:is_mac": Label("@bazel_tools//tools/jdk:jni_md_header-darwin"),
+            "@typedb_bazel_distribution//platform:is_linux": Label("@bazel_tools//tools/jdk:jni_md_header-linux"),
+            "@typedb_bazel_distribution//platform:is_windows": Label("@bazel_tools//tools/jdk:jni_md_header-windows"),
         }),
         **kwargs,
     )
@@ -181,7 +181,7 @@ def swig_java(name, lib, shared_lib_name=None, tags=[], **kwargs):
             linkshared = True,
             linkopts = select({
                 # TODO: move http certificate/encryption libraries into arguments
-                "@vaticle_bazel_distribution//platform:is_windows": ["ntdll.lib", "secur32.lib", "crypt32.lib", "ncrypt.lib"],
+                "@typedb_bazel_distribution//platform:is_windows": ["ntdll.lib", "secur32.lib", "crypt32.lib", "ncrypt.lib"],
                 "//conditions:default": [],
             }),
         )
@@ -193,9 +193,9 @@ def swig_java(name, lib, shared_lib_name=None, tags=[], **kwargs):
     native.alias(
         name = "lib" + shared_lib_name,
         actual = select({
-            "@vaticle_bazel_distribution//platform:is_mac": ("lib" + shared_lib_name + ".dylib"),
-            "@vaticle_bazel_distribution//platform:is_linux": ("lib" + shared_lib_name + ".so"),
-            "@vaticle_bazel_distribution//platform:is_windows": (shared_lib_name + ".dll"),
+            "@typedb_bazel_distribution//platform:is_mac": ("lib" + shared_lib_name + ".dylib"),
+            "@typedb_bazel_distribution//platform:is_linux": ("lib" + shared_lib_name + ".so"),
+            "@typedb_bazel_distribution//platform:is_windows": (shared_lib_name + ".dll"),
         })
     )
 

builder/swig/python.bzl

@@ -136,9 +136,9 @@ def swig_python(*, name, lib, shared_lib_name=None, import_name=None, python_hea
         lib = lib,
         python_headers = python_headers,
         libpython = select({
-            "@vaticle_bazel_distribution//platform:is_linux": libpython,
-            "@vaticle_bazel_distribution//platform:is_mac": None,
-            "@vaticle_bazel_distribution//platform:is_windows": libpython,
+            "@typedb_bazel_distribution//platform:is_linux": libpython,
+            "@typedb_bazel_distribution//platform:is_mac": None,
+            "@typedb_bazel_distribution//platform:is_windows": libpython,
         }),
         **kwargs,
     )
@@ -150,11 +150,11 @@ def swig_python(*, name, lib, shared_lib_name=None, import_name=None, python_hea
         linkshared = True,
         linkopts = select({
             # TODO: move http certificate/encryption libraries into arguments
-            "@vaticle_bazel_distribution//platform:is_windows": ["ntdll.lib", "secur32.lib", "crypt32.lib", "ncrypt.lib"],
+            "@typedb_bazel_distribution//platform:is_windows": ["ntdll.lib", "secur32.lib", "crypt32.lib", "ncrypt.lib"],
             "//conditions:default": [],
         }),
         copts = select({
-            "@vaticle_bazel_distribution//platform:is_mac": ["-undefined", "dynamic_lookup"],
+            "@typedb_bazel_distribution//platform:is_mac": ["-undefined", "dynamic_lookup"],
             "//conditions:default": [],
         }),
     )
@@ -191,7 +191,7 @@ def py_native_lib_rename(name, out, src, visibility, **kwargs):
     _py_native_lib_rename_wrapper(
         name = name,
         out = select({
-            "@vaticle_bazel_distribution//platform:is_windows": out + ".pyd",
+            "@typedb_bazel_distribution//platform:is_windows": out + ".pyd",
             "//conditions:default": out + ".so",
         }),
         src = src,

distribution/artifact/rules.bzl

@@ -3,7 +3,7 @@
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 
-load("@vaticle_bazel_distribution//artifact:rules.bzl", "artifact_file")
+load("@typedb_bazel_distribution//artifact:rules.bzl", "artifact_file")
 
 platform_extension = {
     "linux-arm64": "tar.gz",

distribution/deps.bzl

@@ -5,9 +5,9 @@
 
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
-def vaticle_bazel_distribution():
+def typedb_bazel_distribution():
     git_repository(
-        name = "vaticle_bazel_distribution",
+        name = "typedb_bazel_distribution",
         remote = "https://github.com/typedb/bazel-distribution",
-        commit = "6874e2aac53ba541fc944916dfa5b8f938f33af8", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_bazel_distribution
+        commit = "94c4f7b1dda39bf187f73c6ea035971c4c91528b", # sync-marker: do not remove this comment, this is used for sync-dependencies by @typedb_bazel_distribution
     )

library/ortools/deps.bzl

@@ -4,15 +4,15 @@
 
 
 google_or_tools = select({
-         "@vaticle_bazel_distribution//platform:is_mac": [
+         "@typedb_bazel_distribution//platform:is_mac": [
              "@maven//:com_google_ortools_ortools_darwin",
              "@maven//:com_google_ortools_ortools_darwin_java",
          ],
-         "@vaticle_bazel_distribution//platform:is_linux": [
+         "@typedb_bazel_distribution//platform:is_linux": [
              "@maven//:com_google_ortools_ortools_linux_x86_64",
              "@maven//:com_google_ortools_ortools_linux_x86_64_java"
          ],
-         "@vaticle_bazel_distribution//platform:is_windows": [
+         "@typedb_bazel_distribution//platform:is_windows": [
              "@maven//:com_google_ortools_ortools_win32_x86_64",
              "@maven//:com_google_ortools_ortools_win32_x86_64_java"
          ],

library/ortools/rust/BUILD

@@ -21,15 +21,15 @@ rust_cxx_bridge(
     name = "ortools_bridge",
     src = "ortools.rs",
     deps = select({
-        "@vaticle_bazel_distribution//platform:is_mac": [
+        "@typedb_bazel_distribution//platform:is_mac": [
             "@or_tools_mac//:lib",
             "@or_tools_mac//:incl",
         ],
-        "@vaticle_bazel_distribution//platform:is_linux": [
+        "@typedb_bazel_distribution//platform:is_linux": [
             "@or_tools_linux//:lib",
             "@or_tools_linux//:incl",
         ],
-        "@vaticle_bazel_distribution//platform:is_windows": [
+        "@typedb_bazel_distribution//platform:is_windows": [
             "@or_tools_windows//:lib",
             "@or_tools_windows//:incl",
         ],
@@ -40,15 +40,15 @@ cc_library(
     name = "ortools_bridge_wrapper",
     hdrs = ["OrToolsWrapper.h"],
     deps = select({
-        "@vaticle_bazel_distribution//platform:is_mac": [
+        "@typedb_bazel_distribution//platform:is_mac": [
             "@or_tools_mac//:lib",
             "@or_tools_mac//:incl",
         ],
-        "@vaticle_bazel_distribution//platform:is_linux": [
+        "@typedb_bazel_distribution//platform:is_linux": [
             "@or_tools_linux//:lib",
             "@or_tools_linux//:incl",
         ],
-        "@vaticle_bazel_distribution//platform:is_windows": [
+        "@typedb_bazel_distribution//platform:is_windows": [
             "@or_tools_windows//:lib",
             "@or_tools_windows//:incl",
         ],

tool/github/BUILD

@@ -10,8 +10,8 @@ kt_jvm_library(
     srcs = glob(["*.kt"]),
     data = glob(["template/**/*"]),
     deps = [
-        "@vaticle_bazel_distribution//common",
-        "@vaticle_bazel_distribution//common/shell",
+        "@typedb_bazel_distribution//common",
+        "@typedb_bazel_distribution//common/shell",
         "@maven//:org_zeroturnaround_zt_exec",
         "@maven//:commons_io_commons_io",
         "@maven//:info_picocli_picocli",

tool/ide/BUILD

@@ -21,9 +21,9 @@ kt_jvm_library(
         "RustManifestSyncer.kt",
     ],
     deps = [
-        "@vaticle_bazel_distribution//common",
-        "@vaticle_bazel_distribution//common/shell",
-        "@vaticle_bazel_distribution//common/util",
+        "@typedb_bazel_distribution//common",
+        "@typedb_bazel_distribution//common/shell",
+        "@typedb_bazel_distribution//common/util",
 
         "@maven//:com_electronwill_night_config_core",
         "@maven//:com_electronwill_night_config_toml",

tool/ide/RustManifestSyncer.kt

@@ -8,11 +8,11 @@ package com.vaticle.dependencies.tool.ide
 
 import com.electronwill.nightconfig.core.Config
 import com.electronwill.nightconfig.toml.TomlWriter
-import com.vaticle.bazel.distribution.common.Logging.LogLevel.DEBUG
-import com.vaticle.bazel.distribution.common.Logging.LogLevel.ERROR
-import com.vaticle.bazel.distribution.common.Logging.Logger
-import com.vaticle.bazel.distribution.common.shell.Shell
-import com.vaticle.bazel.distribution.common.util.FileUtil.listFilesRecursively
+import com.typedb.bazel.distribution.common.Logging.LogLevel.DEBUG
+import com.typedb.bazel.distribution.common.Logging.LogLevel.ERROR
+import com.typedb.bazel.distribution.common.Logging.Logger
+import com.typedb.bazel.distribution.common.shell.Shell
+import com.typedb.bazel.distribution.common.util.FileUtil.listFilesRecursively
 import com.vaticle.dependencies.tool.ide.RustManifestSyncer.ShellArgs.ASPECTS
 import com.vaticle.dependencies.tool.ide.RustManifestSyncer.ShellArgs.BAZEL
 import com.vaticle.dependencies.tool.ide.RustManifestSyncer.ShellArgs.BAZEL_BIN

tool/ide/test/BUILD

@@ -8,7 +8,7 @@ load("@typedb_dependencies//tool/checkstyle:rules.bzl", "checkstyle_test")
 rust_library(
     name = "test-lib",
     srcs = ["lib.rs"],
-    deps = ["@vaticle_extern//:a"],
+    deps = ["@typedb_extern//:a"],
 )
 
 checkstyle_test(

tool/ide/test/WORKSPACE

@@ -38,11 +38,11 @@ load("@typedb_dependencies//tool/checkstyle:deps.bzl", checkstyle_deps = "deps")
 checkstyle_deps()
 
 ####################################
-# Load @vaticle_bazel_distribution #
+# Load @typedb_bazel_distribution #
 ####################################
 
-load("@typedb_dependencies//distribution:deps.bzl", "vaticle_bazel_distribution")
-vaticle_bazel_distribution()
+load("@typedb_dependencies//distribution:deps.bzl", "typedb_bazel_distribution")
+typedb_bazel_distribution()
 
 ###############
 # Load @maven #
@@ -55,6 +55,6 @@ load("@typedb_dependencies//library/maven:rules.bzl", "maven")
 maven(typedb_dependencies_tool_maven_artifacts)
 
 local_repository(
-    name = "vaticle_extern", # we filter external crates by `@vaticle_`!
+    name = "typedb_extern", # we filter external crates by `@typedb_`!
     path = "extern",
 )

tool/ide/test/lib1/BUILD

@@ -9,7 +9,7 @@ load("@typedb_dependencies//tool/checkstyle:rules.bzl", "checkstyle_test")
 rust_library(
     name = "lib1",
     srcs = ["lib.rs"],
-    deps = ["@vaticle_extern//:a", "//lib2:lib2"],
+    deps = ["@typedb_extern//:a", "//lib2:lib2"],
 )
 
 rust_test(

tool/ide/test/lib2/tests/BUILD

@@ -9,7 +9,7 @@ load("@typedb_dependencies//tool/checkstyle:rules.bzl", "checkstyle_test")
 rust_test(
     name = "lib2_integration_test",
     srcs = ["test.rs"],
-    deps = ["//lib2:lib2", "@vaticle_extern//:b"],
+    deps = ["//lib2:lib2", "@typedb_extern//:b"],
 )
 
 checkstyle_test(

tool/release/version/BUILD

@@ -13,7 +13,7 @@ kt_jvm_binary(
     srcs = ["Bump.kt"],
     main_class = "com.vaticle.dependencies.tool.release.version.Bump",
     deps = [
-        "@vaticle_bazel_distribution//common",
+        "@typedb_bazel_distribution//common",
         "@maven//:commons_io_commons_io",
         "@maven//:info_picocli_picocli",
         "@maven//:org_zeroturnaround_zt_exec",

tool/release/version/Bump.kt

@@ -7,8 +7,8 @@
 package com.vaticle.dependencies.tool.release.version
 
 import com.fasterxml.jackson.core.JsonPointer
-import com.vaticle.bazel.distribution.common.Logging.LogLevel.DEBUG
-import com.vaticle.bazel.distribution.common.Logging.Logger
+import com.typedb.bazel.distribution.common.Logging.LogLevel.DEBUG
+import com.typedb.bazel.distribution.common.Logging.Logger
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths

tool/sonarcloud/BUILD

@@ -11,8 +11,8 @@ py_binary(
     srcs = ["code-analysis.py"],
     main = "code-analysis.py",
     data = select({
-        "@vaticle_bazel_distribution//platform:is_linux" : [ "@sonarscanner_linux_zip//file" ],
-        "@vaticle_bazel_distribution//platform:is_mac" : [ "@sonarscanner_mac_zip//file" ],
+        "@typedb_bazel_distribution//platform:is_linux" : [ "@sonarscanner_linux_zip//file" ],
+        "@typedb_bazel_distribution//platform:is_mac" : [ "@sonarscanner_mac_zip//file" ],
         "//conditions:default" : [ "@sonarscanner_zip//file" ]
     })
 )