Merge branch 'Dev' of github.com:DDD-Community/PINGPONG-IOS into Dev

# Conflicts:
#	PingPong/Projects/Feature/Search/Sources/ViewModel/ExploreViewModel.swift

PingPong/Makefile

@@ -2,6 +2,7 @@ GENERATE = tuist generate
 FETCH = tuist fetch
 BUILD = tuist build
 CLEAN = tuist clean
+CURRENT_DATE = $(shell run scripts/current_date.swift)
 
 # Define your targets and dependencies
 
@@ -20,4 +21,7 @@ clean:
 fetch:
 	$(FETCH)
 
-# Additional targets can be added as needed
+module:
+	tuist scaffold Module \
+	 --name ${name} \
+	 --author "서원지"

PingPong/Plugins/PingPongs/ProjectDescriptionHelpers/Scripts/Extension+TargetScript.swift

@@ -0,0 +1,39 @@
+//
+//  Extension+TargetScript.swift
+//  MyPlugin
+//
+//  Created by 서원지 on 11/4/23.
+//
+
+import ProjectDescription
+
+public extension TargetScript {
+    static let FirebaseCrashlyticsString = TargetScript.post(
+        script: Scripts.FirebaseCrashlytics,
+        name: "FirebaseCrashlytics",
+        inputPaths: [
+            "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
+            "$(SRCROOT)/$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)",
+            "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/Resources/Firebase/GoogleService-Info.plist -p ios ${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}"
+
+        ],
+        basedOnDependencyAnalysis: true, // 또는 true, 필요에 따라 변경
+        runForInstallBuildsOnly: true    // 또는 true, 필요에 따라 변경
+    )
+
+    static let GoogleServiceInfoString = TargetScript.pre(
+        script: Scripts.GoogleServiceInfo,
+        name: "GoogleServiceInfo",
+        inputPaths: [],
+        basedOnDependencyAnalysis: false,
+        runForInstallBuildsOnly: true
+    )
+
+    static let widgetRunScripts = TargetScript.pre(
+        script: Scripts.widgetPhaseScripts,
+        name: "widgetPhaseScripts",
+        inputPaths: [],
+        basedOnDependencyAnalysis: true,
+        runForInstallBuildsOnly: true
+    )
+}

PingPong/Plugins/PingPongs/ProjectDescriptionHelpers/Scripts/Scripts.swift

@@ -0,0 +1,31 @@
+//
+//  Scripts.swift
+//  MyPlugin
+//
+//  Created by 서원지 on 11/4/23.
+//
+
+import Foundation
+
+public enum Scripts {
+    public static let FirebaseCrashlytics: String = """
+ ROOT_DIR=\(ProcessInfo.processInfo.environment["TUIST_ROOT_DIR"] ?? "")
+    "${ROOT_DIR}/Tuist/Dependencies/SwiftPackageManager/.build/checkouts/firebase-ios-sdk/Crashlytics/run"
+"""
+    public static let GoogleServiceInfo: String =
+    """
+    if [[ "${CONFIGURATION}" == "Debug" ]]; then
+        cp -r "$SRCROOT/ChaeviUS/Project/Resources/Firebase/GoogleService-Info.plist" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/GoogleService-Info.plist"
+    elif [[ "${CONFIGURATION}" == "Release" ]]; then
+        cp -r "$SRCROOT/ChaeviUS/Project/Resources/Firebase/GoogleService-Info.plist" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/GoogleService-Info.plist"
+    fi
+    """
+
+
+    public static let widgetPhaseScripts: String = """
+    cd "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/"
+    if [[ -d "Frameworks" ]]; then
+        rm -fr Frameworks
+    fi
+"""
+}

PingPong/Plugins/PingPongs/ProjectDescriptionHelpers/TargetDependency+Module/Modules.swift

