Skip to content

Commit

Permalink
Merge pull request #539 from DeveloperAcademy-POSTECH/release/v1.6.0_6
Browse files Browse the repository at this point in the history
[CHORE] v1.6.0 출시에 따라 main 브랜치를 업데이트 합니다.
  • Loading branch information
MMMIIIN authored Sep 21, 2023
2 parents eda700d + 82fd558 commit 9b0da19
Show file tree
Hide file tree
Showing 426 changed files with 10,593 additions and 5,893 deletions.
2 changes: 0 additions & 2 deletions .github/auto_assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ reviewers:
- YoonAh-dev
- MMMIIIN
- coby5502
- CreoHwan
- sunchoi22
- dangsal
# A list of keywords to be skipped the process that add reviewers if pull requests include it
skipKeywords:
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/XCTestBuild.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# This workflow will build a Swift project
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift

name: XCTestCI
on:
push:
branches: [ develop, main ]
pull_request:
branches: [ develop, release, hotfix, feature, main ]
jobs:
build:
runs-on: self-hosted
steps:
- uses: actions/checkout@v2

- name: Firefighter Build Tests
run: |
xcodebuild clean test -project ./Manito/Manito.xcodeproj -scheme Manito-Dev -destination "platform=iOS Simulator,name=iPhone 13,OS=latest"
xcpretty --color --simple
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ jobs:

- name: Firefighter Build Tests
run: |
xcodebuild build -project ./Manito/Manito.xcodeproj -scheme Manito -destination "platform=iOS Simulator,name=iPhone 13,OS=latest"
xcodebuild build -project ./Manito/Manito.xcodeproj -scheme Manito-Prod -destination "platform=iOS Simulator,name=iPhone 13,OS=latest"
xcpretty --color --simple
11 changes: 11 additions & 0 deletions Manito/Configuration/Dev/Dev.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Dev.xcconfig
// Manito
//
// Created by SHIN YOON AH on 2023/08/15.
//

// Configuration settings file format documentation can be found at:
// https://help.apple.com/xcode/#/dev745c5c974

BUNDLE_DISPLAY_NAME = 애니또테스트
34 changes: 34 additions & 0 deletions Manito/Configuration/Dev/GoogleService-Info-Dev.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CLIENT_ID</key>
<string>127402077581-1vseg29m3he1bbe7a4of2o5ctmti41do.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.127402077581-1vseg29m3he1bbe7a4of2o5ctmti41do</string>
<key>API_KEY</key>
<string>AIzaSyDEDRvAR6vtuGe1PWtEexLlsUvuFUk1xRU</string>
<key>GCM_SENDER_ID</key>
<string>127402077581</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.TeamFirefighter.Manito</string>
<key>PROJECT_ID</key>
<string>aenitto-develop</string>
<key>STORAGE_BUCKET</key>
<string>aenitto-develop.appspot.com</string>
<key>IS_ADS_ENABLED</key>
<false/>
<key>IS_ANALYTICS_ENABLED</key>
<false/>
<key>IS_APPINVITE_ENABLED</key>
<true/>
<key>IS_GCM_ENABLED</key>
<true/>
<key>IS_SIGNIN_ENABLED</key>
<true/>
<key>GOOGLE_APP_ID</key>
<string>1:127402077581:ios:38169c06a3af4fc9ace1c4</string>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
<key>STORAGE_BUCKET</key>
<string>aenitto-350c7.appspot.com</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<false/>
<key>IS_ANALYTICS_ENABLED</key>
<false></false>
<false/>
<key>IS_APPINVITE_ENABLED</key>
<true></true>
<true/>
<key>IS_GCM_ENABLED</key>
<true></true>
<true/>
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<true/>
<key>GOOGLE_APP_ID</key>
<string>1:1096284073075:ios:274e5e836bf912e806ce06</string>
</dict>
</plist>
</plist>
11 changes: 11 additions & 0 deletions Manito/Configuration/Prod/Prod.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Prod.xcconfig
// Manito
//
// Created by SHIN YOON AH on 2023/08/15.
//

// Configuration settings file format documentation can be found at:
// https://help.apple.com/xcode/#/dev745c5c974

