Skip to content

Commit a914b09

Browse files
authored
Merge pull request #73 from Nexters/develop
🚀 1.0.0 develop -> main #71
2 parents 8a53973 + 448ca1f commit a914b09

File tree

390 files changed

+20166
-0
lines changed

Some content is hidden

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

390 files changed

+20166
-0
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## 티켓 링크
2+
3+
## 구현내용
4+
5+
## 고민사항
6+
7+
## 기타

.github/auto_assign.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
addAssignees: author
2+
addReviewers: true
3+
4+
reviewers:
5+
- GomHyeok
6+
- TTOzzi
7+
8+
numberOfReviewers: 0

.github/workflows/auto-assign.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: 'Auto Assign'
2+
on:
3+
pull_request:
4+
types: [opened, ready_for_review]
5+
6+
jobs:
7+
assign:
8+
name: Auto assign
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Auto assign
12+
uses: kentaro-m/[email protected]

.github/workflows/buildTest.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: CI - Build & Test (Tuist)
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
- develop
8+
workflow_dispatch:
9+
10+
jobs:
11+
build-and-test:
12+
runs-on: macos-15
13+
14+
steps:
15+
- name: Checkout Repo
16+
uses: actions/checkout@v4
17+
18+
- name: Select Xcode 16.4
19+
run: sudo xcode-select -s /Applications/Xcode_16.4.app
20+
21+
- name: Setup mise & install Tuist
22+
uses: jdx/mise-action@v2
23+
24+
- name: Extract Tuist version from mise.toml
25+
id: get-tuist-version
26+
run: |
27+
TUIST_VERSION=$(grep '^tuist' mise.toml | sed 's/.*= "\(.*\)"/\1/')
28+
echo "TUIST_VERSION=$TUIST_VERSION" >> $GITHUB_ENV
29+
30+
- name: Install Tuist
31+
run: mise install tuist@${{ env.TUIST_VERSION }}
32+
33+
- name: Activate Tuist
34+
run: |
35+
mise use -g tuist@${{ env.TUIST_VERSION }}
36+
tuist version
37+
38+
- name: Install Dependencies with Tuist
39+
run: |
40+
tuist install
41+
42+
- name: Build
43+
run: |
44+
tuist generate
45+
tuist build

.github/workflows/format.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Format
2+
3+
# 실행 조건 = push
4+
on:
5+
push:
6+
branches:
7+
- develop
8+
9+
# 기존 실행중인 work_flow 중지
10+
concurrency:
11+
group: format-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
swift_format:
16+
name: swift-format
17+
runs-on: macos-15
18+
permissions:
19+
contents: write
20+
21+
steps:
22+
- uses: actions/checkout@v4
23+
24+
- name: Select Xcode 16.4
25+
run: sudo xcode-select -s /Applications/Xcode_16.4.app
26+
27+
# swift-format 실행
28+
# .swift 파일에 대해서만 실행
29+
- name: Run swift-format
30+
run: swift format -irp .
31+
32+
- uses: stefanzweifel/git-auto-commit-action@v5
33+
with:
34+
commit_message: '[Auto] Run swift-format'
35+
branch: 'develop'

.gitignore

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ playground.xcworkspace
4949

5050
Carthage/Build/
5151

52+
### Projects ###
53+
*.xcodeproj
54+
*.xcworkspace
55+
5256
# fastlane
5357
#
5458
# It is recommended to not store the screenshots in the git repo.
@@ -60,3 +64,17 @@ fastlane/report.xml
6064
fastlane/Preview.html
6165
fastlane/screenshots/**/*.png
6266
fastlane/test_output
67+
68+
### Tuist derived files ###
69+
graph.dot
70+
Derived/
71+
72+
### Tuist managed dependencies ###
73+
Tuist/.build
74+
/.build
75+
76+
# DS_Store
77+
.DS_Store
78+
._.DS_Store
79+
**/.DS_Store
80+
**/._.DS_Store

