bump buildifier in bazelci and correct new lints (#1548)

also bump rules_cc to 0.1.2

Author: aaronsky

.bazelci/presubmit.yml

@@ -48,13 +48,13 @@ x_defaults:
       - "//tools/..."
 
 tasks:
-  macos_7:
-    name: "Previous LTS with no bzlmod"
-    bazel: 7.x
-    build_flags:
-      - "--noenable_bzlmod"
-      - "--enable_workspace"
-    <<: *mac_common
+  # macos_7:
+  #   name: "Previous LTS with no bzlmod"
+  #   bazel: 7.x
+  #   build_flags:
+  #     - "--noenable_bzlmod"
+  #     - "--enable_workspace"
+  #   <<: *mac_common
 
   macos_latest:
     name: "Current LTS"
@@ -75,17 +75,17 @@ tasks:
     - .bazelci/update_workspace_to_deps_heads.sh
     <<: *mac_common
 
-  ubuntu2004_7:
-    name: "Previous LTS with no bzlmod"
-    bazel: 7.x
-    shell_commands:
-      - "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
-      - "mkdir $SWIFT_HOME"
-      - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
-    build_flags:
-      - "--noenable_bzlmod"
-      - "--enable_workspace"
-    <<: *linux_common
+  # ubuntu2004_7:
+  #   name: "Previous LTS with no bzlmod"
+  #   bazel: 7.x
+  #   shell_commands:
+  #     - "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
+  #     - "mkdir $SWIFT_HOME"
+  #     - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
+  #   build_flags:
+  #     - "--noenable_bzlmod"
+  #     - "--enable_workspace"
+  #   <<: *linux_common
 
   ubuntu2004_latest:
     name: "Current LTS"
@@ -134,5 +134,4 @@ tasks:
     test_targets:
     - "doc/..."
 
-# TODO: Update to version 8+ and fix errors
-buildifier: 6.3.2
+buildifier: 8.2.1

MODULE.bazel

@@ -1,3 +1,5 @@
+"""rules_swift MODULE.bazel file"""
+
 module(
     name = "rules_swift",
     version = "0",
@@ -9,7 +11,7 @@ module(
 bazel_dep(name = "bazel_features", version = "1.10.0")
 bazel_dep(name = "bazel_skylib", version = "1.3.0")
 bazel_dep(name = "apple_support", version = "1.21.0", repo_name = "build_bazel_apple_support")
-bazel_dep(name = "rules_cc", version = "0.0.2")
+bazel_dep(name = "rules_cc", version = "0.1.2")
 bazel_dep(name = "rules_shell", version = "0.3.0")
 bazel_dep(name = "platforms", version = "0.0.9")
 bazel_dep(name = "protobuf", version = "23.1", repo_name = "com_google_protobuf")

examples/apple/objc_interop/BUILD

@@ -2,6 +2,7 @@
 # vice versa when it is linked into the existing native linking rules for Apple
 # platforms.
 
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
 load("//swift:swift_binary.bzl", "swift_binary")
 load("//swift:swift_library.bzl", "swift_library")
 

examples/apple/objc_interop_modulemap/BUILD

@@ -2,6 +2,7 @@
 # vice versa when it is linked into the existing native linking rules for Apple
 # platforms.
 
+load("@rules_cc//cc:objc_library.bzl", "objc_library")
 load("//swift:swift_binary.bzl", "swift_binary")
 load("//swift:swift_library.bzl", "swift_library")
 

examples/xplatform/c_from_swift/BUILD

@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//swift:swift_binary.bzl", "swift_binary")
 load("//swift:swift_interop_hint.bzl", "swift_interop_hint")
 load("//swift:swift_library.bzl", "swift_library")

examples/xplatform/cxx_from_swift/BUILD

@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("//swift:swift_binary.bzl", "swift_binary")
 load("//swift:swift_interop_hint.bzl", "swift_interop_hint")
 

examples/xplatform/overlay/BUILD

@@ -1,3 +1,4 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load(
     "//swift:swift_interop_hint.bzl",
     "swift_interop_hint",

mixed_language/BUILD

@@ -23,5 +23,6 @@ bzl_library(
         "//swift:swift_library",
         "//swift/internal:compiling",
         "@bazel_skylib//lib:paths",
+        "@rules_cc//cc:core_rules",
     ],
 )

mixed_language/internal/library.bzl

@@ -16,6 +16,8 @@
 
 load("@bazel_skylib//lib:dicts.bzl", "dicts")
 load("@bazel_skylib//lib:paths.bzl", "paths")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load(
     "//swift:providers.bzl",
     "SwiftInfo",

mixed_language/internal/umbrella_header.bzl

@@ -15,6 +15,8 @@
 """Implementation of the `mixed_language_umbrella_header` rule."""
 
 load("@bazel_skylib//lib:paths.bzl", "paths")
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
+load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 
 def _mixed_language_umbrella_header_impl(ctx):
     actions = ctx.actions