Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Build SwiftLint and SourceKitten
uses: ./.github/actions/bazel-linux-build
with:
target: "//:swiftlint @com_github_jpsim_sourcekitten//:sourcekitten"
target: "//:swiftlint @SourceKittenFramework//:sourcekitten"
env:
CI_BAZELRC_FILE_CONTENT: ${{ secrets.CI_BAZELRC_FILE_CONTENT }}
- name: Get Swift version
Expand Down
18 changes: 9 additions & 9 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,16 @@ swift_library(
}),
visibility = ["//visibility:public"],
deps = [
":Yams.wrapper",
"@SourceKittenFramework",
"@SwiftSyntax//:SwiftIDEUtils_opt",
"@SwiftSyntax//:SwiftOperators_opt",
"@SwiftSyntax//:SwiftParserDiagnostics_opt",
"@SwiftSyntax//:SwiftSyntaxBuilder_opt",
"@SwiftSyntax//:SwiftSyntax_opt",
"@com_github_jpsim_sourcekitten//:SourceKittenFramework",
":Yams.wrapper",
"@swiftlint_com_github_scottrhoyt_swifty_text_table//:SwiftyTextTable",
"@SwiftyTextTable",
] + select({
"@platforms//os:linux": ["@swiftlint_com_github_krzyzanowskim_cryptoswift//:CryptoSwift"],
"@platforms//os:linux": ["@CryptoSwift"],
"//conditions:default": [":DyldWarningWorkaround"],
}),
)
Expand All @@ -110,7 +110,7 @@ swift_library(
module_name = "YamsWrapper",
visibility = ["//visibility:private"],
deps = [
"@com_github_jpsim_yams//:Yams",
"@Yams",
],
)

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

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

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

Expand Down
13 changes: 7 additions & 6 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,18 @@ bazel_dep(name = "rules_apple", version = "4.0.1", repo_name = "build_bazel_rule
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.6.1", repo_name = "com_github_apple_swift_argument_parser")
bazel_dep(name = "yams", version = "6.1.0", repo_name = "com_github_jpsim_yams")

bazel_dep(name = "sourcekitten", version = "0.37.2", repo_name = "SourceKittenFramework")
bazel_dep(name = "swift_argument_parser", version = "1.6.1", repo_name = "SwiftArgumentParser")
bazel_dep(name = "yams", version = "6.1.0", repo_name = "Yams")

swiftlint_repos = use_extension("//bazel:repos.bzl", "swiftlint_repos_bzlmod")
use_repo(
swiftlint_repos,
"CollectionConcurrencyKit",
"CryptoSwift",
"SwiftSyntax",
"swiftlint_com_github_johnsundell_collectionconcurrencykit",
"swiftlint_com_github_krzyzanowskim_cryptoswift",
"swiftlint_com_github_scottrhoyt_swifty_text_table",
"SwiftyTextTable",
)

extra_rules = use_extension("//bazel:extensions.bzl", "extra_rules")
Expand Down
14 changes: 7 additions & 7 deletions bazel/repos.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@ def swiftlint_repos(bzlmod = False):
"""Fetches SwiftLint repositories"""
if not bzlmod:
http_archive(
name = "com_github_jpsim_sourcekitten",
name = "SourceKittenFramework",
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(
name = "com_github_apple_swift_argument_parser",
name = "SwiftArgumentParser",
url = "https://github.com/apple/swift-argument-parser/archive/refs/tags/1.6.1.tar.gz",
build_file = "@SwiftLint//bazel:SwiftArgumentParser.BUILD",
sha256 = "d2fbb15886115bb2d9bfb63d4c1ddd4080cbb4bfef2651335c5d3b9dd5f3c8ba",
strip_prefix = "swift-argument-parser-1.6.1",
)

http_archive(
name = "com_github_jpsim_yams",
name = "Yams",
url = "https://github.com/jpsim/Yams/archive/refs/tags/6.0.2.tar.gz",
sha256 = "a1ae9733755f77fd56e4b01081baea2a756d8cd4b6b7ec58dd971b249318df48",
strip_prefix = "Yams-6.0.2",
)

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

http_archive(
name = "swiftlint_com_github_scottrhoyt_swifty_text_table",
name = "SwiftyTextTable",
sha256 = "b77d403db9f33686caeb2a12986997fb02a0819e029e669c6b9554617c4fd6ae",
build_file = "@SwiftLint//bazel:SwiftyTextTable.BUILD",
strip_prefix = "SwiftyTextTable-0.9.0",
url = "https://github.com/scottrhoyt/SwiftyTextTable/archive/refs/tags/0.9.0.tar.gz",
)

http_archive(
name = "swiftlint_com_github_johnsundell_collectionconcurrencykit",
name = "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 = "swiftlint_com_github_krzyzanowskim_cryptoswift",
name = "CryptoSwift",
sha256 = "81b1ba186e2edcff47bcc2a3b6a242df083ba2f64bfb42209f79090cb8d7f889",
build_file = "@SwiftLint//bazel:CryptoSwift.BUILD",
strip_prefix = "CryptoSwift-1.9.0",
Expand Down