Skip to content

Commit 025a7bf

Browse files
authored
Prefer short and readable repository names (#6205)
1 parent ae388f9 commit 025a7bf

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Build SwiftLint and SourceKitten
2020
uses: ./.github/actions/bazel-linux-build
2121
with:
22-
target: "//:swiftlint @com_github_jpsim_sourcekitten//:sourcekitten"
22+
target: "//:swiftlint @SourceKittenFramework//:sourcekitten"
2323
env:
2424
CI_BAZELRC_FILE_CONTENT: ${{ secrets.CI_BAZELRC_FILE_CONTENT }}
2525
- name: Get Swift version

BUILD

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,16 @@ swift_library(
9090
}),
9191
visibility = ["//visibility:public"],
9292
deps = [
93+
":Yams.wrapper",
94+
"@SourceKittenFramework",
9395
"@SwiftSyntax//:SwiftIDEUtils_opt",
9496
"@SwiftSyntax//:SwiftOperators_opt",
9597
"@SwiftSyntax//:SwiftParserDiagnostics_opt",
9698
"@SwiftSyntax//:SwiftSyntaxBuilder_opt",
9799
"@SwiftSyntax//:SwiftSyntax_opt",
98-
"@com_github_jpsim_sourcekitten//:SourceKittenFramework",
99-
":Yams.wrapper",
100-
"@swiftlint_com_github_scottrhoyt_swifty_text_table//:SwiftyTextTable",
100+
"@SwiftyTextTable",
101101
] + select({
102-
"@platforms//os:linux": ["@swiftlint_com_github_krzyzanowskim_cryptoswift//:CryptoSwift"],
102+
"@platforms//os:linux": ["@CryptoSwift"],
103103
"//conditions:default": [":DyldWarningWorkaround"],
104104
}),
105105
)
@@ -110,7 +110,7 @@ swift_library(
110110
module_name = "YamsWrapper",
111111
visibility = ["//visibility:private"],
112112
deps = [
113-
"@com_github_jpsim_yams//:Yams",
113+
"@Yams",
114114
],
115115
)
116116

@@ -154,7 +154,7 @@ swift_library(
154154
":SwiftLintBuiltInRules",
155155
":SwiftLintCore",
156156
":SwiftLintExtraRules",
157-
"@swiftlint_com_github_johnsundell_collectionconcurrencykit//:CollectionConcurrencyKit",
157+
"@CollectionConcurrencyKit",
158158
],
159159
)
160160

@@ -166,8 +166,8 @@ swift_binary(
166166
visibility = ["//visibility:public"],
167167
deps = [
168168
":SwiftLintFramework",
169-
"@com_github_apple_swift_argument_parser//:ArgumentParser",
170-
"@swiftlint_com_github_scottrhoyt_swifty_text_table//:SwiftyTextTable",
169+
"@SwiftArgumentParser//:ArgumentParser",
170+
"@SwiftyTextTable",
171171
],
172172
)
173173

@@ -179,7 +179,7 @@ swift_binary(
179179
visibility = ["//visibility:public"],
180180
deps = [
181181
":SwiftLintFramework",
182-
"@com_github_apple_swift_argument_parser//:ArgumentParser",
182+
"@SwiftArgumentParser//:ArgumentParser",
183183
],
184184
)
185185

