From 29fe09ef84d8258180e5421d55a93c16fd9baee8 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Thu, 19 Sep 2024 11:28:19 +0200 Subject: [PATCH] Stop using repo_name Now that support for WORKSPACE has been removed, we can refer to modules using the original names. --- MODULE.bazel | 3 +-- docs/jsonnet.md | 8 ++++---- jsonnet/BUILD | 2 +- jsonnet/extensions.bzl | 2 +- jsonnet/jsonnet.bzl | 8 ++++---- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 0d00765..1fed26d 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,12 +1,11 @@ module( name = "rules_jsonnet", version = "0.6.0", - repo_name = "io_bazel_rules_jsonnet", ) bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "jsonnet", version = "0.20.0") -bazel_dep(name = "jsonnet_go", version = "0.20.0", repo_name = "google_jsonnet_go") +bazel_dep(name = "jsonnet_go", version = "0.20.0") bazel_dep(name = "rules_rust", version = "0.50.1") jsonnet = use_extension("//jsonnet:extensions.bzl", "jsonnet") diff --git a/docs/jsonnet.md b/docs/jsonnet.md index 3b6acb4..40a9e27 100644 --- a/docs/jsonnet.md +++ b/docs/jsonnet.md @@ -41,7 +41,7 @@ Example: `configs/BUILD`: ```python - load("@io_bazel_rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library") + load("@rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library") jsonnet_library( name = "configs", @@ -104,7 +104,7 @@ Example: `workflows/BUILD`: ```python - load("@io_bazel_rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library") + load("@rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library") jsonnet_library( name = "workflow", @@ -260,7 +260,7 @@ Example: ```python load( - "@io_bazel_rules_jsonnet//jsonnet:jsonnet.bzl", + "@rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library", "jsonnet_to_json_test", ) @@ -308,7 +308,7 @@ Example: ```python load( - "@io_bazel_rules_jsonnet//jsonnet:jsonnet.bzl", + "@rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library", "jsonnet_to_json_test", ) diff --git a/jsonnet/BUILD b/jsonnet/BUILD index f45f57d..1d0f406 100644 --- a/jsonnet/BUILD +++ b/jsonnet/BUILD @@ -41,7 +41,7 @@ jsonnet_toolchain( jsonnet_toolchain( name = "go_jsonnet", - compiler = "@google_jsonnet_go//cmd/jsonnet", + compiler = "@jsonnet_go//cmd/jsonnet", create_directory_flags = ["-c"], manifest_file_support = True, ) diff --git a/jsonnet/extensions.bzl b/jsonnet/extensions.bzl index 2cb7a1f..8273289 100644 --- a/jsonnet/extensions.bzl +++ b/jsonnet/extensions.bzl @@ -54,7 +54,7 @@ def _jsonnet_toolchain_repo_impl(ctx): content = """ alias( name = "toolchain", - actual = "@io_bazel_rules_jsonnet//jsonnet:%s_jsonnet_toolchain", + actual = "@rules_jsonnet//jsonnet:%s_jsonnet_toolchain", ) """ % ctx.attr.compiler, executable = False, diff --git a/jsonnet/jsonnet.bzl b/jsonnet/jsonnet.bzl index 299204e..b9e0ec0 100644 --- a/jsonnet/jsonnet.bzl +++ b/jsonnet/jsonnet.bzl @@ -511,7 +511,7 @@ Example: `configs/BUILD`: ```python - load("@io_bazel_rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library") + load("@rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library") jsonnet_library( name = "configs", @@ -662,7 +662,7 @@ Example: `workflows/BUILD`: ```python - load("@io_bazel_rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library") + load("@rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library") jsonnet_library( name = "workflow", @@ -802,7 +802,7 @@ Example: ```python load( - "@io_bazel_rules_jsonnet//jsonnet:jsonnet.bzl", + "@rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library", "jsonnet_to_json_test", ) @@ -850,7 +850,7 @@ Example: ```python load( - "@io_bazel_rules_jsonnet//jsonnet:jsonnet.bzl", + "@rules_jsonnet//jsonnet:jsonnet.bzl", "jsonnet_library", "jsonnet_to_json_test", )