Skip to content

Commit 9cc34f1

Browse files
committed
setup SwiftLint and fixed all swiftlint errors and waning
1 parent d951598 commit 9cc34f1

File tree

143 files changed

+1557
-1302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+1557
-1302
lines changed

.swiftlint.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
disabled_rules:
2+
- vertical_parameter_alignment_on_call
3+
- weak_delegate
4+
- vertical_parameter_alignment
5+
- closure_parameter_position
6+
- todo
7+
- multiple_closures_with_trailing_closure
8+
opt_in_rules:
9+
- empty_count
10+
- explicit_init
11+
- closure_spacing
12+
- overridden_super_call
13+
- redundant_nil_coalescing
14+
- private_outlet
15+
- nimble_operator
16+
- operator_usage_whitespace
17+
- closure_end_indentation
18+
- first_where
19+
- prohibited_super_call
20+
- fatal_error_message
21+
- unneeded_parentheses_in_closure_argument
22+
- pattern_matching_keywords
23+
- array_init
24+
- literal_expression_end_indentation
25+
- joined_default_parameter
26+
- contains_over_first_not_nil
27+
- override_in_extension
28+
- private_action
29+
- quick_discouraged_call
30+
- quick_discouraged_focused_test
31+
- quick_discouraged_pending_test
32+
- single_test_class
33+
- sorted_first_last
34+
35+
warning_threshold: 1
36+
37+
line_length: 120
38+
39+
type_body_length:
40+
- 300 # warning
41+
- 300 # error
42+
43+
file_length:
44+
warning: 400 # warning
45+
error: 400 # error
46+
47+
identifier_name:
48+
min_length:
49+
error: 2
50+
max_length:
51+
error: 50
52+
excluded:
53+
- id
54+
- _id

Addame.xcodeproj/project.pbxproj

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
C3E50C98261B5DFA00285977 /* Sources */,
106106
C3E50C99261B5DFA00285977 /* Frameworks */,
107107
C3E50C9A261B5DFA00285977 /* Resources */,
108+
C3F9CB0A2678E4540007F6B9 /* SwiftLint */,
108109
);
109110
buildRules = (
110111
);
@@ -162,6 +163,27 @@
162163
};
163164
/* End PBXResourcesBuildPhase section */
164165

