Skip to content

Commit af47783

Browse files
hyunjuntylerhyunjuntyler
committed
Merge branch 'develop' into task/fix_swift_format
2 parents 63d0b76 + 792b7a9 commit af47783

File tree

21 files changed

+59
-59
lines changed

21 files changed

+59
-59
lines changed

‎.githooks/pre-push‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ FORMAT=$(which swiftformat)
66
# 설치 확인
77
if [[ -e "${FORMAT}" ]]; then
88
echo "🚀 SwiftFormat 시작..."
9-
echo "🔍 SwiftFormat 적용 경로: $(pwd)/Projects"
9+
echo "🔍 SwiftFormat 적용 경로: ./Projects"
1010
else
1111
echo "SwiftFormat이 존재하지 않습니다. 설치해주세요 ! 'brew install swiftformat'"
1212
exit 1

‎Projects/Domains/BaseDomain/Project.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ let project = Project.module(
88
.interface(module: .domain(.BaseDomain)),
99
.implements(module: .domain(.BaseDomain), dependencies: [
1010
.domain(target: .BaseDomain, type: .interface),
11-
.module(target: .FastNetwork)
11+
.module(target: .FastNetwork),
1212
]),
1313
.testing(module: .domain(.BaseDomain), dependencies: [
14-
.domain(target: .BaseDomain, type: .interface)
14+
.domain(target: .BaseDomain, type: .interface),
1515
]),
1616
.tests(module: .domain(.BaseDomain), dependencies: [
1717
.domain(target: .BaseDomain),
18-
.domain(target: .BaseDomain, type: .testing)
19-
])
18+
.domain(target: .BaseDomain, type: .testing),
19+
]),
2020
]
2121
)

‎Projects/Domains/BroadcastDomain/Project.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ let project = Project.module(
88
.interface(module: .domain(.BroadcastDomain)),
99
.implements(module: .domain(.BroadcastDomain), dependencies: [
1010
.domain(target: .BroadcastDomain, type: .interface),
11-
.domain(target: .BaseDomain)
11+
.domain(target: .BaseDomain),
1212
]),
1313
.testing(module: .domain(.BroadcastDomain), dependencies: [
14-
.domain(target: .BroadcastDomain, type: .interface)
14+
.domain(target: .BroadcastDomain, type: .interface),
1515
]),
1616
.tests(module: .domain(.BroadcastDomain), dependencies: [
1717
.domain(target: .BroadcastDomain),
18-
.domain(target: .BroadcastDomain, type: .testing)
19-
])
18+
.domain(target: .BroadcastDomain, type: .testing),
19+
]),
2020
]
2121
)

‎Projects/Domains/BroadcastDomain/Sources/Endpoint/BroadcastEndpoint.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ extension BroadcastEndpoint: Endpoint {
2424

2525
public var header: [String: String]? {
2626
[
27-
"Content-Type": "application/json"
27+
"Content-Type": "application/json",
2828
]
2929
}
3030

‎Projects/Domains/ChattingDomain/Sources/Endpoint/ChatEndpoint.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extension ChatEndpoint: Endpoint {
2626

2727
public var header: [String: String]? {
2828
[
29-
"Content-Type": "application/json"
29+
"Content-Type": "application/json",
3030
]
3131
}
3232

‎Projects/Domains/LiveStationDomain/Project.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ let project = Project.module(
88
.interface(module: .domain(.LiveStationDomain)),
99
.implements(module: .domain(.LiveStationDomain), dependencies: [
1010
.domain(target: .LiveStationDomain, type: .interface),
11-
.domain(target: .BaseDomain)
11+
.domain(target: .BaseDomain),
1212
]),
1313
.testing(module: .domain(.LiveStationDomain), dependencies: [
14-
.domain(target: .LiveStationDomain, type: .interface)
15-
])
14+
.domain(target: .LiveStationDomain, type: .interface),
15+
]),
1616
]
1717
)

‎Projects/Domains/LiveStationDomain/Sources/Endpoint/LiveStationEndpoint.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ extension LiveStationEndpoint: Endpoint {
3232
"x-ncp-apigw-timestamp": timestamp,
3333
"x-ncp-iam-access-key": config(key: .accessKey),
3434
"x-ncp-apigw-signature-v2": makeSignature(with: timestamp),
35-
"x-ncp-region_code": "KR"
35+
"x-ncp-region_code": "KR",
3636
]
3737
}
3838

