Skip to content

Commit d0134ae

Browse files
MMMIIINMMMIIIN
authored
Merge pull request #387 from DeveloperAcademy-POSTECH/release/v1.2.1
[CHORE] v1.2.1 출시에 따른 main 브랜치 업데이트
2 parents d29008e + b34b64a commit d0134ae

Some content is hidden

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

42 files changed

+1014
-803
lines changed

‎.github/release.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# .github/release.yml
2+
3+
name-template: '애니또 v$RESOLVED_VERSION'
4+
tag-template: 'v$RESOLVED_VERSION'
5+
categories:
6+
- title: '🆕 새로운 기능이 추가되었어요!'
7+
label: '✨ Feature'
8+
- title: '🐞 자잘한 버그를 수정했습니다.'
9+
label: '🐞 Bugfix'
10+
- title: '🫶🏻 앱 사용성 개선에 힘썼습니다.'
11+
label: '🫶🏻 Improvement'
12+
- title: '🛠️ 더 나은 코드를 위해 노력하고 있습니다.'
13+
labels:
14+
- '🔨 Refactor'
15+
- '⚙️ Setting'
16+
- title: 'ETC'
17+
labels:
18+
- "*"
19+
change-template: '* $TITLE (#$NUMBER) by @$AUTHOR'
20+
change-title-escapes: '\<*_&#@`'
21+
version-resolver:
22+
major:
23+
labels:
24+
- 'Major'
25+
minor:
26+
labels:
27+
- 'Minor'
28+
patch:
29+
labels:
30+
- 'Patch'
31+
default: patch
32+
template: |
33+
$CHANGES

‎.github/workflows/release-drafter.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Release Drafter
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
update_release_draft:
13+
permissions:
14+
contents: write
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: release-drafter/release-drafter@v5
18+
with:
19+
config-name: release.yml
20+
env:
21+
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}