App/Project.swift

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
import ProjectDescription
2+
import ProjectDescriptionHelpers
3+
4+
let project = AppLayer().project
5+
6+
struct AppLayer: Layer {
7+
8+
var name: String { "Satto" }
9+
var options: Project.Options { .options(automaticSchemesOptions: .disabled) }
10+
var targets: [Target] {
11+
[
12+
.createTarget(
13+
name: name,
14+
product: .app,
15+
bundleId: "com.hanbang.satto",
16+
infoPlist: .extendingDefault(
17+
with: [
18+
"CFBundleDisplayName": "$(APP_NAME)",
19+
"CFBundleShortVersionString": "$(MARKETING_VERSION)",
20+
"CFBundleVersion": "$(CURRENT_PROJECT_VERSION)",
21+
"ITSAppUsesNonExemptEncryption": false,
22+
"UILaunchStoryboardName": "LaunchScreen",
23+
"UISupportedInterfaceOrientations": [
24+
"UIInterfaceOrientationPortrait"
25+
],
26+
"UIApplicationSceneManifest": [
27+
"UIApplicationSupportsMultipleScenes": false,
28+
"UISceneConfigurations": [
29+
"UIWindowSceneSessionRoleApplication": [
30+
[
31+
"UISceneConfigurationName": "Default Configuration",
32+
"UISceneDelegateClassName": "$(PRODUCT_MODULE_NAME).SceneDelegate",
33+
]
34+
]
35+
],
36+
],
37+
]
38+
),
39+
sources: ["Sources/**"],
40+
resources: ["Resources/**"],
41+
dependencies: [.project(target: "FeatureLayer", path: "../Feature")],
42+
settings: .settings(
43+
base: [
44+
"PRODUCT_BUNDLE_IDENTIFIER": "$(APP_IDENTIFIER)",
45+
"TARGETED_DEVICE_FAMILY": "1",
46+
"MARKETING_VERSION": "1.0.0",
47+
"CURRENT_PROJECT_VERSION": "0",
48+
],
49+
configurations: [
50+
.debug(
51+
name: .debug,
52+
settings: [
53+
"APP_IDENTIFIER": "com.hanbang.satto.debug",
54+
"APP_NAME": "사또 Debug",
55+
"OTHER_SWIFT_FLAGS": "$(inherited) -DDEBUG",
56+
]
57+
),
58+
.release(
59+
name: .release,
60+
settings: [
61+
"APP_IDENTIFIER": "com.hanbang.satto",
62+
"APP_NAME": "사또",
63+
"OTHER_SWIFT_FLAGS": "$(inherited) -DRELEASE",
64+
]
65+
),
66+
]
67+
)
68+
)
69+
]
70+
}
71+
var schemes: [Scheme] {
72+
[
73+
.scheme(
74+
name: "\(name)-debug",
75+
buildAction: .buildAction(targets: [.project(path: "./", target: name)]),
76+
runAction: .runAction(configuration: .debug),
77+
archiveAction: .archiveAction(configuration: .debug),
78+
profileAction: .profileAction(configuration: .debug),
79+
analyzeAction: .analyzeAction(configuration: .debug)
80+
),
81+
.scheme(
82+
name: "\(name)-release",
83+
buildAction: .buildAction(targets: [.project(path: "./", target: name)]),
84+
runAction: .runAction(configuration: .release),
85+
archiveAction: .archiveAction(configuration: .release),
86+
profileAction: .profileAction(configuration: .release),
87+
analyzeAction: .analyzeAction(configuration: .release)
88+
),
89+
]
90+
}
91+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"colors" : [
3+
{
4+
"idiom" : "universal"
5+
}
6+
],
7+
"info" : {
8+
"author" : "xcode",
9+
"version" : 1
10+
}
11+
}
Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Icon-40.png",
5+
"idiom" : "iphone",
6+
"scale" : "2x",
7+
"size" : "20x20"
8+
},
9+
{
10+
"filename" : "Icon-60.png",
11+
"idiom" : "iphone",
12+
"scale" : "3x",
13+
"size" : "20x20"
14+
},
15+
{
16+
"filename" : "Icon-58.png",
17+
"idiom" : "iphone",
18+
"scale" : "2x",
19+
"size" : "29x29"
20+
},
21+
{
22+
"filename" : "Icon-87.png",
23+
"idiom" : "iphone",
24+
"scale" : "3x",
25+
"size" : "29x29"
26+
},
27+
{
28+
"filename" : "Icon-80.png",
29+
"idiom" : "iphone",
30+
"scale" : "2x",
31+
"size" : "40x40"
32+
},
33+
{
34+
"filename" : "Icon-120.png",
35+
"idiom" : "iphone",
36+
"scale" : "3x",
37+
"size" : "40x40"
38+
},
39+
{
40+
"filename" : "Icon-120 1.png",
41+
"idiom" : "iphone",
42+
"scale" : "2x",
43+
"size" : "60x60"
44+
},
45+
{
46+
"filename" : "Icon-180.png",
47+
"idiom" : "iphone",
48+
"scale" : "3x",
49+
"size" : "60x60"
50+
},
51+
{
52+
"filename" : "Icon-20.png",
53+
"idiom" : "ipad",
54+
"scale" : "1x",
55+
"size" : "20x20"
56+
},
57+
{
58+
"filename" : "Icon-40 1.png",
59+
"idiom" : "ipad",
60+
"scale" : "2x",
61+
"size" : "20x20"
62+
},
63+
{
64+
"filename" : "Icon-29.png",
65+
"idiom" : "ipad",
66+
"scale" : "1x",
67+
"size" : "29x29"
68+
},
69+
{
70+
"filename" : "Icon-58 1.png",
71+
"idiom" : "ipad",
72+
"scale" : "2x",
73+
"size" : "29x29"
74+
},
75+
{
76+
"filename" : "Icon-40 2.png",
77+
"idiom" : "ipad",
78+
"scale" : "1x",
79+
"size" : "40x40"
80+
},
81+
{
82+
"filename" : "Icon-80 1.png",
83+
"idiom" : "ipad",
84+
"scale" : "2x",
85+
"size" : "40x40"
86+
},
87+
{
88+
"filename" : "Icon-76.png",
89+
"idiom" : "ipad",
90+
"scale" : "1x",
91+
"size" : "76x76"
92+
},
93+
{
94+
"filename" : "Icon-152.png",
95+
"idiom" : "ipad",
96+
"scale" : "2x",
97+
"size" : "76x76"
98+
},
99+
{
100+
"filename" : "Icon-167.png",
101+
"idiom" : "ipad",
102+
"scale" : "2x",
103+
"size" : "83.5x83.5"
104+
},
105+
{
106+
"filename" : "Icon-1024.png",
107+
"idiom" : "ios-marketing",
108+
"scale" : "1x",
109+
"size" : "1024x1024"
110+
}
111+
],
112+
"info" : {
113+
"author" : "xcode",
114+
"version" : 1
115+
}
116+
}
311 KB
Loading

0 commit comments

Comments
 (0)