From e061d00afcc4189082b9ea68e806d3e430d7b7d4 Mon Sep 17 00:00:00 2001 From: Nikolay Edigaryev Date: Wed, 30 Nov 2022 21:53:25 +0400 Subject: [PATCH] Fix SwiftFormat's URL/glob mishandling (#342) * Fix SwiftFormat's URL/glob mishandling * Revert "Fix SwiftFormat's URL/glob mishandling" This reverts commit 4d1a4c7fb308edd900ccc539371200117ddbe1d6. * Use a fixed SwiftFormat * Another SwiftFormat fix * Update .cirrus.yml Co-authored-by: Fedor Korotkov --- .cirrus.yml | 2 ++ Package.resolved | 5 ++--- Package.swift | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 3602118..c79351a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,3 +1,5 @@ +use_compute_credits: true + task: name: Test on Ventura alias: test diff --git a/Package.resolved b/Package.resolved index 2961e1b..5a52f78 100644 --- a/Package.resolved +++ b/Package.resolved @@ -102,10 +102,9 @@ { "identity" : "swiftformat", "kind" : "remoteSourceControl", - "location" : "https://github.com/nicklockwood/SwiftFormat", + "location" : "https://github.com/edigaryev/SwiftFormat", "state" : { - "revision" : "7c7dd06554a5fc3f452f1d16a780a81a3be04bce", - "version" : "0.50.4" + "revision" : "46f34946546a29eeb6cb23ec44936b74fd379d63" } } ], diff --git a/Package.swift b/Package.swift index 5cf714b..4b864d2 100644 --- a/Package.swift +++ b/Package.swift @@ -18,7 +18,7 @@ let package = Package( .package(url: "https://github.com/sushichop/Puppy", from: "0.5.1"), .package(url: "https://github.com/antlr/antlr4", branch: "dev"), .package(url: "https://github.com/apple/swift-atomics.git", .upToNextMajor(from: "1.0.0")), - .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.50.4"), + .package(url: "https://github.com/edigaryev/SwiftFormat", branch: "46f34946546a29eeb6cb23ec44936b74fd379d63"), ], targets: [ .executableTarget(name: "tart", dependencies: [