Make rules_cc a production dep (#215)
This is used in tools/file_concat which is part of proto_descriptor_set.
I think this worked before because it was implicitly imported by bazel
diff --git a/MODULE.bazel b/MODULE.bazel
index d69b785..18041df 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -7,13 +7,13 @@
compatibility_level = 1,
)
-bazel_dep(name = "rules_license", version = "0.0.7")
-bazel_dep(name = "bazel_skylib", version = "1.3.0")
bazel_dep(name = "bazel_features", version = "1.4.1")
+bazel_dep(name = "bazel_skylib", version = "1.3.0")
+bazel_dep(name = "rules_cc", version = "0.0.1")
+bazel_dep(name = "rules_license", version = "0.0.7")
# Dependencies needed in tests
bazel_dep(name = "stardoc", version = "0.5.6", dev_dependency = True, repo_name = "io_bazel_stardoc")
-bazel_dep(name = "rules_cc", version = "0.0.1", dev_dependency = True)
bazel_dep(name = "googletest", version = "1.11.0", dev_dependency = True, repo_name = "com_google_googletest")
bazel_dep(name = "protobuf", version = "23.1", dev_dependency = True, repo_name = "com_google_protobuf")
bazel_dep(name = "platforms", version = "0.0.8", dev_dependency = True)
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 5d86542..4356691 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -1,6 +1,6 @@
{
"lockFileVersion": 6,
- "moduleFileHash": "7a83abe22db793fb1612f5cf942cc29bce39f91dcc76ce2f4ecc60a2f5f8a1e0",
+ "moduleFileHash": "8030d0d64aa932006345f742e2697b0405eb54a97c03b04ec2321b8817fe17fe",
"flags": {
"cmdRegistries": [
"https://bcr.bazel.build/"
@@ -25,11 +25,11 @@
"toolchainsToRegister": [],
"extensionUsages": [],
"deps": {
- "rules_license": "rules_license@0.0.7",
- "bazel_skylib": "bazel_skylib@1.5.0",
"bazel_features": "bazel_features@1.4.1",
- "io_bazel_stardoc": "stardoc@0.5.6",
+ "bazel_skylib": "bazel_skylib@1.5.0",
"rules_cc": "rules_cc@0.0.9",
+ "rules_license": "rules_license@0.0.7",
+ "io_bazel_stardoc": "stardoc@0.5.6",
"com_google_googletest": "googletest@1.14.0",
"com_google_protobuf": "protobuf@23.1",
"platforms": "platforms@0.0.8",
@@ -37,62 +37,6 @@
"local_config_platform": "local_config_platform@_"
}
},
- "rules_license@0.0.7": {
- "name": "rules_license",
- "version": "0.0.7",
- "key": "rules_license@0.0.7",
- "repoName": "rules_license",
- "executionPlatformsToRegister": [],
- "toolchainsToRegister": [],
- "extensionUsages": [],
- "deps": {
- "bazel_tools": "bazel_tools@_",
- "local_config_platform": "local_config_platform@_"
- },
- "repoSpec": {
- "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
- "ruleClassName": "http_archive",
- "attributes": {
- "urls": [
- "https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz"
- ],
- "integrity": "sha256-RTHezLkTY5ww5cdRKgVNXYdWmNrrddjPkPKEN1/nw2A=",
- "strip_prefix": "",
- "remote_patches": {},
- "remote_patch_strip": 0
- }
- }
- },
- "bazel_skylib@1.5.0": {
- "name": "bazel_skylib",
- "version": "1.5.0",
- "key": "bazel_skylib@1.5.0",
- "repoName": "bazel_skylib",
- "executionPlatformsToRegister": [],
- "toolchainsToRegister": [
- "//toolchains/unittest:cmd_toolchain",
- "//toolchains/unittest:bash_toolchain"
- ],
- "extensionUsages": [],
- "deps": {
- "platforms": "platforms@0.0.8",
- "bazel_tools": "bazel_tools@_",
- "local_config_platform": "local_config_platform@_"
- },
- "repoSpec": {
- "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
- "ruleClassName": "http_archive",
- "attributes": {
- "urls": [
- "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz"
- ],
- "integrity": "sha256-zVWgYudjuTSZIfD124w5MyiNyLpPdt2UFqrGis7jy5Q=",
- "strip_prefix": "",
- "remote_patches": {},
- "remote_patch_strip": 0
- }
- }
- },
"bazel_features@1.4.1": {
"name": "bazel_features",
"version": "1.4.1",
@@ -141,18 +85,19 @@
}
}
},
- "stardoc@0.5.6": {
- "name": "stardoc",
- "version": "0.5.6",
- "key": "stardoc@0.5.6",
- "repoName": "stardoc",
+ "bazel_skylib@1.5.0": {
+ "name": "bazel_skylib",
+ "version": "1.5.0",
+ "key": "bazel_skylib@1.5.0",
+ "repoName": "bazel_skylib",
"executionPlatformsToRegister": [],
- "toolchainsToRegister": [],
+ "toolchainsToRegister": [
+ "//toolchains/unittest:cmd_toolchain",
+ "//toolchains/unittest:bash_toolchain"
+ ],
"extensionUsages": [],
"deps": {
- "bazel_skylib": "bazel_skylib@1.5.0",
- "rules_java": "rules_java@7.4.0",
- "rules_license": "rules_license@0.0.7",
+ "platforms": "platforms@0.0.8",
"bazel_tools": "bazel_tools@_",
"local_config_platform": "local_config_platform@_"
},
@@ -161,9 +106,9 @@
"ruleClassName": "http_archive",
"attributes": {
"urls": [
- "https://github.com/bazelbuild/stardoc/releases/download/0.5.6/stardoc-0.5.6.tar.gz"
+ "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz"
],
- "integrity": "sha256-37w2Sq7BQ99ebFL68fEWZ3WltECCQ/RF9EtmHP3DE08=",
+ "integrity": "sha256-zVWgYudjuTSZIfD124w5MyiNyLpPdt2UFqrGis7jy5Q=",
"strip_prefix": "",
"remote_patches": {},
"remote_patch_strip": 0
@@ -219,6 +164,61 @@
}
}
},
+ "rules_license@0.0.7": {
+ "name": "rules_license",
+ "version": "0.0.7",
+ "key": "rules_license@0.0.7",
+ "repoName": "rules_license",
+ "executionPlatformsToRegister": [],
+ "toolchainsToRegister": [],
+ "extensionUsages": [],
+ "deps": {
+ "bazel_tools": "bazel_tools@_",
+ "local_config_platform": "local_config_platform@_"
+ },
+ "repoSpec": {
+ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+ "ruleClassName": "http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz"
+ ],
+ "integrity": "sha256-RTHezLkTY5ww5cdRKgVNXYdWmNrrddjPkPKEN1/nw2A=",
+ "strip_prefix": "",
+ "remote_patches": {},
+ "remote_patch_strip": 0
+ }
+ }
+ },
+ "stardoc@0.5.6": {
+ "name": "stardoc",
+ "version": "0.5.6",
+ "key": "stardoc@0.5.6",
+ "repoName": "stardoc",
+ "executionPlatformsToRegister": [],
+ "toolchainsToRegister": [],
+ "extensionUsages": [],
+ "deps": {
+ "bazel_skylib": "bazel_skylib@1.5.0",
+ "rules_java": "rules_java@7.4.0",
+ "rules_license": "rules_license@0.0.7",
+ "bazel_tools": "bazel_tools@_",
+ "local_config_platform": "local_config_platform@_"
+ },
+ "repoSpec": {
+ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
+ "ruleClassName": "http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/bazelbuild/stardoc/releases/download/0.5.6/stardoc-0.5.6.tar.gz"
+ ],
+ "integrity": "sha256-37w2Sq7BQ99ebFL68fEWZ3WltECCQ/RF9EtmHP3DE08=",
+ "strip_prefix": "",
+ "remote_patches": {},
+ "remote_patch_strip": 0
+ }
+ }
+ },
"googletest@1.14.0": {
"name": "googletest",
"version": "1.14.0",
@@ -1222,7 +1222,7 @@
},
"@@protobuf~//:non_module_deps.bzl%non_module_deps": {
"general": {
- "bzlTransitiveDigest": "aGnO/HqVtCmRLEQWGCuKp7jwX+lCh/nc3/hI3clfwD8=",
+ "bzlTransitiveDigest": "Ru/iB33/Fg7l06H1hBzJ1lPAZip3abmjbwD8z/MzBig=",
"recordedFileInputs": {},
"recordedDirentsInputs": {},
"envVariables": {},
@@ -1250,7 +1250,7 @@
},
"@@rules_java~//java:extensions.bzl%toolchains": {
"general": {
- "bzlTransitiveDigest": "tJHbmWnq7m+9eUBnUdv7jZziQ26FmcGL9C5/hU3Q9UQ=",
+ "bzlTransitiveDigest": "0N5b5J9fUzo0sgvH4F3kIEaeXunz4Wy2/UtSFV/eXUY=",
"recordedFileInputs": {},
"recordedDirentsInputs": {},
"envVariables": {},
diff --git a/dev_deps.bzl b/dev_deps.bzl
index a9fb212..4e83bf7 100644
--- a/dev_deps.bzl
+++ b/dev_deps.bzl
@@ -28,16 +28,6 @@
)
http_archive(
- name = "rules_cc",
- sha256 = "4aeb102efbcfad509857d7cb9c5456731e8ce566bfbf2960286a2ec236796cc3",
- strip_prefix = "rules_cc-2f8c04c04462ab83c545ab14c0da68c3b4c96191",
- urls = [
- "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/2f8c04c04462ab83c545ab14c0da68c3b4c96191.tar.gz",
- "https://github.com/bazelbuild/rules_cc/archive/2f8c04c04462ab83c545ab14c0da68c3b4c96191.tar.gz",
- ],
- )
-
- http_archive(
name = "com_google_googletest",
sha256 = "81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2",
strip_prefix = "googletest-release-1.12.1",
diff --git a/proto/repositories.bzl b/proto/repositories.bzl
index c3abc55..ea1512b 100644
--- a/proto/repositories.bzl
+++ b/proto/repositories.bzl
@@ -47,3 +47,14 @@
strip_prefix = "bazel_features-1.4.1",
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.4.1/bazel_features-v1.4.1.tar.gz",
)
+
+ maybe(
+ http_archive,
+ name = "rules_cc",
+ sha256 = "4aeb102efbcfad509857d7cb9c5456731e8ce566bfbf2960286a2ec236796cc3",
+ strip_prefix = "rules_cc-2f8c04c04462ab83c545ab14c0da68c3b4c96191",
+ urls = [
+ "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/2f8c04c04462ab83c545ab14c0da68c3b4c96191.tar.gz",
+ "https://github.com/bazelbuild/rules_cc/archive/2f8c04c04462ab83c545ab14c0da68c3b4c96191.tar.gz",
+ ],
+ )