BUNDLE_DISPLAY_NAME = 애니또
1,528 changes: 1,096 additions & 432 deletions Manito/Manito.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/kaishin/Gifu.git",
"state" : {
"revision" : "51f2eab32903e336f590c013267cfa4d7f8b06c4",
"version" : "3.3.1"
"revision" : "82da0086dea14ca9afc9801234ad8dc4cd9e2738",
"version" : "3.4.1"
}
},
{
Expand All @@ -59,17 +59,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleDataTransport.git",
"state" : {
"revision" : "5056b15c5acbb90cd214fe4d6138bdf5a740e5a8",
"version" : "9.2.0"
"revision" : "aae45a320fd0d11811820335b1eabc8753902a40",
"version" : "9.2.5"
}
},
{
"identity" : "googleutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleUtilities.git",
"state" : {
"revision" : "68ea347bdb1a69e2d2ae2e25cd085b6ef92f64cb",
"version" : "7.9.0"
"revision" : "c38ce365d77b04a9a300c31061c5227589e5597b",
"version" : "7.11.5"
}
},
{
Expand All @@ -86,8 +86,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/gtm-session-fetcher.git",
"state" : {
"revision" : "d4289da23e978f37c344ea6a386e5546e2466294",
"version" : "2.1.0"
"revision" : "5ccda3981422a84186387dbb763ba739178b529c",
"version" : "2.3.0"
}
},
{
Expand All @@ -113,8 +113,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/promises.git",
"state" : {
"revision" : "3e4e743631e86c8c70dbc6efdc7beaa6e90fd3bb",
"version" : "2.1.1"
"revision" : "e70e889c0196c76d22759eb50d6a0270ca9f1d9e",
"version" : "2.3.1"
}
},
{
Expand All @@ -140,8 +140,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "88c7d15e1242fdb6ecbafbc7926426a19be1e98a",
"version" : "1.20.2"
"revision" : "cf62cdaea48b77f1a631e5cb3aeda6047c2cba1d",
"version" : "1.23.0"
}
}
],
Expand Down
89 changes: 89 additions & 0 deletions Manito/Manito.xcodeproj/xcshareddata/xcschemes/Manito-Dev.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B5F524CA28519AA000614FF7"
BuildableName = "Manito.app"
BlueprintName = "Manito"
ReferencedContainer = "container:Manito.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Dev"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "398B1CB82A12415B00DEFCEC"
BuildableName = "ManitoTests.xctest"
BlueprintName = "ManitoTests"
ReferencedContainer = "container:Manito.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Dev"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B5F524CA28519AA000614FF7"
BuildableName = "Manito.app"
BlueprintName = "Manito"
ReferencedContainer = "container:Manito.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Dev"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B5F524CA28519AA000614FF7"
BuildableName = "Manito.app"
BlueprintName = "Manito"
ReferencedContainer = "container:Manito.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Dev">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Prod"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
version = "1.3">
LastUpgradeVersion = "1430"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
Expand All @@ -23,15 +23,14 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
buildConfiguration = "Prod"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "Prod"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
Expand All @@ -52,7 +51,7 @@
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
buildConfiguration = "Prod"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
Expand All @@ -69,10 +68,10 @@
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
buildConfiguration = "Prod">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
buildConfiguration = "Prod"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
}

extension SceneDelegate {
func logout() {
window?.rootViewController = LoginViewController()
func moveToLoginViewController() {
let viewController = UINavigationController(rootViewController: LoginViewController())
window?.rootViewController = viewController
}

func changeRootViewWithLetterView(roomId: Int) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Setting.swift
// NicknameDTO.swift
// Manito
//
// Created by 이성호 on 2022/09/07.
Expand All @@ -8,5 +8,5 @@
import Foundation

struct NicknameDTO: Codable {
let nickname: String?
let nickname: String
}
28 changes: 28 additions & 0 deletions Manito/Manito/Data/DTO/Request/CreatedRoomRequestDTO.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//
// CreatedRoomRequestDTO.swift
// Manito
//
// Created by SHIN YOON AH on 2023/08/24.
//

import Foundation

struct CreatedRoomRequestDTO: Encodable {
let room: CreatedRoomInfoRequestDTO
let member: MemberInfoRequestDTO
}

struct CreatedRoomInfoRequestDTO: Encodable {
let title: String
let capacity: Int
let startDate: String
let endDate: String
}

struct MemberInfoRequestDTO: Encodable {
let colorIndex: Int

enum CodingKeys: String, CodingKey {
case colorIndex = "colorIdx"
}
}
12 changes: 12 additions & 0 deletions Manito/Manito/Data/DTO/Request/EditedMissionRequestDTO.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//
// EditedMissionRequestDTO.swift
// Manito
//
// Created by SHIN YOON AH on 2023/08/24.
//

import Foundation

struct EditedMissionRequestDTO: Codable {
let mission: String
}
Loading

0 comments on commit 9b0da19

Please sign in to comment.