.bazelrc

@@ -11,7 +11,7 @@ build:macos --host_crosstool_top=@local_config_apple_cc//:toolchain
 build --macos_minimum_os=13.5 --host_macos_minimum_os=13.5
 build --disk_cache=~/.bazel_cache
 build --experimental_remote_cache_compression
-build --experimental_remote_build_event_upload=minimal
+build --remote_build_event_upload=minimal
 build --nolegacy_important_outputs
 build --swiftcopt=-warnings-as-errors
 

.bazelversion

@@ -1 +1 @@
-6.4.0
+7.0.0

.buildkite/pipeline.yml

@@ -20,7 +20,7 @@ steps:
   - label: "Danger"
     commands:
       - echo "--- Install Bundler"
-      - gem install bundler
+      - gem install bundler -v 2.4.22
       - echo "--- Bundle Install"
       - bundle install
       - echo "+++ Run Danger"

.gitignore

@@ -65,3 +65,4 @@ bundle/
 
 # Bazel
 bazel-*
+/MODULE.bazel.lock

.sourcery/GeneratedTests.stencil

@@ -1,5 +1,4 @@
 @testable import SwiftLintBuiltInRules
-@_spi(TestHelper)
 @testable import SwiftLintCore
 import SwiftLintTestHelpers
 
@@ -8,7 +7,7 @@ import SwiftLintTestHelpers
 
 {% for rule in types.structs %}
 {% if rule.name|hasSuffix:"Rule" %}