MODULE.bazel

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,18 @@ bazel_dep(name = "rules_apple", version = "4.0.1", repo_name = "build_bazel_rule
1212
bazel_dep(name = "rules_cc", version = "0.1.1")
1313
bazel_dep(name = "rules_shell", version = "0.4.0", repo_name = "build_bazel_rules_shell")
1414
bazel_dep(name = "rules_swift", version = "2.8.1", max_compatibility_level = 3, repo_name = "build_bazel_rules_swift")
15-
bazel_dep(name = "sourcekitten", version = "0.37.2", repo_name = "com_github_jpsim_sourcekitten")
16-
bazel_dep(name = "swift_argument_parser", version = "1.6.1", repo_name = "com_github_apple_swift_argument_parser")
17-
bazel_dep(name = "yams", version = "6.1.0", repo_name = "com_github_jpsim_yams")
15+
16+
bazel_dep(name = "sourcekitten", version = "0.37.2", repo_name = "SourceKittenFramework")
17+
bazel_dep(name = "swift_argument_parser", version = "1.6.1", repo_name = "SwiftArgumentParser")
18+
bazel_dep(name = "yams", version = "6.1.0", repo_name = "Yams")
1819

1920
swiftlint_repos = use_extension("//bazel:repos.bzl", "swiftlint_repos_bzlmod")
2021
use_repo(
2122
swiftlint_repos,
23+
"CollectionConcurrencyKit",
24+
"CryptoSwift",
2225
"SwiftSyntax",
23-
"swiftlint_com_github_johnsundell_collectionconcurrencykit",
24-
"swiftlint_com_github_krzyzanowskim_cryptoswift",
25-
"swiftlint_com_github_scottrhoyt_swifty_text_table",
26+
"SwiftyTextTable",
2627
)
2728

2829
extra_rules = use_extension("//bazel:extensions.bzl", "extra_rules")

bazel/repos.bzl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,29 @@ def swiftlint_repos(bzlmod = False):
44
"""Fetches SwiftLint repositories"""
55
if not bzlmod:
66
http_archive(
7-
name = "com_github_jpsim_sourcekitten",
7+
name = "SourceKittenFramework",
88
sha256 = "604d2e5e547ef4280c959760cba0c9bd9be759c9555796cf7a73d9e1c9bcfc90",
99
strip_prefix = "SourceKitten-0.37.2",
1010
url = "https://github.com/jpsim/SourceKitten/releases/download/0.37.2/SourceKitten-0.37.2.tar.gz",
1111
)
1212

1313
http_archive(
14-
name = "com_github_apple_swift_argument_parser",
14+
name = "SwiftArgumentParser",
1515
url = "https://github.com/apple/swift-argument-parser/archive/refs/tags/1.6.1.tar.gz",
1616
build_file = "@SwiftLint//bazel:SwiftArgumentParser.BUILD",
1717
sha256 = "d2fbb15886115bb2d9bfb63d4c1ddd4080cbb4bfef2651335c5d3b9dd5f3c8ba",
1818
strip_prefix = "swift-argument-parser-1.6.1",
1919
)
2020

2121
http_archive(
22-
name = "com_github_jpsim_yams",
22+
name = "Yams",
2323
url = "https://github.com/jpsim/Yams/archive/refs/tags/6.0.2.tar.gz",
2424
sha256 = "a1ae9733755f77fd56e4b01081baea2a756d8cd4b6b7ec58dd971b249318df48",
2525
strip_prefix = "Yams-6.0.2",
2626
)
2727

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

4343
http_archive(
44-
name = "swiftlint_com_github_scottrhoyt_swifty_text_table",
44+
name = "SwiftyTextTable",
4545
sha256 = "b77d403db9f33686caeb2a12986997fb02a0819e029e669c6b9554617c4fd6ae",
4646
build_file = "@SwiftLint//bazel:SwiftyTextTable.BUILD",
4747
strip_prefix = "SwiftyTextTable-0.9.0",
4848
url = "https://github.com/scottrhoyt/SwiftyTextTable/archive/refs/tags/0.9.0.tar.gz",
4949
)
5050

5151
http_archive(
52-
name = "swiftlint_com_github_johnsundell_collectionconcurrencykit",
52+
name = "CollectionConcurrencyKit",
5353
sha256 = "9083fe6f8b4f820bfb5ef5c555b31953116f158ec113e94c6406686e78da34aa",
5454
build_file = "@SwiftLint//bazel:CollectionConcurrencyKit.BUILD",
5555
strip_prefix = "CollectionConcurrencyKit-0.2.0",
5656
url = "https://github.com/JohnSundell/CollectionConcurrencyKit/archive/refs/tags/0.2.0.tar.gz",
5757
)
5858

5959
http_archive(
60-
name = "swiftlint_com_github_krzyzanowskim_cryptoswift",
60+
name = "CryptoSwift",
6161
sha256 = "81b1ba186e2edcff47bcc2a3b6a242df083ba2f64bfb42209f79090cb8d7f889",
6262
build_file = "@SwiftLint//bazel:CryptoSwift.BUILD",
6363
strip_prefix = "CryptoSwift-1.9.0",

0 commit comments

Comments
 (0)