‎Manito/Manito.xcodeproj/project.pbxproj‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,13 @@
141141
CB5AE3E4285AAF7400382EA3 /* RoomInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5AE3E3285AAF7400382EA3 /* RoomInfoView.swift */; };
142142
CB5AE3E6285AB76800382EA3 /* PeopleInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB5AE3E5285AB76800382EA3 /* PeopleInfoView.swift */; };
143143
CB637A3B28595C1200FF1240 /* ParticipateRoomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB637A3A28595C1200FF1240 /* ParticipateRoomViewController.swift */; };
144+
CB6637E82959CBC60050BD04 /* SkeletonView in Frameworks */ = {isa = PBXBuildFile; productRef = CB6637E72959CBC60050BD04 /* SkeletonView */; };
144145
CB674C1C285966020063A6B7 /* InputInvitedCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB674C1B285966020063A6B7 /* InputInvitedCodeView.swift */; };
145146
CB674C2128596A310063A6B7 /* CheckRoomViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB674C2028596A310063A6B7 /* CheckRoomViewController.swift */; };
146147
CB7B23A828C4ECA8004A4CF3 /* Character.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB7B23A728C4ECA8004A4CF3 /* Character.swift */; };
147148
CB85DE1F28A76F3400399109 /* SettingDeveloperInfoHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB85DE1E28A76F3400399109 /* SettingDeveloperInfoHeaderView.swift */; };
148149
CB9592B22855C09A00847751 /* ManitoRoomCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB9592B12855C09A00847751 /* ManitoRoomCollectionCell.swift */; };
149-
CB9592B52855D52700847751 /* CommonMissonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB9592B42855D52700847751 /* CommonMissonView.swift */; };
150+
CB9592B52855D52700847751 /* CommonMissionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB9592B42855D52700847751 /* CommonMissionView.swift */; };
150151
CBA15C94285CE1A80051EDE2 /* ChooseCharacterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBA15C93285CE1A80051EDE2 /* ChooseCharacterViewController.swift */; };
151152
CBA4D7A42856CE9F0018BDC2 /* CreateRoomCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBA4D7A32856CE9F0018BDC2 /* CreateRoomCollectionViewCell.swift */; };
152153
CBA4D7A62856D48C0018BDC2 /* RoomStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBA4D7A52856D48C0018BDC2 /* RoomStateView.swift */; };
@@ -301,7 +302,7 @@
301302
CB7B23A728C4ECA8004A4CF3 /* Character.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Character.swift; sourceTree = "<group>"; };
302303
CB85DE1E28A76F3400399109 /* SettingDeveloperInfoHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingDeveloperInfoHeaderView.swift; sourceTree = "<group>"; };
303304
CB9592B12855C09A00847751 /* ManitoRoomCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManitoRoomCollectionCell.swift; sourceTree = "<group>"; };
304-
CB9592B42855D52700847751 /* CommonMissonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonMissonView.swift; sourceTree = "<group>"; };
305+
CB9592B42855D52700847751 /* CommonMissionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonMissionView.swift; sourceTree = "<group>"; };
305306
CBA15C93285CE1A80051EDE2 /* ChooseCharacterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChooseCharacterViewController.swift; sourceTree = "<group>"; };
306307
CBA4D7A32856CE9F0018BDC2 /* CreateRoomCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateRoomCollectionViewCell.swift; sourceTree = "<group>"; };
307308
CBA4D7A52856D48C0018BDC2 /* RoomStateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomStateView.swift; sourceTree = "<group>"; };
@@ -322,6 +323,7 @@
322323
isa = PBXFrameworksBuildPhase;
323324
buildActionMask = 2147483647;
324325
files = (
326+
CB6637E82959CBC60050BD04 /* SkeletonView in Frameworks */,
325327
39FFE33428F457AF008442EE /* FirebaseMessaging in Frameworks */,
326328
B50B1B0428596C900080992C /* SnapKit in Frameworks */,
327329
B50B1B0728596CB10080992C /* FSCalendar in Frameworks */,
@@ -390,7 +392,7 @@
390392
path = Login;
391393
sourceTree = "<group>";
392394
};
393-
39C957D328799A8200A04A2B /* Service */ = {
395+
39C957D328799A8200A04A2B /* Foundation */ = {
394396
isa = PBXGroup;
395397
children = (
396398
39C957D528799AB900A04A2B /* HTTPMethod.swift */,
@@ -401,7 +403,7 @@
401403
39C957F5287D9ED000A04A2B /* NetworkRequest.swift */,
402404
B5F31C5528BFA87700F61D0F /* Requestable.swift */,
403405
);
404-
path = Service;
406+
path = Foundation;
405407
sourceTree = "<group>";
406408
};
407409
39C957EA287AE45900A04A2B /* EndPoint */ = {
@@ -502,7 +504,6 @@
502504
B5F524C228519AA000614FF7 = {
503505
isa = PBXGroup;
504506
children = (
505-
39FFE33528F45E44008442EE /* GoogleService-Info.plist */,
506507
B55BCEB528D99F8600AF7E45 /* Settings.bundle */,
507508
B5F524CD28519AA000614FF7 /* Manito */,
508509
B5F524CC28519AA000614FF7 /* Products */,
@@ -676,6 +677,7 @@
676677
children = (
677678
39E6321328BDE59C00CFC6C4 /* Manito.entitlements */,
678679
B5F524DC28519AA100614FF7 /* Info.plist */,
680+
39FFE33528F45E44008442EE /* GoogleService-Info.plist */,
679681
B5F524CE28519AA000614FF7 /* AppDelegate.swift */,
680682
B5F524D028519AA000614FF7 /* SceneDelegate.swift */,
681683
);
@@ -768,7 +770,7 @@
768770
397A241528BA519200454E4F /* Protocol */,
769771
397A241128BA513E00454E4F /* API */,
770772
39C957EA287AE45900A04A2B /* EndPoint */,
771-
39C957D328799A8200A04A2B /* Service */,
773+
39C957D328799A8200A04A2B /* Foundation */,
772774
B5F525472855D01200614FF7 /* Models */,
773775
);
774776
path = Network;
@@ -846,7 +848,7 @@
846848
CB9592B32855D51100847751 /* UIComponent */ = {
847849
isa = PBXGroup;
848850
children = (
849-
CB9592B42855D52700847751 /* CommonMissonView.swift */,
851+
CB9592B42855D52700847751 /* CommonMissionView.swift */,
850852
CBA4D7A52856D48C0018BDC2 /* RoomStateView.swift */,
851853
);
852854
path = UIComponent;
@@ -942,6 +944,7 @@
942944
B50B1B0328596C900080992C /* SnapKit */,
943945
B50B1B0628596CB10080992C /* FSCalendar */,
944946
B50B1B32285AC0970080992C /* Gifu */,
947+
CB6637E72959CBC60050BD04 /* SkeletonView */,
945948
39FFE33328F457AF008442EE /* FirebaseMessaging */,
946949
);
947950
productName = Manito;
@@ -976,6 +979,7 @@
976979
B50B1B0228596C900080992C /* XCRemoteSwiftPackageReference "SnapKit" */,
977980
B50B1B0528596CB10080992C /* XCRemoteSwiftPackageReference "FSCalendar" */,
978981
B50B1B31285AC0970080992C /* XCRemoteSwiftPackageReference "Gifu" */,
982+
CB6637E62959CBC60050BD04 /* XCRemoteSwiftPackageReference "SkeletonView" */,
979983
39FFE33228F457AF008442EE /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
980984
);
981985
productRefGroup = B5F524CC28519AA000614FF7 /* Products */;
@@ -1113,7 +1117,7 @@
11131117
B5F31BB028BE1CA700F61D0F /* UserDefaultStorage.swift in Sources */,
11141118
B5F31BB228BE1CD700F61D0F /* UserDefaultHandler.swift in Sources */,
11151119
39CD581D28C4C03C00496E91 /* DetailDoneProtocol.swift in Sources */,
1116-
CB9592B52855D52700847751 /* CommonMissonView.swift in Sources */,
1120+
CB9592B52855D52700847751 /* CommonMissionView.swift in Sources */,
11171121
CBA4D7A42856CE9F0018BDC2 /* CreateRoomCollectionViewCell.swift in Sources */,
11181122
39C95802287DACC300A04A2B /* RoomEndPoint.swift in Sources */,
11191123
CB4C77E628C0D4EB007A1AD2 /* MainAPI.swift in Sources */,
@@ -1319,7 +1323,7 @@
13191323
"$(inherited)",
13201324
"@executable_path/Frameworks",
13211325
);
1322-
MARKETING_VERSION = 1.2;
1326+
MARKETING_VERSION = 1.2.1;
13231327
PRODUCT_BUNDLE_IDENTIFIER = com.TeamFirefighter.Manito;
13241328
PRODUCT_NAME = "$(TARGET_NAME)";
13251329
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1356,7 +1360,7 @@
13561360
"$(inherited)",
13571361
"@executable_path/Frameworks",
13581362
);
1359-
MARKETING_VERSION = 1.2;
1363+
MARKETING_VERSION = 1.2.1;
13601364
PRODUCT_BUNDLE_IDENTIFIER = com.TeamFirefighter.Manito;
13611365
PRODUCT_NAME = "$(TARGET_NAME)";
13621366
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1422,6 +1426,14 @@
14221426
minimumVersion = 3.0.0;
14231427
};
14241428
};
1429+
CB6637E62959CBC60050BD04 /* XCRemoteSwiftPackageReference "SkeletonView" */ = {
1430+
isa = XCRemoteSwiftPackageReference;
1431+
repositoryURL = "https://github.com/Juanpe/SkeletonView.git";
1432+
requirement = {
1433+
branch = main;
1434+
kind = branch;
1435+
};
1436+
};
14251437
/* End XCRemoteSwiftPackageReference section */
14261438

