[Refactor] DI Container 사용법 수정

.github/workflows/build.yml

@@ -40,5 +40,5 @@ jobs:
           -scheme "$SCHEME" \
           -configuration Debug \
           -skipMacroValidation \
-          -destination "platform=iOS Simulator,name=iPhone 16 Pro,OS=18.4" \
+          -destination "platform=iOS Simulator,name=iPhone 16 Pro,OS=26.2" \
           clean build

Alarm/Package.swift

@@ -37,7 +37,6 @@ let package = Package(
     )
   ],
   dependencies: [
-    .package(name: "DI", path: "../DI"),
     .package(name: "Common", path: "../Common"),
     .package(name: "Infrastructure", path: "../Infrastructure"),
   ],
@@ -48,8 +47,7 @@ let package = Package(
         .target(config: .domain),
         .target(config: .data),
         .target(config: .presentation),
-        .product(name: "DI", package: "DI"),
-        .product(name: "AppDI", package: "DI"),
+        .product(name: "DIKit", package: "Common"),
         .product(name: "NetworkInterface", package: "Infrastructure"),
       ],
     ),

Alarm/Sources/DI/AlarmDIContainer.swift

@@ -7,7 +7,6 @@
 
 import Foundation
 import DIKit
-import AppDI
 import NetworkInterface
 import AlarmDomain
 import AlarmData

AppCore/Package.swift

@@ -0,0 +1,98 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+enum Config: String, CaseIterable {
+  static let name: String = "AppCore"
+
+  case di = "DI"
+
+  var name: String {
+    return "\(Config.name)\(rawValue)"
+  }
+
+  var path: String {
+    "Sources/\(rawValue)"
+  }
+}
+
+let package = Package(
+  name: Config.name,
+  platforms: [.iOS(.v17)],
+  products: [
+    .library(
+      name: "AppCore",
+      targets: Config.allCases.map(\.name)
+    ),
+  ],
+  dependencies: [
+    .package(name: "Intro", path: "../Intro"),
+    .package(name: "Login", path: "../Login"),
+    .package(name: "Home", path: "../Home"),
+    .package(name: "Community", path: "../Community"),
+    .package(name: "MyPage", path: "../MyPage"),
+    .package(name: "Alarm", path: "../Alarm"),
+
+    .package(name: "3rdParty", path: "../3rdParty"),
+    .package(name: "Common", path: "../Common"),
+    .package(name: "Infrastructure", path: "../Infrastructure"),
+  ],
+  targets: [
+    .target(
+      config: .di,
+      dependencies: [
+        .product(name: "DataSources", package: "Common"),
+        .product(name: "Managers", package: "Common"),
+        .product(name: "NetworkInterface", package: "Infrastructure"),
+        .product(name: "NetworkImpl", package: "Infrastructure"),
+        .product(name: "FCMService", package: "3rdParty"),
+
+        .product(name: "IntroDI", package: "Intro"),
+        .product(name: "LoginDI", package: "Login"),
+        .product(name: "HomeDI", package: "Home"),
+        .product(name: "CommunityDI", package: "Community"),
+        .product(name: "MyPageDI", package: "MyPage"),
+        .product(name: "AlarmDI", package: "Alarm"),
+      ]
+    )
+  ]
+)
+
+extension Target {
+  static func target(
+    config: Config,
+    dependencies: [Dependency] = [],
+    exclude: [String] = [],
+    sources: [String]? = nil,
+    resources: [Resource]? = nil,
+    publicHeadersPath: String? = nil,
+    packageAccess: Bool = false,
+    cSettings: [CSetting]? = nil,
+    cxxSettings: [CXXSetting]? = nil,
+    swiftSettings: [SwiftSetting]? = nil,
+    linkerSettings: [LinkerSetting]? = nil,
+    plugins: [PluginUsage]? = nil,
+  ) -> Target {
+    return .target(
+      name: config.name,
+      dependencies: dependencies,
+      path: config.path,
+      exclude: exclude,
+      sources: sources,
+      resources: resources,
+      publicHeadersPath: publicHeadersPath,
+      packageAccess: packageAccess,
+      cSettings: cSettings,
+      cxxSettings: cxxSettings,
+      swiftSettings: swiftSettings,
+      linkerSettings: linkerSettings,
+      plugins: plugins)
+  }
+}
+
+extension Target.Dependency {
+  static func target(config: Config) -> Self {
+    return .target(name: config.name)
+  }
+}