@@ -75,16 +75,16 @@ extension LiveStationEndpoint: Endpoint {
7575
"cdnDomain": config(key: .cdnDomain),
7676
"profileId": config(key: .profileID),
7777
"cdnInstanceNo": config(key: .cdnInstanceNo),
78-
"regionType": "KOREA"
78+
"regionType": "KOREA",
7979
],
8080
"qualitySetId": 4430,
8181
"useDvr": true,
8282
"immediateOnAir": true,
8383
"record": [
84-
"type": "MANUAL_UPLOAD"
84+
"type": "MANUAL_UPLOAD",
8585
],
8686
"drmEnabledYn": false,
87-
"timemachineMin": 360
87+
"timemachineMin": 360,
8888
]
8989
)
9090

‎Projects/Features/AuthFeature/Project.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ let project = Project.module(
88
.interface(module: .feature(.AuthFeature)),
99
.implements(module: .feature(.AuthFeature), dependencies: [
1010
.feature(target: .AuthFeature, type: .interface),
11-
.feature(target: .BaseFeature)
11+
.feature(target: .BaseFeature),
1212
]),
1313
.tests(module: .feature(.AuthFeature), dependencies: [
14-
.feature(target: .AuthFeature)
14+
.feature(target: .AuthFeature),
1515
]),
1616
.demo(module: .feature(.AuthFeature), dependencies: [
17-
.feature(target: .AuthFeature)
18-
])
17+
.feature(target: .AuthFeature),
18+
]),
1919
]
2020
)

‎Projects/Features/BaseFeature/Project.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ let project = Project.module(
99
.implements(module: .feature(.BaseFeature), dependencies: [
1010
.feature(target: .BaseFeature, type: .interface),
1111
.userInterface(target: .DesignSystem),
12-
.module(target: .ThirdPartyLibModule)
12+
.module(target: .ThirdPartyLibModule),
1313
]),
1414
.testing(module: .feature(.BaseFeature), dependencies: [
15-
.feature(target: .BaseFeature, type: .interface)
15+
.feature(target: .BaseFeature, type: .interface),
1616
]),
1717
.tests(module: .feature(.BaseFeature), dependencies: [
1818
.feature(target: .BaseFeature),
19-
.feature(target: .BaseFeature, type: .testing)
19+
.feature(target: .BaseFeature, type: .testing),
2020
]),
2121
.demo(module: .feature(.BaseFeature), dependencies: [
2222
.feature(target: .BaseFeature),
23-
.feature(target: .BaseFeature, type: .testing)
24-
])
23+
.feature(target: .BaseFeature, type: .testing),
24+
]),
2525
]
2626
)

‎Projects/Features/LiveStreamFeature/Project.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ let project = Project.module(
66
name: ModulePaths.Feature.LiveStreamFeature.rawValue,
77
targets: [
88
.interface(module: .feature(.LiveStreamFeature), dependencies: [
9-
.feature(target: .BaseFeature, type: .interface)
9+
.feature(target: .BaseFeature, type: .interface),
1010
]),
1111
.implements(module: .feature(.LiveStreamFeature), dependencies: [
1212
.feature(target: .LiveStreamFeature, type: .interface),
1313
.feature(target: .BaseFeature),
1414
.domain(target: .LiveStationDomain, type: .interface),
1515
.domain(target: .BroadcastDomain, type: .interface),
16-
.module(target: .ChatSoketModule)
16+
.module(target: .ChatSoketModule),
1717
]),
1818
.tests(module: .feature(.LiveStreamFeature), dependencies: [
19-
.feature(target: .LiveStreamFeature)
19+
.feature(target: .LiveStreamFeature),
2020
]),
2121
.demo(module: .feature(.LiveStreamFeature), dependencies: [
2222
.feature(target: .LiveStreamFeature),
23-
.domain(target: .LiveStationDomain, type: .interface)
24-
])
23+
.domain(target: .LiveStationDomain, type: .interface),
24+
]),
2525
]
2626
)

0 commit comments

Comments
 (0)