14271439
/* Begin XCSwiftPackageProductDependency section */
@@ -1445,6 +1457,11 @@
14451457
package = B50B1B31285AC0970080992C /* XCRemoteSwiftPackageReference "Gifu" */;
14461458
productName = Gifu;
14471459
};
1460+
CB6637E72959CBC60050BD04 /* SkeletonView */ = {
1461+
isa = XCSwiftPackageProductDependency;
1462+
package = CB6637E62959CBC60050BD04 /* XCRemoteSwiftPackageReference "SkeletonView" */;
1463+
productName = SkeletonView;
1464+
};
14481465
/* End XCSwiftPackageProductDependency section */
14491466
};
14501467
rootObject = B5F524C328519AA000614FF7 /* Project object */;

‎Manito/Manito.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

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

‎Manito/Manito/Global/Base/BaseViewController.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ class BaseViewController: UIViewController {
4949

5050
override func viewDidLoad() {
5151
super.viewDidLoad()
52-
render()
53-
configUI()
52+
setupLayout()
53+
configureUI()
5454
setupBackButton()
5555
hidekeyboardWhenTappedAround()
5656
setupNavigationBar()
@@ -66,11 +66,11 @@ class BaseViewController: UIViewController {
6666
setupInteractivePopGestureRecognizer()
6767
}
6868

69-
func render() {
69+
func setupLayout() {
7070
// Override Layout
7171
}
7272

73-
func configUI() {
73+
func configureUI() {
7474
view.backgroundColor = .backgroundGrey
7575
}
7676

‎Manito/GoogleService-Info.plist‎ renamed to ‎Manito/Manito/Global/Supports/GoogleService-Info.plist‎

File renamed without changes.

‎Manito/Manito/Network/Service/APIEnvironment.swift‎ renamed to ‎Manito/Manito/Network/Foundation/APIEnvironment.swift‎

File renamed without changes.

‎Manito/Manito/Network/Service/APIService.swift‎ renamed to ‎Manito/Manito/Network/Foundation/APIService.swift‎

File renamed without changes.

‎Manito/Manito/Network/Service/Endpointable.swift‎ renamed to ‎Manito/Manito/Network/Foundation/Endpointable.swift‎

File renamed without changes.

‎Manito/Manito/Network/Service/HTTPMethod.swift‎ renamed to ‎Manito/Manito/Network/Foundation/HTTPMethod.swift‎

File renamed without changes.

0 commit comments

Comments
 (0)