@@ -0,0 +1,62 @@
+//
+//  Modules.swift
+//  MyPlugin
+//
+//  Created by 서원지 on 11/4/23.
+//
+
+import Foundation
+import ProjectDescription
+
+public enum ModulePath {
+    case feature(Feature)
+    case core(Core)
+    case domain(Domain)
+    case design(Design)
+}
+
+// MARK: FeatureModule
+public extension ModulePath {
+    enum Feature: String, CaseIterable {
+        case Archive
+        case Auth
+        case Core
+        case Bake
+        case Home
+        case OnBoarding
+        case Search
+        case PayMent
+//        case Profile
+
+        public static let name: String = "Feature"
+    }
+}
+
+//MARK: -  CoreMoudule
+public extension ModulePath {
+    enum Core: String, CaseIterable {
+        case Authorization
+        case Common
+
+        public static let name: String = "Core"
+    }
+}
+
+//MARK: -  CoreDomainModule
+public extension ModulePath {
+    enum Domain: String, CaseIterable {
+        case API
+        case Model
+        case Service
+
+        public static let name: String = "Domain"
+    }
+}
+
+public extension ModulePath {
+    enum Design: String, CaseIterable {
+        case DesignSystem
+
+        public static let name: String = "DesignSystem"
+    }
+}

PingPong/Plugins/PingPongs/ProjectDescriptionHelpers/TargetDependency+Module/Path+Modules.swift

@@ -0,0 +1,58 @@
+//
+//  Path+Modules.swift
+//  MyPlugin
+//
+//  Created by 서원지 on 11/4/23.
+//
+
+import Foundation
+
+import Foundation
+import ProjectDescription
+
+// MARK: ProjectDescription.Path + Feature
+public extension ProjectDescription.Path {
+    static var feature: Self {
+        return .relativeToRoot("Projects/\(ModulePath.Feature.name)")
+    }
+
+    static func feature(implementation module: ModulePath.Feature) -> Self {
+        return .relativeToRoot("Projects/\(ModulePath.Feature.name)/\(module.rawValue)")
+    }
+}
+
+// MARK: ProjectDescription.Path + Core
+public extension ProjectDescription.Path {
+    static var core: Self {
+        return .relativeToRoot("Projects/\(ModulePath.Core.name)")
+    }
+
+    static func core(implementation module: ModulePath.Core) -> Self {
+        return .relativeToRoot("Projects/\(ModulePath.Core.name)/\(module.rawValue)")
+    }
+}
+
+
+// MARK: ProjectDescription.Path + DesignSystem
+
+public extension ProjectDescription.Path {
+    static var design: Self {
+        return .relativeToRoot("Projects/\(ModulePath.Design.name)")
+    }
+
+    static func design(implementation module: ModulePath.Design) -> Self {
+        return .relativeToRoot("Projects/\(module.rawValue)")
+    }
+}
+
+// MARK: ProjectDescription.Path + Domain
+
+public extension ProjectDescription.Path {
+    static var domain: Self {
+        return .relativeToRoot("Projects/\(ModulePath.Core.name)/\(ModulePath.Domain.name)")
+    }
+
+    static func domain(implementation module: ModulePath.Domain) -> Self {
+        return .relativeToRoot("Projects/\(ModulePath.Core.name)/\(ModulePath.Domain.name)/\(module.rawValue)")
+    }
+}

PingPong/Plugins/PingPongs/ProjectDescriptionHelpers/TargetDependency+Module/TargetDependency+Modules.swift

@@ -0,0 +1,40 @@
+//
+//  TargetDependency+Modules.swift
+//  MyPlugin
+//
+//  Created by 서원지 on 11/4/23.
+//
+
+
+import Foundation
+import ProjectDescription
+
+// MARK: TargetDependency + Feature
+public extension TargetDependency {
+    static func feature(implements module: ModulePath.Feature) -> Self {
+        return .project(target: module.rawValue, path: .feature(implementation: module))
+    }
+}
+
+// MARK: TargetDependency + Design
+public extension TargetDependency {
+    static func design(implements module: ModulePath.Design) -> Self {
+        return .project(target: module.rawValue, path: .design(implementation: module))
+    }
+}
+
+// MARK: TargetDependency + Core
+public extension TargetDependency {
+    static func core(implements module: ModulePath.Core) -> Self {
+        return .project(target: module.rawValue, path: .core(implementation: module))
+    }
+}
+
+
+// MARK: TargetDependency + Domain
+
+public extension TargetDependency {
+    static func domain(implements module: ModulePath.Domain) -> Self {
+        return .project(target: module.rawValue, path: .domain(implementation: module))
+    }
+}