DI/Sources/AppDI/AppDIContainer.swift → AppCore/Sources/DI/AppDIContainer.swift

@@ -15,6 +15,13 @@ import NetworkInterface
 import NetworkImpl
 import FCMService
 
+import IntroDI
+import LoginDI
+import HomeDI
+import CommunityDI
+import MyPageDI
+import AlarmDI
+
 // MARK: - App Assembly
 struct AppAssembly: Assembly {
   func assemble(container: GenericDIContainer) {
@@ -71,6 +78,37 @@ struct AppAssembly: Assembly {
         udManager: resolver.resolve(UserDefaultsManager.self)
       )
     }
+
+    // MARK: - IntroDIContainer
+    container.register(IntroDIContainer.self, scope: .singleton) { r in
+      IntroDIContainer(appContainer: container)
+    }
+
+    // MARK: - LoginDIContainer
+    container.register(LoginDIContainer.self, scope: .singleton) { r in
+      LoginDIContainer(appContainer: container)
+    }
+
+    // MARK: - HomeDIContainer
+    container.register(HomeDIContainer.self, scope: .singleton) { r in
+      HomeDIContainer(appContainer: container)
+    }
+
+    // MARK: - CommunityDIContainer
+    container.register(CommunityDIContainer.self, scope: .singleton) { r in
+      CommunityDIContainer(appContainer: container)
+    }
+
+    // MARK: - MyPageDIContainer
+    container.register(MyPageDIContainer.self, scope: .singleton) { r in
+      MyPageDIContainer(appContainer: container)
+    }
+
+    // MARK: - AlarmDIContainer
+    container.register(AlarmDIContainer.self, scope: .singleton) { r in
+      AlarmDIContainer(appContainer: container)
+    }
+
   }
 }
 
@@ -96,6 +134,26 @@ public final class AppDIContainer: @unchecked Sendable {
     return container
   }
 
