Skip to content

Commit 9b0da19

Browse files
MMMIIINMMMIIIN
authored
Merge pull request #539 from DeveloperAcademy-POSTECH/release/v1.6.0_6
[CHORE] v1.6.0 출시에 따라 main 브랜치를 업데이트 합니다.
2 parents eda700d + 82fd558 commit 9b0da19

File tree

426 files changed

+10593
-5893
lines changed

Some content is hidden

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

426 files changed

+10593
-5893
lines changed

‎.github/auto_assign.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ reviewers:
99
- YoonAh-dev
1010
- MMMIIIN
1111
- coby5502
12-
- CreoHwan
13-
- sunchoi22
1412
- dangsal
1513
# A list of keywords to be skipped the process that add reviewers if pull requests include it
1614
skipKeywords:

‎.github/workflows/XCTestBuild.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# This workflow will build a Swift project
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
3+
4+
name: XCTestCI
5+
on:
6+
push:
7+
branches: [ develop, main ]
8+
pull_request:
9+
branches: [ develop, release, hotfix, feature, main ]
10+
jobs:
11+
build:
12+
runs-on: self-hosted
13+
steps:
14+
- uses: actions/checkout@v2
15+
16+
- name: Firefighter Build Tests
17+
run: |
18+
xcodebuild clean test -project ./Manito/Manito.xcodeproj -scheme Manito-Dev -destination "platform=iOS Simulator,name=iPhone 13,OS=latest"
19+
xcpretty --color --simple

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ jobs:
1919

2020
- name: Firefighter Build Tests
2121
run: |
22-
xcodebuild build -project ./Manito/Manito.xcodeproj -scheme Manito -destination "platform=iOS Simulator,name=iPhone 13,OS=latest"
22+
xcodebuild build -project ./Manito/Manito.xcodeproj -scheme Manito-Prod -destination "platform=iOS Simulator,name=iPhone 13,OS=latest"
2323
xcpretty --color --simple

‎Manito/Configuration/Dev/Dev.xcconfig‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//
2+
// Dev.xcconfig
3+
// Manito
4+
//
5+
// Created by SHIN YOON AH on 2023/08/15.
6+
//
7+
8+
// Configuration settings file format documentation can be found at:
9+
// https://help.apple.com/xcode/#/dev745c5c974
10+
11+
BUNDLE_DISPLAY_NAME = 애니또테스트

‎Manito/Configuration/Dev/GoogleService-Info-Dev.plist‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CLIENT_ID</key>
6+
<string>127402077581-1vseg29m3he1bbe7a4of2o5ctmti41do.apps.googleusercontent.com</string>
7+
<key>REVERSED_CLIENT_ID</key>
8+
<string>com.googleusercontent.apps.127402077581-1vseg29m3he1bbe7a4of2o5ctmti41do</string>
9+
<key>API_KEY</key>
10+
<string>AIzaSyDEDRvAR6vtuGe1PWtEexLlsUvuFUk1xRU</string>
11+
<key>GCM_SENDER_ID</key>
12+
<string>127402077581</string>
13+
<key>PLIST_VERSION</key>
14+
<string>1</string>
15+
<key>BUNDLE_ID</key>
16+
<string>com.TeamFirefighter.Manito</string>
17+
<key>PROJECT_ID</key>
18+
<string>aenitto-develop</string>
19+
<key>STORAGE_BUCKET</key>
20+
<string>aenitto-develop.appspot.com</string>
21+
<key>IS_ADS_ENABLED</key>
22+
<false/>
23+
<key>IS_ANALYTICS_ENABLED</key>
24+
<false/>
25+
<key>IS_APPINVITE_ENABLED</key>
26+
<true/>
27+
<key>IS_GCM_ENABLED</key>
28+
<true/>
29+
<key>IS_SIGNIN_ENABLED</key>
30+
<true/>
31+
<key>GOOGLE_APP_ID</key>
32+
<string>1:127402077581:ios:38169c06a3af4fc9ace1c4</string>
33+
</dict>
34+
</plist>

