Skip to content

Commit 91773d4

Browse files
authored
Merge pull request #920 from rgoldberg/919-update-dependencies
Update dependencies & linting
2 parents b026627 + 2a0ccaf commit 91773d4

File tree

5 files changed

+27
-22
lines changed

5 files changed

+27
-22
lines changed

.periphery.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# .periphery.yaml
33
# mas
44
#
5-
# Periphery 3.1.0
5+
# Periphery 3.2.0
66
#
77
---
88
disable_update_check: true

.swiftformat

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# .swiftformat
33
# mas
44
#
5-
# SwiftFormat 0.56.3
5+
# SwiftFormat 0.57.2
66
#
77

88
# Disabled rules
@@ -21,14 +21,19 @@
2121
--enable isEmpty
2222
#--enable markTypes
2323
--enable noExplicitOwnership
24+
--enable noGuardInTests
2425
--enable organizeDeclarations
2526
--enable preferSwiftTesting
2627
--enable privateStateVariables
2728
--enable propertyTypes
2829
--enable redundantEquatable
30+
--enable redundantMemberwiseInit
2931
--enable redundantProperty
32+
--enable singlePropertyPerLine
3033
--enable sortSwitchCases
34+
--enable throwingTests
3135
--enable unusedPrivateDeclarations
36+
--enable urlMacro
3237
--enable wrapConditionalBodies
3338
--enable wrapEnumCases
3439
--enable wrapMultilineConditionalAssignment
@@ -37,16 +42,16 @@
3742

3843
# Rule options
3944
--commas always
40-
--hexliteralcase lowercase
45+
--hex-literal-case lowercase
4146
--ifdef no-indent
42-
--importgrouping testable-last
47+
--import-grouping testable-last
4348
--indent tab
44-
--indentstrings true
45-
--inferredtypes always
46-
--lineaftermarks false
47-
--markcategories false
48-
--organizationmode type
49-
--propertytypes inferred
49+
--indent-strings true
50+
--inferred-types always
51+
--line-after-marks false
52+
--mark-categories false
53+
--organization-mode type
54+
--property-types inferred
5055
--ranges no-space
51-
--tabwidth 2
52-
--wrapternary before-operators
56+
--tab-width 2
57+
--wrap-ternary before-operators

Package.resolved

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ let package = Package(
1616
dependencies: [
1717
.package(url: "https://github.com/Quick/Nimble.git", from: "13.7.1"),
1818
.package(url: "https://github.com/Quick/Quick.git", exact: "7.5.0"),
19-
.package(url: "https://github.com/apple/swift-argument-parser.git", branch: "main"),
20-
.package(url: "https://github.com/apple/swift-atomics.git", branch: "main"),
19+
.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.6.1"),
20+
.package(url: "https://github.com/apple/swift-atomics.git", revision: "239a74d140e0a9dd84fde414260a8c062480550c"),
2121
.package(url: "https://github.com/funky-monkey/IsoCountryCodes.git", from: "1.0.3"),
22-
.package(url: "https://github.com/mxcl/Version.git", from: "2.1.0"),
22+
.package(url: "https://github.com/mxcl/Version.git", from: "2.2.0"),
2323
],
2424
targets: [
2525
.executableTarget(

Tests/masTests/Models/SearchResultSpec.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ final class SearchResultSpec: QuickSpec {
1818
consequencesOf(
1919
try JSONDecoder() // swiftformat:disable indent
2020
.decode(SearchResult.self, from: Data(fromResource: "search/things-that-go-bump.json"))
21-
.trackId // swiftformat:enable indent
21+
.trackId
22+
// swiftformat:enable indent
2223
)
2324
)
2425
== ValuedConsequences(1_472_954_003)

0 commit comments

Comments
 (0)