+  public var introDIContainer: IntroDIContainer {
+    return container.resolve(IntroDIContainer.self)
+  }
+
+  public var loginDIContainer: LoginDIContainer {
+    return container.resolve(LoginDIContainer.self)
+  }
+
+  public var homeDIContainer: HomeDIContainer {
+    return container.resolve(HomeDIContainer.self)
+  }
+
+  public var communityDIContainer: CommunityDIContainer {
+    return container.resolve(CommunityDIContainer.self)
+  }
+
+  public var mypageDIContainer: MyPageDIContainer {
+    return container.resolve(MyPageDIContainer.self)
+  }
+
   /// Direct access to AppStateManager for app initialization
   public func makeAppStateManager() -> AppStateManager {
     return container.resolve(AppStateManager.self)

Common/Package.swift

@@ -19,6 +19,10 @@ let package = Package(
       name: "DataSources",
       targets: ["DataSources"]
     ),
+    .library(
+      name: "DIKit",
+      targets: ["DIKit"]
+    ),
     .library(
       name: "LocalizedString",
       targets: ["LocalizedString"]
@@ -48,6 +52,7 @@ let package = Package(
       ]
     ),
     .target(name: "DataSources"),
+    .target(name: "DIKit"),
     .target(name: "LocalizedString"),
     .target(name: "Util"),
     .target(

Common/Sources/Managers/AppStateManager.swift

@@ -49,8 +49,10 @@ public final class AppStateManager {
   }
 
   public func completeSplash() {
-    if isOnboardingCompleted {
-      state = isLoginCompleted ? .main : .login
+    if isLoginCompleted {
+      state = .main
+    } else if isOnboardingCompleted {
+      state = .main
     } else {
       state = .onboarding
     }
@@ -59,7 +61,7 @@ public final class AppStateManager {
   // 온보딩 완료
   public func completeOnboarding() {
     udManager.isOnboardingCompleted = true
-    state = isLoginCompleted ? .main : .login
+    state = .login
   }
 
   // 로그인 완료

Community/Package.swift

@@ -29,12 +29,19 @@ let package = Package(
       targets: Config.allCases.map(\.name)
     ),
     .library(
-      name: "CommunityDomain",
-      targets: ["CommunityDomain"]
+      name: Config.di.name,
+      targets: [Config.di.name]
+    ),
+    .library(
+      name: Config.domain.name,
+      targets: [Config.domain.name]
+    ),
+    .library(
+      name: Config.presentation.name,
+      targets: [Config.presentation.name]
     ),
   ],
   dependencies: [
-    .package(name: "DI", path: "../DI"),
     .package(name: "Common", path: "../Common"),
     .package(name: "Infrastructure", path: "../Infrastructure"),
     .package(name: "Alarm", path: "../Alarm"),
@@ -46,8 +53,7 @@ let package = Package(
         .target(config: .domain),
         .target(config: .data),
         .target(config: .presentation),
-        .product(name: "DI", package: "DI"),
-        .product(name: "AppDI", package: "DI"),
+        .product(name: "DIKit", package: "Common"),
         .product(name: "NetworkInterface", package: "Infrastructure"),
         .product(name: "NetworkImpl", package: "Infrastructure"),
       ],

Community/Sources/DI/CommunityDIContainer.swift

@@ -7,14 +7,16 @@
 
 import Foundation
 import DIKit
-import AppDI
 import NetworkInterface
 import NetworkImpl
 import CommunityDomain
 import CommunityData
 import CommunityPresentation
 import Managers
 
+import AlarmDI
+import AlarmPresentation
+
 struct CommunityWriteAssembly: Assembly {
   func assemble(container: GenericDIContainer) {
     container.register(CreateBoardUseCase.self) { resolver in
@@ -100,42 +102,45 @@ public final class CommunityDIContainer {
   private let container: GenericDIContainer
 
   // MARK: - Initialization
-  public init(appContainer: AppDIContainer = .shared) {
-    self.container = GenericDIContainer(parent: appContainer.baseContainer)
+  public init(appContainer: GenericDIContainer) {
+    self.container = appContainer
     CommunityAssembly().assemble(container: container)
     CommunityWriteAssembly().assemble(container: container)
   }
+}
 
+
+extension CommunityDIContainer: CommunityDependency {
+  public var alarmListComponent: any AlarmPresentation.AlarmListDependecy {
+    container.resolve(AlarmDIContainer.self)
+  }
+
+  public var component: any CommunityPresentation.CommunityDetailDependency {
+    self
+  }
+
   // MARK: - Factory Methods
-  @MainActor
   public func makeCommunityViewModel() -> CommunityViewModel {
     return container.resolve(CommunityViewModel.self)
   }
-}
-
-extension CommunityDIContainer: CommunityWriteFactory {
-  public func makeWriteViewModel() -> any CommunityWriteViewModelProtocol {
+
+  public func makeWriteViewModel() -> any CommunityPresentation.CommunityWriteViewModelProtocol {
     container.resolve(CommunityWriteViewModel.self)
   }
 }
 
-extension CommunityDIContainer: CommunityDetailFactory {
-  @MainActor
-  public func makeDetailViewModel() -> CommunityDetailViewModel {
-    return container.resolve(CommunityDetailViewModel.self)
+extension CommunityDIContainer: CommunityDetailDependency {
+  public func makeDetailViewModel() -> CommunityPresentation.CommunityDetailViewModel {
+    container.resolve(CommunityDetailViewModel.self)
   }
-}
-
-extension CommunityDIContainer: UpdateBoardFactory {
-  public func makeViewModel(boardId: Int) -> CommunityWriteViewModelProtocol {
-    return UpdateBoardViewModel(
+
+  public func makeViewModel(boardId: Int) -> any CommunityPresentation.CommunityWriteViewModelProtocol {
+    UpdateBoardViewModel(
       boardId: boardId,
       updateBoardUseCase: container.resolve(UpdateBoardUseCase.self)
     )
   }
-}
-
-extension CommunityDIContainer: ReportBoardFactory {
+
   public func makeViewModel(req: ReportRequest) -> CommunityReportViewModel {
     return CommunityReportViewModel(
       usecase: container.resolve(ReportContentUseCase.self),