Manito/Manito/Global/Supports/GoogleService-Info.plist renamed to Manito/Configuration/Prod/GoogleService-Info-Prod.plist

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
<key>STORAGE_BUCKET</key>
2020
<string>aenitto-350c7.appspot.com</string>
2121
<key>IS_ADS_ENABLED</key>
22-
<false></false>
22+
<false/>
2323
<key>IS_ANALYTICS_ENABLED</key>
24-
<false></false>
24+
<false/>
2525
<key>IS_APPINVITE_ENABLED</key>
26-
<true></true>
26+
<true/>
2727
<key>IS_GCM_ENABLED</key>
28-
<true></true>
28+
<true/>
2929
<key>IS_SIGNIN_ENABLED</key>
30-
<true></true>
30+
<true/>
3131
<key>GOOGLE_APP_ID</key>
3232
<string>1:1096284073075:ios:274e5e836bf912e806ce06</string>
3333
</dict>
34-
</plist>
34+
</plist>

‎Manito/Configuration/Prod/Prod.xcconfig‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//
2+
// Prod.xcconfig
3+
// Manito
4+
//
5+
// Created by SHIN YOON AH on 2023/08/15.
6+
//
7+
8+
// Configuration settings file format documentation can be found at:
9+
// https://help.apple.com/xcode/#/dev745c5c974
10+
11+
BUNDLE_DISPLAY_NAME = 애니또

‎Manito/Manito.xcodeproj/project.pbxproj‎

Lines changed: 1096 additions & 432 deletions
Large diffs are not rendered by default.

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

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

‎Manito/Manito.xcodeproj/xcshareddata/xcschemes/Manito-Dev.xcscheme‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1330"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "B5F524CA28519AA000614FF7"
18+
BuildableName = "Manito.app"
19+
BlueprintName = "Manito"
20+
ReferencedContainer = "container:Manito.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Dev"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO"
33+
parallelizable = "YES">
34+
<BuildableReference
35+
BuildableIdentifier = "primary"
36+
BlueprintIdentifier = "398B1CB82A12415B00DEFCEC"
37+
BuildableName = "ManitoTests.xctest"
38+
BlueprintName = "ManitoTests"
39+
ReferencedContainer = "container:Manito.xcodeproj">
40+
</BuildableReference>
41+
</TestableReference>
42+
</Testables>
43+
</TestAction>
44+
<LaunchAction
45+
buildConfiguration = "Dev"
46+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
47+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
48+
launchStyle = "0"
49+
useCustomWorkingDirectory = "NO"
50+
ignoresPersistentStateOnLaunch = "NO"
51+
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
53+
allowLocationSimulation = "YES">
54+
<BuildableProductRunnable
55+
runnableDebuggingMode = "0">
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "B5F524CA28519AA000614FF7"
59+
BuildableName = "Manito.app"
60+
BlueprintName = "Manito"
61+
ReferencedContainer = "container:Manito.xcodeproj">
62+
</BuildableReference>
63+
</BuildableProductRunnable>
64+
</LaunchAction>
65+
<ProfileAction
66+
buildConfiguration = "Dev"
67+
shouldUseLaunchSchemeArgsEnv = "YES"
68+
savedToolIdentifier = ""
69+
useCustomWorkingDirectory = "NO"
70+
debugDocumentVersioning = "YES">
71+
<BuildableProductRunnable
72+
runnableDebuggingMode = "0">
73+
<BuildableReference
74+
BuildableIdentifier = "primary"
75+
BlueprintIdentifier = "B5F524CA28519AA000614FF7"
76+
BuildableName = "Manito.app"
77+
BlueprintName = "Manito"
78+
ReferencedContainer = "container:Manito.xcodeproj">
79+
</BuildableReference>
80+
</BuildableProductRunnable>
81+
</ProfileAction>
82+
<AnalyzeAction
83+
buildConfiguration = "Dev">
84+
</AnalyzeAction>
85+
<ArchiveAction
86+
buildConfiguration = "Prod"
87+
revealArchiveInOrganizer = "YES">
88+
</ArchiveAction>
89+
</Scheme>

0 commit comments

Comments
 (0)