Skip to content

Commit 540a35e

Browse files
committed
Merge branch 'dev'
2 parents e5ce53b + c8f8c5c commit 540a35e

File tree

506 files changed

+9054
-5737
lines changed

Some content is hidden

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

506 files changed

+9054
-5737
lines changed

.github/ISSUE_TEMPLATE/cn_feature_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: 功能建议
22
description: 功能建议
3-
title: "🚀 功能建议:{{请填写标题,不要留空}}"
3+
title: "🚀 功能建议:请填写标题,不要留空"
44
labels: ["enhancement"]
55

66
body:

.github/ISSUE_TEMPLATE/en_feature_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Feature request
22
description: Request a new feature
3-
title: "🚀 Feature Request: {{Please fill in the title, don't leave it blank}}"
3+
title: "🚀 Feature Request: Please fill in the title, don't leave it blank"
44
labels: ["enhancement"]
55

66
body:

.github/ISSUE_TEMPLATE/others.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

.swiftformat

Lines changed: 107 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,108 @@
1-
# https://github.com/nicklockwood/SwiftFormat/blob/main/Rules.md
1+
# SwiftFormat config compliant with Google Swift Guideline
2+
# https://google.github.io/swift/#control-flow-statements
23

3-
# file options
4-
--exclude Pods
4+
# Specify version used in a project
5+
6+
--swiftversion 5.9
7+
8+
# Rules explicitly required by the guideline
9+
10+
--rules \
11+
blankLinesAroundMark, \
12+
blankLinesAtEndOfScope, \
13+
blankLinesAtStartOfScope, \
14+
blankLinesBetweenScopes, \
15+
braces, \
16+
consecutiveBlankLines, \
17+
consecutiveSpaces, \
18+
duplicateImports, \
19+
elseOnSameLine, \
20+
emptyBraces, \
21+
enumNamespaces, \
22+
extensionAccessControl, \
23+
hoistPatternLet, \
24+
indent, \
25+
leadingDelimiters, \
26+
linebreakAtEndOfFile, \
27+
markTypes, \
28+
organizeDeclarations, \
29+
redundantInit, \
30+
redundantParens, \
31+
redundantPattern, \
32+
redundantRawValues, \
33+
redundantType, \
34+
redundantVoidReturnType, \
35+
semicolons, \
36+
sortImports, \
37+
sortSwitchCases, \
38+
spaceAroundBraces, \
39+
spaceAroundBrackets, \
40+
spaceAroundComments, \
41+
spaceAroundGenerics, \
42+
spaceAroundOperators, \
43+
spaceAroundParens, \
44+
spaceInsideBraces, \
45+
spaceInsideBrackets, \
46+
spaceInsideComments, \
47+
spaceInsideGenerics, \
48+
spaceInsideParens, \
49+
todos, \
50+
trailingClosures, \
51+
trailingCommas, \
52+
trailingSpace, \
53+
typeSugar, \
54+
void, \
55+
wrap, \
56+
wrapArguments, \
57+
wrapAttributes, \
58+
#
59+
#
60+
# Additional rules not mentioned in the guideline, but helping to keep the codebase clean
61+
# Quoting the guideline:
62+
# Common themes among the rules in this section are:
63+
# avoid redundancy, avoid ambiguity, and prefer implicitness over explicitness
64+
# unless being explicit improves readability and/or reduces ambiguity.
65+
#
66+
#
67+
andOperator, \
68+
isEmpty, \
69+
redundantBackticks, \
70+
redundantBreak, \
71+
redundantExtensionACL, \
72+
redundantGet, \
73+
redundantLetError, \
74+
redundantNilInit, \
75+
redundantObjc, \
76+
redundantReturn, \
77+
redundantSelf, \
78+
strongifiedSelf
79+
80+
81+
# Options for basic rules
82+
83+
--extensionacl on-declarations
84+
--funcattributes prev-line
85+
--indent 4
86+
--maxwidth 120
87+
--typeattributes prev-line
88+
--varattributes same-line
89+
--voidtype tuple
90+
--wraparguments before-first
91+
--wrapparameters before-first
92+
--wrapcollections before-first
93+
--wrapreturntype if-multiline
94+
--wrapconditions after-first
95+
96+
# Option for additional rules
97+
98+
--self init-only
99+
100+
# Excluded folders
101+
102+
--exclude Pods,**/UNTESTED_TODO,vendor,fastlane
103+
104+
# https://github.com/NoemiRozpara/Google-SwiftFormat-Config
105+
106+
# Following is by Lava
107+
108+
--ifdef no-indent

.swiftlint.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
#
2+
# Copyright (c) 2019 Google Inc.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
disabled_rules:
18+
- multiple_closures_with_trailing_closure
19+
- nesting
20+
- void_return
21+
- shorthand_operator
22+
- cyclomatic_complexity
23+
- force_cast
24+
- force_try
25+
- large_tuple
26+
27+
opt_in_rules:
28+
- convenience_type
29+
# - no_magic_numbers
30+
# - force_unwrapping
31+
32+
line_length:
33+
warning: 120
34+
ignores_comments: true
35+
function_body_length:
36+
warning: 120
37+
error: 400
38+
type_body_length:
39+
warning: 500
40+
error: 1200
41+
file_length:
42+
warning: 900
43+
error: 1600
44+
type_name:
45+
min_length: 3
46+
max_length:
47+
warning: 50
48+
error: 50
49+
identifier_name:
50+
min_length: 3
51+
excluded: # excluded via string array
52+
- id
53+
- URL
54+
- url
55+
- x
56+
- y
57+
- i
58+
- j
59+
- Defaults # Make use of `SwiftyUserDefaults`
60+
reporter: "xcode" # reporter type (xcode, json, csv, checkstyle, junit, html, emoji)
61+
trailing_comma:
62+
severity: warning
63+
mandatory_comma: true
64+
65+
excluded:
66+
- "Build/*"
67+
- "Pods"
68+
- "**/UNTESTED_TODO"
69+
- "vendor"
70+
- "fastlane"
71+
- ".build"

0 commit comments

Comments
 (0)