Mirrors/mas
2
0
Fork 0
mirror of https://github.com/mas-cli/mas synced 2024-11-22 03:23:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #406 from mas-cli/swift-format-5.5

Browse source 
🧹 Enable linting with Xcode 13 beta 3
This commit is contained in:
Ben Chatelain 2021-07-26 18:43:41 -06:00 committed by GitHub
commit 7c960eeb93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Brewfile.lock.json
View file

@ -26,6 +26,11 @@
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/markdownlint-cli/blobs/sha256:802003979b630f36bfce119b8cd8a05ce34a006e19d94bbceb2040944167233b", "url": "https://ghcr.io/v2/homebrew/core/markdownlint-cli/blobs/sha256:802003979b630f36bfce119b8cd8a05ce34a006e19d94bbceb2040944167233b",
"sha256": "802003979b630f36bfce119b8cd8a05ce34a006e19d94bbceb2040944167233b" "sha256": "802003979b630f36bfce119b8cd8a05ce34a006e19d94bbceb2040944167233b"
},
"x86_64_linux": {
"cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/markdownlint-cli/blobs/sha256:02efc301b7d7dfefbc9d6d42c3ee32417194ae4408165a505bd689e96b06e07c",
"sha256": "02efc301b7d7dfefbc9d6d42c3ee32417194ae4408165a505bd689e96b06e07c"
} }
} }
} }
@ -99,30 +104,30 @@
} }
}, },
"swiftformat": { "swiftformat": {
"version": "0.48.9", "version": "0.48.11",
"bottle": { "bottle": {
"rebuild": 0, "rebuild": 0,
"root_url": "https://ghcr.io/v2/homebrew/core", "root_url": "https://ghcr.io/v2/homebrew/core",
"files": { "files": {
"arm64_big_sur": { "arm64_big_sur": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:4687b1109421980f9c0d8558dafb5feca3af8b264ad2a8637ad243331d4dcc42", "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:e0a851cfa2ff5d04f0fc98a9e624d1411f1b5b1e55e3cbc0901f4913c02e716a",
"sha256": "4687b1109421980f9c0d8558dafb5feca3af8b264ad2a8637ad243331d4dcc42" "sha256": "e0a851cfa2ff5d04f0fc98a9e624d1411f1b5b1e55e3cbc0901f4913c02e716a"
}, },
"big_sur": { "big_sur": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:4405a3fe6d770321b3cc11a55041b61ae0875a2bb8f2b10b056485d7dec2fdfc", "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:a5327283fe32b2ef2c6f264e14c966a9a60cb291415d3d05ed659c92a93c4987",
"sha256": "4405a3fe6d770321b3cc11a55041b61ae0875a2bb8f2b10b056485d7dec2fdfc" "sha256": "a5327283fe32b2ef2c6f264e14c966a9a60cb291415d3d05ed659c92a93c4987"
}, },
"catalina": { "catalina": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:14d57ba4c8370864983e6a352b6cc926b94aa0d93da09df3f0a8252bea02bc04", "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:ba95e49ecc71bb19734698dee565e3b0ced6470729206cb434675cfa051f2755",
"sha256": "14d57ba4c8370864983e6a352b6cc926b94aa0d93da09df3f0a8252bea02bc04" "sha256": "ba95e49ecc71bb19734698dee565e3b0ced6470729206cb434675cfa051f2755"
}, },
"mojave": { "mojave": {
"cellar": ":any_skip_relocation", "cellar": ":any_skip_relocation",
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:66143cfa8d7a16cd7e4bb17bd425124dfa4e58f8bf537994c1347aa50f5554d8", "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:c7e00eae9d46dddf040999f0f2832d08110f093c7a403aaaaaa18d8830213967",
"sha256": "66143cfa8d7a16cd7e4bb17bd425124dfa4e58f8bf537994c1347aa50f5554d8" "sha256": "c7e00eae9d46dddf040999f0f2832d08110f093c7a403aaaaaa18d8830213967"
} }
} }
} }
@ -133,12 +138,12 @@
"revision": "00757e80d6861651d3dc18bbc978edf9a5d0a8a9" "revision": "00757e80d6861651d3dc18bbc978edf9a5d0a8a9"
}, },
"peripheryapp/periphery": { "peripheryapp/periphery": {
"revision": "013cf07019e22b1aafe90a7d24846e652e23d60a" "revision": "a45b2588b35d2d94cbd2d3cf792eaf85de9e4146"
} }
}, },
"cask": { "cask": {
"periphery": { "periphery": {
"version": "2.7.1", "version": "2.8.0",
"options": { "options": {
"full_name": "periphery" "full_name": "periphery"
} }
@ -148,12 +153,12 @@
"system": { "system": {
"macos": { "macos": {
"big_sur": { "big_sur": {
"HOMEBREW_VERSION": "3.2.1-70-g5659d74", "HOMEBREW_VERSION": "3.2.4-8-gf76c524",
"HOMEBREW_PREFIX": "/opt/homebrew", "HOMEBREW_PREFIX": "/opt/homebrew",
"Homebrew/homebrew-core": "843eca6b944c46f363deb9e79c7e722d80e74d38", "Homebrew/homebrew-core": "de15ccd462bfddf164257815f20763f8984f9aa0",
"CLT": "12.5.0.22.9", "CLT": "12.5.0.22.9",
"Xcode": "12.5.1", "Xcode": "12.5.1",
"macOS": "11.4" "macOS": "11.5.1"
} }
} }
} }

8
Gemfile.lock
View file

@ -24,7 +24,7 @@ GEM
no_proxy_fix no_proxy_fix
octokit (~> 4.7) octokit (~> 4.7)
terminal-table (>= 1, < 4) terminal-table (>= 1, < 4)
faraday (1.5.0) faraday (1.5.1)
faraday-em_http (~> 1.0) faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0) faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1) faraday-excon (~> 1.1)
@ -41,7 +41,7 @@ GEM
faraday (>= 0.8) faraday (>= 0.8)
faraday-httpclient (1.0.1) faraday-httpclient (1.0.1)
faraday-net_http (1.0.1) faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0) faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0) faraday-patron (1.0.0)
git (1.9.1) git (1.9.1)
rchardet (~> 1.8) rchardet (~> 1.8)
@ -60,7 +60,7 @@ GEM
rchardet (1.8.0) rchardet (1.8.0)
rexml (3.2.5) rexml (3.2.5)
rouge (2.0.7) rouge (2.0.7)
ruby2_keywords (0.0.4) ruby2_keywords (0.0.5)
sawyer (0.8.2) sawyer (0.8.2)
addressable (>= 2.3.5) addressable (>= 2.3.5)
faraday (> 0.8, < 2.0) faraday (> 0.8, < 2.0)
@ -78,4 +78,4 @@ DEPENDENCIES
xcpretty xcpretty
BUNDLED WITH BUNDLED WITH
2.2.23 2.2.24

6
Package.swift
View file

@ -70,7 +70,11 @@ let package = Package(
swiftLanguageVersions: [.v5] swiftLanguageVersions: [.v5]
) )
#if compiler(>=5.4) #if compiler(>=5.5)
package.dependencies += [
.package(url: "https://github.com/apple/swift-format", .branch("swift-5.5-branch"))
]
#elseif compiler(>=5.4)
package.dependencies += [ package.dependencies += [
.package(url: "https://github.com/apple/swift-format", .branch("swift-5.4-branch")) .package(url: "https://github.com/apple/swift-format", .branch("swift-5.4-branch"))
] ]