-class {{ rule.name }}GeneratedTests: SwiftLintTestCase {
+final class {{ rule.name }}GeneratedTests: SwiftLintTestCase {
     func testWithDefaultConfiguration() {
         verifyRule({{ rule.name }}.description)
     }

.swiftlint.yml

@@ -1,9 +1,12 @@
+# Directory and file filters
 included:
   - Plugins
   - Source
   - Tests
 excluded:
   - Tests/SwiftLintFrameworkTests/Resources
+
+# Enabled/disabled rules
 analyzer_rules:
   - unused_declaration
   - unused_import
@@ -24,7 +27,6 @@ disabled_rules:
   - force_unwrapping
   - function_default_parameter_at_end
   - implicit_return
-  - implicitly_unwrapped_optional
   - indentation_width
   - inert_defer
   - missing_docs
@@ -35,54 +37,60 @@ disabled_rules:
   - multiline_parameters
   - multiline_parameters_brackets
   - no_extension_access_modifier
-  - no_fallthrough_only
   - no_grouping_extension
   - no_magic_numbers
+  - one_declaration_per_file
   - prefer_nimble
   - prefer_self_in_static_references
   - prefixed_toplevel_constant
-  - redundant_self_in_closure
   - required_deinit
-  - self_binding
   - sorted_enum_cases
   - strict_fileprivate
-  - superfluous_else
   - switch_case_on_newline
   - todo
   - trailing_closure
   - type_contents_order
   - unused_capture_list
   - vertical_whitespace_between_cases
 
+# Configurations
 attributes:
   always_on_line_above:
     - "@ConfigurationElement"
     - "@OptionGroup"
     - "@RuleConfigurationDescriptionBuilder"
-identifier_name:
-  excluded:
-    - id
-large_tuple: 3
-number_separator:
-  minimum_length: 5
+balanced_xctest_lifecycle: &unit_test_configuration
+  test_parent_classes:
+    - SwiftLintTestCase
+    - XCTestCase
+empty_xctest_method: *unit_test_configuration
 file_name:
   excluded:
     - Exports.swift
     - GeneratedTests.swift
     - RuleConfigurationMacros.swift
     - SwiftSyntax+SwiftLint.swift
     - TestHelpers.swift
-
-balanced_xctest_lifecycle: &unit_test_configuration
-  test_parent_classes:
-    - SwiftLintTestCase
-    - XCTestCase
-empty_xctest_method: *unit_test_configuration
-single_test_class: *unit_test_configuration
-
+final_test_case: *unit_test_configuration
 function_body_length: 60
+identifier_name:
+  excluded:
+    - id
+large_tuple: 3
+number_separator:
+  minimum_length: 5
+redundant_type_annotation:
+  consider_default_literal_types_redundant: true
+single_test_class: *unit_test_configuration
 type_body_length: 400
+unneeded_override:
+  affect_initializers: true
+unused_import:
+  always_keep_imports:
+    - SwiftSyntaxBuilder # we can't detect uses of string interpolation of swift syntax nodes
+    - SwiftLintFramework # now that this is a wrapper around other modules, don't treat as unused
 
+# Custom rules
 custom_rules:
   rule_id:
     included: Source/SwiftLintBuiltInRules/Rules/.+/\w+\.swift
@@ -104,8 +112,3 @@ custom_rules:
     message: Rule Test Function mustn't end with `rule`
     regex: func\s*test\w+(r|R)ule\(\)
     severity: error
-
-unused_import:
-  always_keep_imports:
-    - SwiftSyntaxBuilder # we can't detect uses of string interpolation of swift syntax nodes
-    - SwiftLintFramework # now that this is a wrapper around other modules, don't treat as unused

BUILD

@@ -1,16 +1,30 @@
+load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load("@build_bazel_rules_apple//apple:apple.bzl", "apple_universal_binary")
 load(
     "@build_bazel_rules_swift//swift:swift.bzl",
     "swift_binary",
     "swift_compiler_plugin",
     "swift_library",
+    "universal_swift_compiler_plugin",
 )
 
 config_setting(
     name = "strict_concurrency_builtin_rules",
     values = {"define": "strict_concurrency_builtin_rules=true"},
 )
 
+bool_flag(
+    name = "universal_tools",
+    build_setting_default = False,
+)
+
+config_setting(
+    name = "universal_tools_config",
+    flag_values = {
+        "@SwiftLint//:universal_tools": "true",
+    },
+)
+
 copts = [
     "-enable-upcoming-feature",
     "ExistentialAny",
@@ -36,23 +50,31 @@ swift_library(
 )
 
 swift_compiler_plugin(
-    name = "SwiftLintCoreMacros",
+    name = "SwiftLintCoreMacros.underlying",
     srcs = glob(["Source/SwiftLintCoreMacros/*.swift"]),
     copts = copts + strict_concurrency_copts,
+    module_name = "SwiftLintCoreMacros",
     deps = [
         "@SwiftSyntax//:SwiftCompilerPlugin_opt",
         "@SwiftSyntax//:SwiftSyntaxMacros_opt",
     ],
 )
 
+universal_swift_compiler_plugin(
+    name = "SwiftLintCoreMacros",
+    plugin = "SwiftLintCoreMacros.underlying",
+)
+
 swift_library(
     name = "SwiftLintCore",
+    package_name = "SwiftLint",
     srcs = glob(["Source/SwiftLintCore/**/*.swift"]),
     copts = copts,  # TODO: strict_concurrency_copts
     module_name = "SwiftLintCore",
-    plugins = [
-        ":SwiftLintCoreMacros",
-    ],
+    plugins = select({
+        ":universal_tools_config": [":SwiftLintCoreMacros"],
+        "//conditions:default": [":SwiftLintCoreMacros.underlying"],
+    }),
     visibility = ["//visibility:public"],
     deps = [
         "@SwiftSyntax//:SwiftIDEUtils_opt",
@@ -71,6 +93,7 @@ swift_library(
 
 swift_library(
     name = "SwiftLintBuiltInRules",
+    package_name = "SwiftLint",
     srcs = glob(["Source/SwiftLintBuiltInRules/**/*.swift"]),
     copts = copts + select({
         ":strict_concurrency_builtin_rules": strict_concurrency_copts,
@@ -85,6 +108,7 @@ swift_library(
 
 swift_library(
     name = "SwiftLintExtraRules",
+    package_name = "SwiftLint",
     srcs = [
         "Source/SwiftLintExtraRules/Exports.swift",
         "@swiftlint_extra_rules//:extra_rules",
@@ -99,6 +123,7 @@ swift_library(
 
 swift_library(
     name = "SwiftLintFramework",
+    package_name = "SwiftLint",
     srcs = glob(
         ["Source/SwiftLintFramework/**/*.swift"],
     ),
@@ -114,6 +139,7 @@ swift_library(
 
 swift_library(
     name = "swiftlint.library",
+    package_name = "SwiftLint",
     srcs = glob(["Source/swiftlint/**/*.swift"]),
     copts = copts,  # TODO: strict_concurrency_copts
     module_name = "swiftlint",