Skip to content

Update dependencies and harmonize Bazel build modes #6097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SimplyDanny merged 1 commit into from
Jun 17, 2025
Merged

Update dependencies and harmonize Bazel build modes #6097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ swift_library(
":Yams.wrapper",
"@swiftlint_com_github_scottrhoyt_swifty_text_table//:SwiftyTextTable",
] + select({
"@platforms//os:linux": ["@com_github_krzyzanowskim_cryptoswift//:CryptoSwift"],
"@platforms//os:linux": ["@swiftlint_com_github_krzyzanowskim_cryptoswift//:CryptoSwift"],
"//conditions:default": [":DyldWarningWorkaround"],
}),
)
Expand All @@ -110,7 +110,7 @@ swift_library(
module_name = "YamsWrapper",
visibility = ["//visibility:private"],
deps = [
"@sourcekitten_com_github_jpsim_yams//:Yams",
"@com_github_jpsim_yams//:Yams",
],
)

Expand Down Expand Up @@ -154,7 +154,7 @@ swift_library(
":SwiftLintBuiltInRules",
":SwiftLintCore",
":SwiftLintExtraRules",
"@com_github_johnsundell_collectionconcurrencykit//:CollectionConcurrencyKit",
"@swiftlint_com_github_johnsundell_collectionconcurrencykit//:CollectionConcurrencyKit",
],
)

Expand All @@ -166,7 +166,7 @@ swift_binary(
visibility = ["//visibility:public"],
deps = [
":SwiftLintFramework",
"@sourcekitten_com_github_apple_swift_argument_parser//:ArgumentParser",
"@com_github_apple_swift_argument_parser//:ArgumentParser",
"@swiftlint_com_github_scottrhoyt_swifty_text_table//:SwiftyTextTable",
],
)
Expand All @@ -179,7 +179,7 @@ swift_binary(
visibility = ["//visibility:public"],
deps = [
":SwiftLintFramework",
"@sourcekitten_com_github_apple_swift_argument_parser//:ArgumentParser",
"@com_github_apple_swift_argument_parser//:ArgumentParser",
],
)

Expand Down
12 changes: 6 additions & 6 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ module(
repo_name = "SwiftLint",
)

bazel_dep(name = "apple_support", version = "1.16.0", repo_name = "build_bazel_apple_support")
bazel_dep(name = "apple_support", version = "1.21.1", repo_name = "build_bazel_apple_support")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "platforms", version = "0.0.11")
bazel_dep(name = "rules_apple", version = "4.0.1", repo_name = "build_bazel_rules_apple")
bazel_dep(name = "rules_cc", version = "0.1.1")
bazel_dep(name = "rules_shell", version = "0.4.0", repo_name = "build_bazel_rules_shell")
bazel_dep(name = "rules_swift", version = "2.8.1", max_compatibility_level = 3, repo_name = "build_bazel_rules_swift")
bazel_dep(name = "sourcekitten", version = "0.37.2", repo_name = "com_github_jpsim_sourcekitten")
bazel_dep(name = "swift_argument_parser", version = "1.3.1.2", repo_name = "sourcekitten_com_github_apple_swift_argument_parser")
bazel_dep(name = "swift_argument_parser", version = "1.5.0", repo_name = "com_github_apple_swift_argument_parser")
bazel_dep(name = "swift-syntax", version = "601.0.1.1", repo_name = "SwiftSyntax")
bazel_dep(name = "yams", version = "6.0.1", repo_name = "sourcekitten_com_github_jpsim_yams")
bazel_dep(name = "yams", version = "6.0.1", repo_name = "com_github_jpsim_yams")

swiftlint_repos = use_extension("//bazel:repos.bzl", "swiftlint_repos_bzlmod")
use_repo(
swiftlint_repos,
"com_github_johnsundell_collectionconcurrencykit",
"com_github_krzyzanowskim_cryptoswift",
"swiftlint_com_github_johnsundell_collectionconcurrencykit",
"swiftlint_com_github_krzyzanowskim_cryptoswift",
"swiftlint_com_github_scottrhoyt_swifty_text_table",
)

Expand Down
12 changes: 6 additions & 6 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ let package = Package(
.plugin(name: "SwiftLintCommandPlugin", targets: ["SwiftLintCommandPlugin"]),
],
dependencies: [
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMajor(from: "1.2.1")),
.package(url: "https://github.com/apple/swift-argument-parser.git", .upToNextMajor(from: "1.5.1")),
.package(url: "https://github.com/swiftlang/swift-syntax.git", exact: "601.0.1"),
.package(url: "https://github.com/jpsim/SourceKitten.git", .upToNextMajor(from: "0.37.0")),
.package(url: "https://github.com/jpsim/Yams.git", .upToNextMajor(from: "5.3.0")),
.package(url: "https://github.com/jpsim/SourceKitten.git", .upToNextMajor(from: "0.37.2")),
.package(url: "https://github.com/jpsim/Yams.git", .upToNextMajor(from: "6.0.1")),
.package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", .upToNextMajor(from: "0.9.0")),
.package(url: "https://github.com/JohnSundell/CollectionConcurrencyKit.git", .upToNextMajor(from: "0.2.0")),
.package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", .upToNextMajor(from: "1.8.4")),
Expand Down
11 changes: 11 additions & 0 deletions bazel/SWXMLHash.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
load(
"@build_bazel_rules_swift//swift:swift.bzl",
"swift_library",
)

