Merge pull request #16229 from github/criemen/rules-pkg

criemen · web-flow · commit 4cb0695646a9 · 2024-04-16T18:03:00.000+02:00
Upgrade rules_pkg to 0.10.1.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -14,7 +14,7 @@ local_path_override(
 # see https://registry.bazel.build/ for a list of available packages
 
 bazel_dep(name = "platforms", version = "0.0.8")
-bazel_dep(name = "rules_pkg", version = "0.9.1")
+bazel_dep(name = "rules_pkg", version = "0.10.1")
 bazel_dep(name = "rules_nodejs", version = "6.0.3")
 bazel_dep(name = "rules_python", version = "0.31.0")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
diff --git a/cpp/BUILD.bazel b/cpp/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_filegroup")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/cpp/downgrades/BUILD.bazel b/cpp/downgrades/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 
 pkg_files(
     name = "downgrades",
diff --git a/cpp/ql/lib/BUILD.bazel b/cpp/ql/lib/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 
 package(default_visibility = ["//cpp:__pkg__"])
 
diff --git a/csharp/ql/lib/BUILD.bazel b/csharp/ql/lib/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 
 package(default_visibility = ["//csharp:__pkg__"])
 
diff --git a/java/ql/lib/config/BUILD.bazel b/java/ql/lib/config/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 
 package(default_visibility = ["//java:__pkg__"])
 
diff --git a/javascript/ql/lib/BUILD.bazel b/javascript/ql/lib/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 
 package(default_visibility = ["//javascript:__pkg__"])
 
diff --git a/misc/bazel/pkg_runfiles.bzl b/misc/bazel/pkg_runfiles.bzl
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_attributes", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_files")
 
 def _runfiles_group_impl(ctx):
     files = []
diff --git a/misc/bazel/workspace_deps.bzl b/misc/bazel/workspace_deps.bzl
@@ -1,6 +1,6 @@
-load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
-load("@rules_python//python:pip.bzl", "pip_install")
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+load("@rules_pkg//pkg:deps.bzl", "rules_pkg_dependencies")
+load("@rules_python//python:pip.bzl", "pip_install")
 
 def codeql_workspace_deps(repository_name = "codeql"):
     pip_install(
diff --git a/python/downgrades/BUILD.bazel b/python/downgrades/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 
 pkg_files(
     name = "downgrades",
diff --git a/python/ql/lib/BUILD.bazel b/python/ql/lib/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 
 package(default_visibility = ["//python:__pkg__"])
 
diff --git a/ruby/downgrades/BUILD.bazel b/ruby/downgrades/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 
 pkg_files(
     name = "downgrades",
diff --git a/ruby/ql/lib/BUILD.bazel b/ruby/ql/lib/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 
 package(default_visibility = ["//ruby:__pkg__"])
 
diff --git a/swift/BUILD.bazel b/swift/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@rules_pkg//:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
-load("@rules_pkg//:install.bzl", "pkg_install")
+load("@rules_pkg//pkg:install.bzl", "pkg_install")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
 load("//:defs.bzl", "codeql_platform")
 load("//misc/bazel:pkg_runfiles.bzl", "pkg_runfiles")
 load("//misc/bazel/cmake:cmake.bzl", "generate_cmake")
diff --git a/swift/downgrades/BUILD.bazel b/swift/downgrades/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 
 pkg_files(
     name = "downgrades",
diff --git a/swift/third_party/BUILD.swift-toolchain-linux.bazel b/swift/third_party/BUILD.swift-toolchain-linux.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_filegroup", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files")
 
 _strip_prefix = "usr/lib/swift"
 
diff --git a/swift/third_party/BUILD.swift-toolchain-macos.bazel b/swift/third_party/BUILD.swift-toolchain-macos.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 
 _strip_prefix = "usr/lib/swift"
 
diff --git a/swift/tools/BUILD.bazel b/swift/tools/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_pkg//:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files")
 
 sh_binary(
     name = "qltest",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load("@rules_pkg//:mappings.bzl", "pkg_filegroup")`
	`1`	`+load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup")`
`2`	`2`
`3`	`3`	`package(default_visibility = ["//visibility:public"])`
`4`	`4`