Skip to content

Commit 1341a9c

Browse files
committed
Merge release/2.0.0 into main (#85)
2 parents d9d4996 + 69097c4 commit 1341a9c

File tree

1,286 files changed

+5723
-5148
lines changed

Some content is hidden

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

1,286 files changed

+5723
-5148
lines changed

โ€Ž.gitignore

Lines changed: 23 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,10 @@
1-
2-
# Created by https://www.toptal.com/developers/gitignore/api/xcode,macos,linux,windows,sublimetext,swift,swiftpackagemanager,swiftpm,objective-c
3-
# Edit at https://www.toptal.com/developers/gitignore?templates=xcode,macos,linux,windows,sublimetext,swift,swiftpackagemanager,swiftpm,objective-c
4-
5-
### Linux ###
6-
*~
7-
8-
# temporary files which can be created if a process still has a handle open of a deleted file
9-
.fuse_hidden*
10-
11-
# KDE directory preferences
12-
.directory
13-
14-
# Linux trash folder which might appear on any partition or disk
15-
.Trash-*
16-
17-
# .nfs files are created when an open file is removed but is still being accessed
18-
.nfs*
19-
201
### macOS ###
212
# General
223
.DS_Store
234
.AppleDouble
245
.LSOverride
256

26-
# Icon must end with two \r
7+
# Icon must end with two
278
Icon
289

2910
# Thumbnails
@@ -45,18 +26,22 @@ Network Trash Folder
4526
Temporary Items
4627
.apdisk
4728

29+
### Xcode ###
4830
# Xcode
4931
#
5032
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
5133

52-
*.xcuserstate
53-
*.xcconfig
34+
## User settings
35+
xcuserdata/
5436

55-
## Build generated
37+
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
38+
*.xcscmblueprint
39+
*.xccheckout
40+
41+
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
5642
build/
5743
DerivedData/
58-
59-
## Various settings
44+
*.moved-aside
6045
*.pbxuser
6146
!default.pbxuser
6247
*.mode1v3
@@ -65,86 +50,21 @@ DerivedData/
6550
!default.mode2v3
6651
*.perspectivev3
6752
!default.perspectivev3
68-
xcuserdata/
69-
70-
## Other
71-
*.moved-aside
72-
*.xccheckout
73-
*.xcscmblueprint
74-
75-
## Obj-C/Swift specific
76-
*.hmap
77-
*.ipa
78-
*.dSYM.zip
79-
*.dSYM
8053

81-
## Playgrounds
82-
timeline.xctimeline
83-
playground.xcworkspace
54+
### Xcode Patch ###
55+
*.xcodeproj/*
56+
!*.xcodeproj/project.pbxproj
57+
!*.xcodeproj/xcshareddata/
58+
!*.xcworkspace/contents.xcworkspacedata
59+
/*.gcno
8460

85-
# Swift Package Manager
86-
#
87-
Packages
88-
.build/
89-
xcuserdata
90-
DerivedData/
61+
### Projects ###
9162
*.xcodeproj
63+
*.xcworkspace
9264

93-
# CocoaPods
94-
#
95-
# We recommend against adding the Pods directory to your .gitignore. However
96-
# you should judge for yourself, the pros and cons are mentioned at:
97-
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
98-
#
99-
# Pods/
100-
101-
# Carthage
102-
#
103-
# Add this line if you want to avoid checking in source code from Carthage dependencies.
104-
# Carthage/Checkouts
105-
106-
Carthage/Build
107-
108-
# fastlane
109-
#
110-
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
111-
# screenshots whenever they are needed.
112-
# For more information about the recommended setup visit:
113-
# https://docs.fastlane.tools/best-practices/source-control/#source-control
114-
115-
fastlane/report.xml
116-
fastlane/Preview.html
117-
fastlane/screenshots
118-
fastlane/test_output
119-
120-
### SublimeText ###
121-
# Cache files for Sublime Text
122-
*.tmlanguage.cache
123-
*.tmPreferences.cache
124-
*.stTheme.cache
125-
126-
# Workspace files are user-specific
127-
*.sublime-workspace
128-
129-
# Project files should be checked into the repository, unless a significant
130-
# proportion of contributors will probably not be using Sublime Text
131-
# *.sublime-project
132-
133-
# SFTP configuration file
134-
sftp-config.json
135-
136-
# Package control specific files
137-
Package Control.last-run
138-
Package Control.ca-list
139-
Package Control.ca-bundle
140-
Package Control.system-ca-bundle
141-
Package Control.cache/
142-
Package Control.ca-certs/
143-
Package Control.merged-ca-bundle
144-
Package Control.user-ca-bundle
145-
oscrypto-ca-bundle.crt
146-
bh_unicode_properties.cache
65+
### Tuist derived files ###
66+
graph.dot
67+
Derived/
14768

148-
# Sublime-github package stores a github token in this file
149-
# https://packagecontrol.io/packages/sublime-github
150-
GitHub.sublime-settings
69+
### Tuist managed dependencies ###
70+
Tuist/.build

โ€Ž.mise.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[tools]
2+
tuist = "4.33.0"
Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,37 @@
11
included:
22
- Animal-Crossing-Wiki # ํ”„๋กœ์ ํŠธ ์ด๋ฆ„
3+
34
excluded: # ๋ฆฐํŠธ ๊ณผ์ •์—์„œ ๋ฌด์‹œํ•  ํŒŒ์ผ ๊ฒฝ๋กœ. `included`๋ณด๋‹ค ์šฐ์„ ์ˆœ์œ„ ๋†’์Œ
4-
- Animal-Crossing-Wiki/Resources/AppDelegate.swift
5-
- Animal-Crossing-Wiki/Resources/SceneDelegate.swift
6-
- Animal-Crossing-Wiki/Sources/Utility/Items.swift
7-
type_body_length: # ํƒ€์ž… ๊ธธ์ด
8-
warning: 200
9-
error: 250
5+
- Animal-Crossing-Wiki/Projects/App/Sources/AppDelegate.swift
6+
- Animal-Crossing-Wiki/Projects/App/Sources/SceneDelegate.swift
7+
- Animal-Crossing-Wiki/Projects/App/Sources/Utility/Items.swift
8+
- Tuist
9+
- Workspace.swift
10+
- Animal-Crossing-Wiki/Projects/*/Project.swift
11+
1012
identifier_name:
1113
min_length:
1214
- 2 # only min_length
1315
error: 4 # only error
1416
excluded: # ์ œ์™ธํ•  ๋ฌธ์ž์—ด ๋ชฉ๋ก ์‚ฌ์šฉ
1517
- a
1618
- b
19+
1720
function_body_length:
1821
warning: 150
1922
error: 300
23+
2024
type_body_length:
2125
- 300 # warning
2226
- 500
27+
2328
file_length:
2429
warning: 500
2530
error: 1200
31+
2632
line_length:
2733
warning: 140
34+
2835
disabled_rules: # ์‹คํ–‰์—์„œ ์ œ์™ธํ•  ๋ฃฐ ์‹๋ณ„์ž๋“ค
2936
- colon
3037
- control_statement
@@ -33,6 +40,7 @@ disabled_rules: # ์‹คํ–‰์—์„œ ์ œ์™ธํ•  ๋ฃฐ ์‹๋ณ„์ž๋“ค
3340
- cyclomatic_complexity
3441
- void_function_in_ternary
3542
- comment_spacing
43+
3644
opt_in_rules: # ์ผ๋ถ€ ๋ฃฐ์€ ์˜ตํŠธ ์ธ ํ˜•ํƒœ๋กœ ์ œ๊ณต
3745
- empty_count
3846
- conditional_returns_on_newline

0 commit comments

Comments
ย (0)