mirror of
https://github.com/mas-cli/mas
synced 2024-11-22 03:23:08 +00:00
Merge pull request #476 from mas-cli/cleanup
⬆️ Dependency & tool updates
This commit is contained in:
Ben Chatelain
GitHub
commit
4cba212570
7 changed files with 56 additions and 40 deletions
|
|
@ -1 +1 @@
|
|||
5.6.1
|
||||
5.7
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
"entries": {
|
||||
"brew": {
|
||||
"markdownlint-cli": {
|
||||
"version": "0.31.1",
|
||||
"version": "0.32.2",
|
||||
"bottle": {
|
||||
"rebuild": 0,
|
||||
"root_url": "https://ghcr.io/v2/homebrew/core",
|
||||
"files": {
|
||||
"all": {
|
||||
"cellar": ":any_skip_relocation",
|
||||
"url": "https://ghcr.io/v2/homebrew/core/markdownlint-cli/blobs/sha256:26519a6a4330fd29cd897e61f8af2070def21758b06517c136690a5404d07d5a",
|
||||
"sha256": "26519a6a4330fd29cd897e61f8af2070def21758b06517c136690a5404d07d5a"
|
||||
"url": "https://ghcr.io/v2/homebrew/core/markdownlint-cli/blobs/sha256:7be52e16473a658becde9b817f86c868bcb9e41e79856d9dce542218b9515860",
|
||||
"sha256": "7be52e16473a658becde9b817f86c868bcb9e41e79856d9dce542218b9515860"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -94,35 +94,40 @@
|
|||
}
|
||||
},
|
||||
"swiftformat": {
|
||||
"version": "0.49.9",
|
||||
"version": "0.49.18",
|
||||
"bottle": {
|
||||
"rebuild": 0,
|
||||
"root_url": "https://ghcr.io/v2/homebrew/core",
|
||||
"files": {
|
||||
"arm64_monterey": {
|
||||
"cellar": ":any_skip_relocation",
|
||||
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:bacd0dc8f488fd7909252467eaf16dcd339468857aea13a3643f7e0efd7715f8",
|
||||
"sha256": "bacd0dc8f488fd7909252467eaf16dcd339468857aea13a3643f7e0efd7715f8"
|
||||
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:6362f6087bc3821f4271c3d17b3a4f180b1e1326646ddfb60f6d27bfb5a2a357",
|
||||
"sha256": "6362f6087bc3821f4271c3d17b3a4f180b1e1326646ddfb60f6d27bfb5a2a357"
|
||||
},
|
||||
"arm64_big_sur": {
|
||||
"cellar": ":any_skip_relocation",
|
||||
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:7bc39a57d110f727993aa556cca5cba5549d536367bc12f25b56e25c4fdfa194",
|
||||
"sha256": "7bc39a57d110f727993aa556cca5cba5549d536367bc12f25b56e25c4fdfa194"
|
||||
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:e94cf1b66df0d712bbfbf509b98efaf31d39a61b82999314e1f3c0e45195c51a",
|
||||
"sha256": "e94cf1b66df0d712bbfbf509b98efaf31d39a61b82999314e1f3c0e45195c51a"
|
||||
},
|
||||
"monterey": {
|
||||
"cellar": ":any_skip_relocation",
|
||||
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:739d230372dd797d5cf5a0586156068ecb5965878550a67b5ca56ccdf2799557",
|
||||
"sha256": "739d230372dd797d5cf5a0586156068ecb5965878550a67b5ca56ccdf2799557"
|
||||
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:456e0c95a565adbb45a29747abfadf41c838a7f09fae052a874e59429a94ef14",
|
||||
"sha256": "456e0c95a565adbb45a29747abfadf41c838a7f09fae052a874e59429a94ef14"
|
||||
},
|
||||
"big_sur": {
|
||||
"cellar": ":any_skip_relocation",
|
||||
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:22080bdc75b03f5926d68fb248fc401d6a94876205ce03663a8950644b0e41e6",
|
||||
"sha256": "22080bdc75b03f5926d68fb248fc401d6a94876205ce03663a8950644b0e41e6"
|
||||
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:d00204be714789fa8b35d4c6f6eea5813604aa09f3911635059973aa827d2e8c",
|
||||
"sha256": "d00204be714789fa8b35d4c6f6eea5813604aa09f3911635059973aa827d2e8c"
|
||||
},
|
||||
"catalina": {
|
||||
"cellar": ":any_skip_relocation",
|
||||
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:d4cda88cf3bef7b18e960197b8db4826f234e3b3434ba902c3924c37b9040fe8",
|
||||
"sha256": "d4cda88cf3bef7b18e960197b8db4826f234e3b3434ba902c3924c37b9040fe8"
|
||||
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:b07f7221f3c5225ad0037293cecb95bde4f0dba4fa19797d84a3376dd1ad02ea",
|
||||
"sha256": "b07f7221f3c5225ad0037293cecb95bde4f0dba4fa19797d84a3376dd1ad02ea"
|
||||
},
|
||||
"x86_64_linux": {
|
||||
"cellar": "/home/linuxbrew/.linuxbrew/Cellar",
|
||||
"url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:c4a4ebd2f3f54b8f399551efaf47b3e419db2c729ffaf18a09e64bbf62d82f38",
|
||||
"sha256": "c4a4ebd2f3f54b8f399551efaf47b3e419db2c729ffaf18a09e64bbf62d82f38"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -151,6 +156,14 @@
|
|||
"CLT": "13.4.0.0.1.1651278267",
|
||||
"Xcode": "13.4.1",
|
||||
"macOS": "12.4"
|
||||
},
|
||||
"ventura": {
|
||||
"HOMEBREW_VERSION": "3.6.2-17-g0b602f6",
|
||||
"HOMEBREW_PREFIX": "/opt/homebrew",
|
||||
"Homebrew/homebrew-core": "9f43be0861992b9109035ac00e999f66598ba6c2",
|
||||
"CLT": "14.0.0.0.1.1661618636",
|
||||
"Xcode": "14.0",
|
||||
"macOS": "13.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
7
Makefile
7
Makefile
|
|
@ -18,7 +18,7 @@ PREFIX ?= /usr/local
|
|||
# Swift 5.3
|
||||
# SWIFT_VERSION = swift-5.3-DEVELOPMENT-SNAPSHOT-2020-04-21-a
|
||||
|
||||
SWIFT_VERSION = 5.6.1
|
||||
SWIFT_VERSION = 5.7
|
||||
|
||||
# set EXECUTABLE_DIRECTORY according to your specific environment
|
||||
# run swift build and see where the output executable is created
|
||||
|
|
@ -42,13 +42,10 @@ endif
|
|||
.PHONY: help
|
||||
help: MAKEFILE_FMT = " \033[36m%-25s\033[0m%s\n"
|
||||
help: ## (default) Displays this message
|
||||
@echo "Ditto main Makefile."
|
||||
@echo "mas Makefile"
|
||||
@echo ""
|
||||
@echo "Targets:"
|
||||
@grep -E '^[a-zA-Z0-9_-]*:.*?##' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?##"}; {printf $(MAKEFILE_FMT), $$1, $$2}'
|
||||
@echo ""
|
||||
@echo "Parameters:"
|
||||
@grep -E '^[A-Z0-9_-]* ?\?=.*?##' $(MAKEFILE_LIST) | awk 'BEGIN {FS = " ?\\?=.*?##"}; {printf $(MAKEFILE_FMT), $$1, $$2}'
|
||||
: # Hacky way to display a newline ##
|
||||
|
||||
################################################################################
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@
|
|||
"repositoryURL": "https://github.com/Quick/Nimble.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "c93f16c25af5770f0d3e6af27c9634640946b068",
|
||||
"version": "9.2.1"
|
||||
"revision": "1f3bde57bde12f5e7b07909848c071e9b73d6edc",
|
||||
"version": "10.0.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -42,8 +42,8 @@
|
|||
"repositoryURL": "https://github.com/mxcl/PromiseKit.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "93c8d41ce96ed78f36c3948be396d76f3ca3de1b",
|
||||
"version": "6.16.2"
|
||||
"revision": "43772616c46a44a9977e41924ae01d0e55f2f9ca",
|
||||
"version": "6.18.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -51,8 +51,8 @@
|
|||
"repositoryURL": "https://github.com/Quick/Quick.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "bd86ca0141e3cfb333546de5a11ede63f0c4a0e6",
|
||||
"version": "4.0.0"
|
||||
"revision": "f9d519828bb03dfc8125467d8f7b93131951124c",
|
||||
"version": "5.0.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -60,16 +60,16 @@
|
|||
"repositoryURL": "https://github.com/apple/swift-argument-parser.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "df9ee6676cd5b3bf5b330ec7568a5644f547201b",
|
||||
"version": "1.1.3"
|
||||
"revision": "9f39744e025c7d377987f30b03770805dcb0bcd1",
|
||||
"version": "1.1.4"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-format",
|
||||
"repositoryURL": "https://github.com/apple/swift-format",
|
||||
"state": {
|
||||
"branch": "release/5.6",
|
||||
"revision": "e6b8c60c7671066d229e30efa1e31acf57be412e",
|
||||
"branch": "release/5.7",
|
||||
"revision": "3dd9b517b9e9846435aa782d769ef5825e7c2d65",
|
||||
"version": null
|
||||
}
|
||||
},
|
||||
|
|
@ -78,8 +78,8 @@
|
|||
"repositoryURL": "https://github.com/apple/swift-syntax",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "0b6c22b97f8e9320bca62e82cdbee601cf37ad3f",
|
||||
"version": "0.50600.1"
|
||||
"revision": "04d4497be6b88e524a71778d828790e9589ae1c4",
|
||||
"version": "0.50700.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -96,8 +96,8 @@
|
|||
"repositoryURL": "https://github.com/apple/swift-tools-support-core.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "b7667f3e266af621e5cc9c77e74cacd8e8c00cb4",
|
||||
"version": "0.2.5"
|
||||
"revision": "4f07be3dc201f6e2ee85b6942d0c220a16926811",
|
||||
"version": "0.2.7"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ let package = Package(
|
|||
dependencies: [
|
||||
// Dependencies declare other packages that this package depends on.
|
||||
.package(url: "https://github.com/Carthage/Commandant.git", from: "0.18.0"),
|
||||
.package(url: "https://github.com/Quick/Nimble.git", from: "9.2.1"),
|
||||
.package(url: "https://github.com/Quick/Quick.git", from: "4.0.0"),
|
||||
.package(url: "https://github.com/Quick/Nimble.git", from: "10.0.0"),
|
||||
.package(url: "https://github.com/Quick/Quick.git", from: "5.0.0"),
|
||||
.package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.16.2"),
|
||||
.package(url: "https://github.com/mxcl/Version.git", from: "2.0.1"),
|
||||
],
|
||||
|
|
@ -70,8 +70,12 @@ let package = Package(
|
|||
swiftLanguageVersions: [.v5]
|
||||
)
|
||||
|
||||
// https://github.com/apple/swift-format#matching-swift-format-to-your-swift-version
|
||||
#if compiler(>=5.6)
|
||||
// https://github.com/apple/swift-format#matching-swift-format-to-your-swift-version-swift-57-and-earlier
|
||||
#if compiler(>=5.7)
|
||||
package.dependencies += [
|
||||
.package(url: "https://github.com/apple/swift-format", .branch("release/5.7"))
|
||||
]
|
||||
#elseif compiler(>=5.6)
|
||||
package.dependencies += [
|
||||
.package(url: "https://github.com/apple/swift-format", .branch("release/5.6"))
|
||||
]
|
||||
|
|
|
|||
|
|
@ -50,7 +50,9 @@ public struct UpgradeCommand: CommandProtocol {
|
|||
}
|
||||
|
||||
print("Upgrading \(apps.count) outdated application\(apps.count > 1 ? "s" : ""):")
|
||||
print(apps.map { "\($0.installedApp.appName) (\($0.installedApp.bundleVersion)) -> (\($0.storeApp.version))" }.joined(separator: "\n"))
|
||||
print(
|
||||
apps.map { "\($0.installedApp.appName) (\($0.installedApp.bundleVersion)) -> (\($0.storeApp.version))" }
|
||||
.joined(separator: "\n"))
|
||||
|
||||
let appIds = apps.map(\.installedApp.itemIdentifier.uint64Value)
|
||||
do {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import Foundation
|
|||
import PromiseKit
|
||||
|
||||
extension URLSession: NetworkSession {
|
||||
open func loadData(from url: URL) -> Promise<Data> {
|
||||
public func loadData(from url: URL) -> Promise<Data> {
|
||||
Promise { seal in
|
||||
dataTask(with: url) { data, _, error in
|
||||
if let data = data {
|
||||
|
|
|
|||
Loading…
Reference in a new issue