166+
/* Begin PBXShellScriptBuildPhase section */
167+
C3F9CB0A2678E4540007F6B9 /* SwiftLint */ = {
168+
isa = PBXShellScriptBuildPhase;
169+
buildActionMask = 2147483647;
170+
files = (
171+
);
172+
inputFileListPaths = (
173+
);
174+
inputPaths = (
175+
);
176+
name = SwiftLint;
177+
outputFileListPaths = (
178+
);
179+
outputPaths = (
180+
);
181+
runOnlyForDeploymentPostprocessing = 0;
182+
shellPath = /bin/sh;
183+
shellScript = "if which swiftlint >/dev/null; then\n swiftlint --fix --config \".swiftlint.yml\" && swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
184+
};
185+
/* End PBXShellScriptBuildPhase section */
186+
165187
/* Begin PBXSourcesBuildPhase section */
166188
C3E50C98261B5DFA00285977 /* Sources */ = {
167189
isa = PBXSourcesBuildPhase;

Addame.xcworkspace/xcshareddata/swiftpm/Package.resolved

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

Addame/Addame/Package.swift

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let package = Package(
2424
.library(name: "RemoteNotificationsClient", targets: ["RemoteNotificationsClient"]),
2525
.library(name: "UIApplicationClient", targets: ["UIApplicationClient"]),
2626
.library(name: "UserDefaultsClient", targets: ["UserDefaultsClient"]),
27-
27+
2828
.library(name: "AttachmentClient", targets: ["AttachmentClient"]),
2929
.library(name: "AttachmentClientLive", targets: ["AttachmentClientLive"]),
3030
.library(name: "AuthClient", targets: ["AuthClient"]),
@@ -44,7 +44,7 @@ let package = Package(
4444
.library(name: "UserClientLive", targets: ["UserClientLive"]),
4545
.library(name: "WebsocketClient", targets: ["WebsocketClient"]),
4646
.library(name: "WebsocketClientLive", targets: ["WebsocketClientLive"]),
47-
47+
4848
// Views
4949
.library(name: "AuthenticationView", targets: ["AuthenticationView"]),
5050
.library(name: "ChatView", targets: ["ChatView"]),
@@ -55,7 +55,7 @@ let package = Package(
5555
.library(name: "ProfileView", targets: ["ProfileView"]),
5656
.library(name: "TabsView", targets: ["TabsView"]),
5757
.library(name: "SettingsView", targets: ["SettingsView"]),
58-
58+
5959
// Helpers
6060
.library(name: "NotificationHelpers", targets: ["NotificationHelpers"]),
6161
.library(name: "SwiftUIHelpers", targets: ["SwiftUIHelpers"]),
@@ -66,11 +66,11 @@ let package = Package(
6666
dependencies: [
6767
.package(name: "AWSSDKSwift", url: "https://github.com/swift-aws/aws-sdk-swift.git", from: "4.9.0"),
6868
.package(url: "https://github.com/marmelroy/PhoneNumberKit", .upToNextMajor(from: "3.3.3")),
69-
.package(url: "https://github.com/pointfreeco/swift-composable-architecture.git",from: "0.17.0"),
69+
.package(url: "https://github.com/pointfreeco/swift-composable-architecture.git", from: "0.17.0"),
7070
.package(url: "https://github.com/pointfreeco/composable-core-location", from: "0.1.0"),
7171
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "0.1.0"),
7272
.package(url: "https://github.com/AddaMeSPB/CombineContacts.git", from: "1.0.0"),
73-
.package(url: "https://github.com/AddaMeSPB/HttpRequest.git", from: "1.0.1"),
73+
.package(url: "https://github.com/AddaMeSPB/HttpRequest.git", from: "1.0.1")
7474
],
7575

7676
targets: [
@@ -81,9 +81,9 @@ let package = Package(
8181
"UserNotificationClient", "RemoteNotificationsClient", "NotificationHelpers",
8282
"AuthClient", "AuthClientLive", "AttachmentClient", "ChatClient", "ContactClient",
8383
"ConversationClient", "EventClient", "UserClient", "WebsocketClient",
84-
84+
8585
"EventView", "ConversationsView", "ProfileView", "TabsView", "AuthenticationView",
86-
"SettingsView",
86+
"SettingsView"
8787
]),
8888

8989
.testTarget(
@@ -118,35 +118,35 @@ let package = Package(
118118
dependencies: [
119119
.product(name: "ComposableArchitecture", package: "swift-composable-architecture")
120120
]),
121-
121+
122122
.target(
123123
name: "UserNotificationClient",
124124
dependencies: [
125125
.product(name: "ComposableArchitecture", package: "swift-composable-architecture")
126126
]),
127-
127+
128128
.target(
129129
name: "UIApplicationClient",
130130
dependencies: [
131131
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
132-
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
132+
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay")
133133
]
134134
),
135135

136136
.target(
137137
name: "UserDefaultsClient",
138138
dependencies: [
139139
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
140-
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
140+
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay")
141141
]
142142
),
143-
143+
144144
.target(
145145
name: "CoreDataClient",
146146
dependencies: [
147-
"CoreDataStore", "ContactClient", "ContactClientLive", "SharedModels",
147+
"CoreDataStore", "ContactClient", "ContactClientLive", "SharedModels"
148148
]),
149-
149+
150150
.target(
151151
name: "AttachmentClient",
152152
dependencies: [
@@ -204,24 +204,23 @@ let package = Package(
204204
name: "UserClient",
205205
dependencies: ["SharedModels", "HttpRequest", "KeychainService", "InfoPlist"]),
206206
.target(name: "UserClientLive", dependencies: ["UserClient"]),
207-
207+
208208
.target(
209209
name: "WebsocketClient",
210210
dependencies: ["FoundationExtension", "HttpRequest", "SharedModels", "InfoPlist", "KeychainService"]),
211211
.target(
212212
name: "WebsocketClientLive",
213213
dependencies: ["WebsocketClient"]),
214-
214+
215215
// Views
216216
.target(
217217
name: "AuthenticationView",
218218
dependencies: [
219219
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
220220
"PhoneNumberKit", "SharedModels", "AuthClient", "KeychainService",
221-
"HttpRequest", "AuthClientLive",
221+
"HttpRequest", "AuthClientLive"
222222
]),
223223

224-
225224
.target(
226225
name: "TabsView",
227226
dependencies: [
@@ -244,7 +243,7 @@ let package = Package(
244243
"WebsocketClientLive"
245244
]
246245
),
247-
246+
248247
.target(
249248
name: "ConversationsView",
250249
dependencies: [
@@ -257,7 +256,7 @@ let package = Package(
257256
"ContactClient", "ContactClientLive", "ContactsView", "CoreDataClient"
258257
]
259258
),
260-
259+
261260
.target(
262261
name: "ContactsView",
263262
dependencies: [
@@ -268,7 +267,7 @@ let package = Package(
268267
"CoreDataStore", "CoreDataClient",
269268
"ChatView", "ComposableArchitectureHelpers"
270269
]),
271-
270+
272271
.target(
273272
name: "EventView",
274273
dependencies: [
@@ -278,18 +277,18 @@ let package = Package(
278277
"PathMonitorClient", "WebsocketClient", "ConversationClient",
279278
"SwiftUIExtension", "FoundationExtension", "AsyncImageLoder",
280279
"HttpRequest", "KeychainService", "ChatClient",
281-
"PathMonitorClientLive", "EventClientLive", "ComposableArchitectureHelpers",
280+
"PathMonitorClientLive", "EventClientLive", "ComposableArchitectureHelpers"
282281
]
283282
),
284-
283+
285284
.target(
286285
name: "EventForm",
287286
dependencies: [
288287
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
289-
"SharedModels", "EventClient", "InfoPlist",
288+
"SharedModels", "EventClient", "InfoPlist"
290289
]
291290
),
292-
291+
293292
.target(
294293
name: "ProfileView",
295294
dependencies: [
@@ -299,35 +298,35 @@ let package = Package(
299298
"SwiftUIExtension", "FoundationExtension", "AsyncImageLoder",
300299
"HttpRequest", "KeychainService", "AuthenticationView",
301300
"AttachmentClientLive", "AuthClientLive", "UserClientLive",
302-
"EventClientLive",
301+
"EventClientLive"
303302
]
304303
),
305-
304+
306305
.target(
307306
name: "SettingsView",
308307
dependencies: [
309308
"UIApplicationClient", "UserDefaultsClient",
310309
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
311-
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
310+
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay")
312311
]
313312
),
314-
313+
315314
// Helpers
316315
.target(
317316
name: "NotificationHelpers",
318317
dependencies: [
319318
"UserNotificationClient", "RemoteNotificationsClient",
320-
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
319+
.product(name: "ComposableArchitecture", package: "swift-composable-architecture")
321320
]
322321
),
323-
322+
324323
.target(name: "SwiftUIHelpers"),
325324
.target(name: "CombineHelpers"),
326325
.target(
327326
name: "ComposableArchitectureHelpers",
328327
dependencies: [
329328
.product(name: "ComposableArchitecture", package: "swift-composable-architecture")
330329
]
331-
),
330+
)
332331
]
333332
)

Addame/Addame/Sources/AppFeature/AppDelegate.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ struct AppDelegateEnvironment {
2424
var userNotifications: UserNotificationClient
2525
var remoteNotifications: RemoteNotificationsClient
2626
var authClient: AuthClient
27-
27+
2828
// #if DEBUG
2929
// static let failing = Self(
3030
// backgroundQueue: .failing("backgroundQueue"),
@@ -105,6 +105,6 @@ let appDelegateReducer = Reducer<
105105
// can set the user interface style.
106106
.subscribe(on: environment.mainQueue)
107107
.fireAndForget()
108-
108+
109109
}
110110
}

Addame/Addame/Sources/AppFeature/AppView.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ import AuthClient
1616
import AuthClientLive
1717

1818
public struct AppView: View {
19-
19+
2020
public init() {}
21-
21+
2222
@AppStorage("isAuthorized")
2323
public var isAuthorized: Bool = false
24-
24+
2525
static let tabsEnv = TabsEnvironment(
2626
backgroundQueue: .main,
2727
mainQueue: .main
2828
)
29-
29+
3030
static let tabsState = TabsState(
3131
selectedTab: .event,
3232
event: EventsState(),

0 commit comments

Comments
 (0)