swift_library(
name = "SWXMLHash",
srcs = glob(["Source/**/*.swift"]),
module_name = "SWXMLHash",
visibility = ["//visibility:public"],
)
17 changes: 17 additions & 0 deletions bazel/SwiftArgumentParser.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")

swift_library(
name = "ArgumentParserToolInfo",
srcs = glob(["Sources/ArgumentParserToolInfo/**/*.swift"]),
module_name = "ArgumentParserToolInfo",
)

swift_library(
name = "ArgumentParser",
srcs = glob(["Sources/ArgumentParser/**/*.swift"]),
module_name = "ArgumentParser",
visibility = ["//visibility:public"],
deps = [
":ArgumentParserToolInfo",
],
)
26 changes: 13 additions & 13 deletions bazel/repos.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ def swiftlint_repos(bzlmod = False):
if not bzlmod:
http_archive(
name = "com_github_jpsim_sourcekitten",
sha256 = "38d62bf1114c878a017f1c685ff7e98413390591c93f354a16ed751a8b0bf87f",
strip_prefix = "SourceKitten-0.37.1",
url = "https://github.com/jpsim/SourceKitten/releases/download/0.37.1/SourceKitten-0.37.1.tar.gz",
sha256 = "604d2e5e547ef4280c959760cba0c9bd9be759c9555796cf7a73d9e1c9bcfc90",
strip_prefix = "SourceKitten-0.37.2",
url = "https://github.com/jpsim/SourceKitten/releases/download/0.37.2/SourceKitten-0.37.2.tar.gz",
)

http_archive(
Expand All @@ -18,24 +18,24 @@ def swiftlint_repos(bzlmod = False):
)

http_archive(
name = "sourcekitten_com_github_apple_swift_argument_parser",
url = "https://github.com/apple/swift-argument-parser/archive/refs/tags/1.3.1.tar.gz",
sha256 = "4d964f874b251abc280ee28f0f187de3c13a6122a9561524f66a10768ca2d837",
build_file = "@com_github_jpsim_sourcekitten//bazel:SwiftArgumentParser.BUILD",
strip_prefix = "swift-argument-parser-1.3.1",
name = "com_github_apple_swift_argument_parser",
url = "https://github.com/apple/swift-argument-parser/archive/refs/tags/1.5.0.tar.gz",
build_file = "@SwiftLint//bazel:SwiftArgumentParser.BUILD",
sha256 = "946a4cf7bdd2e4f0f8b82864c56332238ba3f0a929c6d1a15f55affdb10634e6",
strip_prefix = "swift-argument-parser-1.5.0",
)

http_archive(
name = "sourcekitten_com_github_jpsim_yams",
name = "com_github_jpsim_yams",
url = "https://github.com/jpsim/Yams/releases/download/6.0.1/Yams-6.0.1.tar.gz",
sha256 = "76afe79db05acb0eda4910e0b9da6a8562ad6139ac317daa747cd829beb93b9e",
strip_prefix = "Yams-6.0.1",
)

http_archive(
name = "sourcekitten_com_github_drmohundro_SWXMLHash",
name = "com_github_drmohundro_SWXMLHash",
url = "https://github.com/drmohundro/SWXMLHash/archive/refs/tags/7.0.2.tar.gz",
build_file = "@com_github_jpsim_sourcekitten//bazel:SWXMLHash.BUILD",
build_file = "@SwiftLint//bazel:SWXMLHash.BUILD",
sha256 = "d7d600f062d6840b037fc1fb2ac3afce7a1c43ae430d78e22d7bd6f8e02cfc9d",
strip_prefix = "SWXMLHash-7.0.2",
)
Expand All @@ -49,15 +49,15 @@ def swiftlint_repos(bzlmod = False):
)

http_archive(
name = "com_github_johnsundell_collectionconcurrencykit",
name = "swiftlint_com_github_johnsundell_collectionconcurrencykit",
sha256 = "9083fe6f8b4f820bfb5ef5c555b31953116f158ec113e94c6406686e78da34aa",
build_file = "@SwiftLint//bazel:CollectionConcurrencyKit.BUILD",
strip_prefix = "CollectionConcurrencyKit-0.2.0",
url = "https://github.com/JohnSundell/CollectionConcurrencyKit/archive/refs/tags/0.2.0.tar.gz",
)

http_archive(
name = "com_github_krzyzanowskim_cryptoswift",
name = "swiftlint_com_github_krzyzanowskim_cryptoswift",
sha256 = "69b23102ff453990d03aff4d3fabd172d0667b2b3ed95730021d60a0f8d50d14",
build_file = "@SwiftLint//bazel:CryptoSwift.BUILD",
strip_prefix = "CryptoSwift-1.8.4",
Expand Down