diff --git a/apple/BuildTools/Package.swift b/apple/BuildTools/Package.swift index e07580557..3a4e10973 100644 --- a/apple/BuildTools/Package.swift +++ b/apple/BuildTools/Package.swift @@ -5,7 +5,6 @@ let package = Package( name: "BuildTools", platforms: [.macOS(.v10_11)], dependencies: [ - .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.48.11"), .package(url: "https://github.com/realm/SwiftLint", from: "0.44.0"), .package(url: "https://github.com/maticzav/swift-graphql", from: "2.2.1") ], diff --git a/apple/Omnivore.xcodeproj/project.pbxproj b/apple/Omnivore.xcodeproj/project.pbxproj index e44edd0fb..da7cd851e 100644 --- a/apple/Omnivore.xcodeproj/project.pbxproj +++ b/apple/Omnivore.xcodeproj/project.pbxproj @@ -830,6 +830,7 @@ packageReferences = ( 0418837C2742E99F003E0001 /* XCRemoteSwiftPackageReference "intercom-ios" */, 048F592A2790EAF800E0B494 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + 04B616992B5C296700128513 /* XCRemoteSwiftPackageReference "SwiftFormat" */, ); productRefGroup = E601FA26367162479B614F0F /* Products */; projectDirPath = ""; @@ -2053,6 +2054,14 @@ minimumVersion = 8.0.0; }; }; + 04B616992B5C296700128513 /* XCRemoteSwiftPackageReference "SwiftFormat" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/nicklockwood/SwiftFormat"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 0.53.0; + }; + }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ diff --git a/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved b/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved index 136efe197..96acc85cc 100644 --- a/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/apple/Omnivore.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -248,8 +248,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/nicklockwood/SwiftFormat", "state" : { - "revision" : "872e7034f54aeee3f20acf790ecc13e1383f7360", - "version" : "0.48.4" + "revision" : "fef156a6135e584985ed26713dd2e9ee41f952cb", + "version" : "0.53.0" } }, { diff --git a/apple/scripts/format_and_lint.sh b/apple/scripts/format_and_lint.sh index bedee3f15..7d48d87e1 100755 --- a/apple/scripts/format_and_lint.sh +++ b/apple/scripts/format_and_lint.sh @@ -1,5 +1,4 @@ cd BuildTools SDKROOT=(xcrun --sdk macosx --show-sdk-path) # swift package update #Uncomment this line temporarily to update the version used to the latest matching your BuildTools/Package.swift file -swift run -c release swiftformat "$SRCROOT" swift run swiftlint --path "$SRCROOT" \ No newline at end of file