PingPong/Projects/App/Project.swift

@@ -26,7 +26,7 @@ let project = Project.makeAppModule(
     dependencies: [
         .SPM.Inject,
         .SPM.FirebaseMessaging,
-        .Projcet.OnBoarding,
+        .feature(implements: .OnBoarding)
 //        .SPM.GoogleSignIn,
 //        .sdk(name: "GTMAppAuth+", type: .library),
 //        .sdk(name: "WidgetKit", type: .framework),

PingPong/Projects/Core/Authorization/Project.swift

@@ -19,13 +19,12 @@ let project = Project.makeAppModule(
     ],
     setting:  .appBaseSetting,
     dependencies: [
-        .Projcet.DesignSystem,
+        .domain(implements: .Model),
+        .domain(implements: .Service),
+        .design(implements: .DesignSystem),
+
         .SPM.CombineMoya,
         .SPM.Moya,
-        .SPM.Kingfisher,
-        .SPM.PopupView,
-        .Projcet.Model,
-        .Projcet.Service,
         .SPM.FirebaseAuth,
         .SPM.FirebaseFirestore,
         .SPM.FirebaseDatabase,

PingPong/Projects/Core/Common/Project.swift

@@ -19,10 +19,11 @@ let project = Project.makeAppModule(
     ],
     setting:  .appBaseSetting,
     dependencies: [
+        .domain(implements: .Service),
+        .domain(implements: .Model),
+
         .SPM.CombineMoya,
         .SPM.Moya,
-        .Projcet.Model,
-        .Projcet.Service
     ],
     sources: ["Sources/**"]
 //    resources: ["Resources/**"]

PingPong/Projects/Core/Domain/Service/Project.swift

@@ -19,7 +19,9 @@ let project = Project.makeAppModule(
     dependencies: [
         .SPM.CombineMoya,
         .SPM.Moya,
-        .Projcet.API
+        .domain(implements: .API)
+
+
     ],
     sources: ["Sources/**"]
 )

PingPong/Projects/DemoApp/ArchiveApp/Project.swift

@@ -24,7 +24,7 @@ let project = Project.makeAppModule(
 
     setting: .appMainSetting,
     dependencies: [
-        .Projcet.Archive
+        .feature(implements: .Archive)
 
     ],
     sources: ["Sources/**", "Resources/**", "Resources/Font/**"],

PingPong/Projects/DemoApp/CoreApp/Project.swift

@@ -24,7 +24,7 @@ let project = Project.makeAppModule(
 
     setting: .appMainSetting,
     dependencies: [
-        .Projcet.Core
+        .feature(implements: .Core)
 
     ],
     sources: ["Sources/**", "Resources/**"],

PingPong/Projects/DemoApp/HomeApp/Project.swift

@@ -24,7 +24,7 @@ let project = Project.makeAppModule(
 
     setting: .appMainSetting,
     dependencies: [
-        .Projcet.Home
+        .feature(implements: .Home)
 
     ],
     sources: ["Sources/**", "Resources/**", "Resources/Font/**"],

PingPong/Projects/DemoApp/OnBoardingApp/Project.swift

@@ -24,7 +24,7 @@ let project = Project.makeAppModule(
 
     setting: .appMainSetting,
     dependencies: [
-        .Projcet.OnBoarding
+        .feature(implements: .OnBoarding)
 
     ],
     sources: ["Sources/**", "Resources/**", "Resources/Font/**"],

PingPong/Projects/DemoApp/SearchApp/Project.swift

@@ -24,7 +24,7 @@ let project = Project.makeAppModule(
 
     setting: .appMainSetting,
     dependencies: [
-        .Projcet.Search
+        .feature(implements: .Search)
 
     ],
     sources: ["Sources/**", "Resources/**", "Resources/Font/**"],