Skip to content

Update dependencies & linting #920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rgoldberg merged 3 commits into from
Jul 29, 2025
Merged

Update dependencies & linting #920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bdfb7c4
Update dependencies.
rgoldberg Jul 28, 2025
8c65c73
Fix SwiftFormat ident ignoring.
rgoldberg Jul 28, 2025
2a0ccaf
Update linting.
rgoldberg Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .periphery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# .periphery.yaml
# mas
#
# Periphery 3.1.0
# Periphery 3.2.0
#
---
disable_update_check: true
Expand Down
27 changes: 16 additions & 11 deletions .swiftformat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# .swiftformat
# mas
#
# SwiftFormat 0.56.3
# SwiftFormat 0.57.2
#

# Disabled rules
Expand All @@ -21,14 +21,19 @@
--enable isEmpty
#--enable markTypes
--enable noExplicitOwnership
--enable noGuardInTests
--enable organizeDeclarations
--enable preferSwiftTesting
--enable privateStateVariables
--enable propertyTypes
--enable redundantEquatable
--enable redundantMemberwiseInit
--enable redundantProperty
--enable singlePropertyPerLine
--enable sortSwitchCases
--enable throwingTests
--enable unusedPrivateDeclarations
--enable urlMacro
--enable wrapConditionalBodies
--enable wrapEnumCases
--enable wrapMultilineConditionalAssignment
Expand All @@ -37,16 +42,16 @@

# Rule options
--commas always
--hexliteralcase lowercase
--hex-literal-case lowercase
--ifdef no-indent
--importgrouping testable-last
--import-grouping testable-last
--indent tab
--indentstrings true
--inferredtypes always
--lineaftermarks false
--markcategories false
--organizationmode type
--propertytypes inferred
--indent-strings true
--inferred-types always
--line-after-marks false
--mark-categories false
--organization-mode type
--property-types inferred
--ranges no-space
--tabwidth 2
--wrapternary before-operators
--tab-width 2
--wrap-ternary before-operators
11 changes: 5 additions & 6 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/Quick/Nimble.git", from: "13.7.1"),
.package(url: "https://github.com/Quick/Quick.git", exact: "7.5.0"),
.package(url: "https://github.com/apple/swift-argument-parser.git", branch: "main"),
.package(url: "https://github.com/apple/swift-atomics.git", branch: "main"),
.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.6.1"),
.package(url: "https://github.com/apple/swift-atomics.git", revision: "239a74d140e0a9dd84fde414260a8c062480550c"),
.package(url: "https://github.com/funky-monkey/IsoCountryCodes.git", from: "1.0.3"),
.package(url: "https://github.com/mxcl/Version.git", from: "2.1.0"),
.package(url: "https://github.com/mxcl/Version.git", from: "2.2.0"),
],
targets: [
.executableTarget(
Expand Down
3 changes: 2 additions & 1 deletion Tests/masTests/Models/SearchResultSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ final class SearchResultSpec: QuickSpec {
consequencesOf(
try JSONDecoder() // swiftformat:disable indent
.decode(SearchResult.self, from: Data(fromResource: "search/things-that-go-bump.json"))
.trackId // swiftformat:enable indent
.trackId
// swiftformat:enable indent
)
)
== ValuedConsequences(1_472_954_003)
Expand Down