Merge remote-tracking branch 'origin/develop' into release

.github/workflows/swift.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:  
   build:
-    runs-on: macos-13
+    runs-on: macos-latest
     strategy:
       matrix:
         xcodebuild-scheme: ['App']
@@ -25,11 +25,10 @@ jobs:
         with: 
           ruby-version: '3.2.0'
 
-
       - name: Setup Xcode version
         uses: maxim-lobanov/setup-xcode@v1
         with:
-            xcode-version: '15.0'
+            xcode-version: latest-stable
 
       - name: Checkout branch
         uses: actions/checkout@v3
@@ -61,6 +60,15 @@ jobs:
       - name: Tuist Generate Commnad
         run: tuist generate
 
+      - name: make Google Service Info
+        run: |
+          echo "${{ secrets.GOOGLE_INFO_PLIST }}" | base64 --decode > ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_PATH }}
+      
+      - name: Verify GoogleService-Info.plist creation
+        run: |
+          ls -l ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_PATH }}
+          echo "GOOGLE_SERVICE_INFO_PLIST_PATH: ${{ secrets.GOOGLE_SERVICE_INFO_PLIST_PATH }}"
+                
       - name: fastlane upload_prd_testflight
         if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release') }}
         env:
@@ -81,7 +89,6 @@ jobs:
           WIDGET_NAME: ${{secrets.WIDGET_NAME}}
         run: fastlane github_action_prd_upload_testflight
 
-
       - name: fastlane upload_stg_testflight
         if: ${{ github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'develop' }}
         env:

.mise.toml

@@ -1,2 +1,2 @@
 [tools]
-tuist = "4.3.4"
+tuist = "4.8.1"

14th-team5-iOS/App/Sources/Presentation/Account/AccountSignUp/ViewControllers/AccountProfileViewController.swift

@@ -8,6 +8,7 @@
 import UIKit
 import Core
 import DesignSystem
+import Util
 import Domain
 import PhotosUI
 

14th-team5-iOS/App/Sources/Presentation/Calendar/ViewController/MonthlyCalendarViewController.swift

@@ -5,8 +5,9 @@
 //  Created by 김건우 on 12/6/23.
 //
 
-import Core
 import UIKit
+import Util
+import Core
 
 import FSCalendar
 import ReactorKit

14th-team5-iOS/App/Sources/Presentation/Camera/CameraDisplayViewController.swift

@@ -9,6 +9,7 @@ import UIKit
 
 import Core
 import DesignSystem
+import Util
 import Photos
 import RxDataSources
 import RxSwift

14th-team5-iOS/App/Sources/Presentation/Camera/CameraViewController.swift

@@ -9,7 +9,7 @@ import AVFoundation
 import UIKit
 
 import Core
-import Data
+import Util
 import DesignSystem
 import ReactorKit
 import RxSwift

14th-team5-iOS/App/Sources/Presentation/Camera/Reactor/CameraDisplayViewReactor.swift

@@ -9,6 +9,7 @@ import Foundation
 
 import Data
 import Domain
+import Util
 import DesignSystem
 import ReactorKit
 import Core

14th-team5-iOS/App/Sources/Presentation/FamilyEntrance/Reactor/InputFamilyLinkReactor.swift

@@ -9,6 +9,7 @@ import Foundation
 
 import Domain
 import Core
+import Util
 
 import ReactorKit
 

14th-team5-iOS/App/Sources/Presentation/FamilyEntrance/Reactor/JoinFamilyReactor.swift

@@ -8,6 +8,7 @@
 import Core
 import Domain
 import Foundation
+import Util
 
 import ReactorKit
 

14th-team5-iOS/App/Sources/Presentation/FamilyEntrance/ViewController/JoinFamilyViewController.swift

@@ -9,6 +9,7 @@ import UIKit
 
 import Core
 import DesignSystem
+import Util
 
 import ReactorKit
 import RxCocoa

14th-team5-iOS/App/Sources/Presentation/Home/Reactor/MainFamilyViewReactor.swift

@@ -9,6 +9,7 @@ import Foundation
 
 import Core
 import Domain
+import Util
 
 import ReactorKit
 

14th-team5-iOS/App/Sources/Presentation/Home/Reactor/MainViewReactor.swift

@@ -10,6 +10,7 @@ import UIKit
 import Core
 import Domain
 import DesignSystem
+import Util
 
 import ReactorKit
 import RxDataSources

14th-team5-iOS/App/Sources/Presentation/Home/ViewControllers/MainViewController.swift

@@ -10,6 +10,7 @@ import UIKit
 import Core
 import Domain
 import DesignSystem
+import Util
 
 import RxDataSources
 import RxCocoa

14th-team5-iOS/App/Sources/Presentation/Management/Reactor/FamilyNameSettingViewReactor.swift

@@ -8,6 +8,7 @@
 import Foundation
 
 import Core
+import Util
 import Domain
 import ReactorKit
 

14th-team5-iOS/App/Sources/Presentation/Management/Reactor/ManagementReactor.swift

@@ -8,6 +8,7 @@
 import Core
 import DesignSystem
 import Domain
+import Util
 import UIKit
 
 import ReactorKit

14th-team5-iOS/App/Sources/Presentation/Management/ViewController/FamilyNameSettingViewController.swift

@@ -6,6 +6,7 @@
 //
 
 import Core
+import Util
 import DesignSystem
 import UIKit
 

14th-team5-iOS/App/Sources/Presentation/Management/ViewController/ManagementViewController.swift

@@ -8,6 +8,7 @@
 import Core
 import DesignSystem
 import UIKit
+import Util
 
 import ReactorKit
 import RxCocoa

14th-team5-iOS/App/Sources/Presentation/OnBoarding/OnBoardingReactor.swift

@@ -11,6 +11,7 @@ import UIKit
 import Core
 import Data
 import Domain
+import Util
 
 import ReactorKit
 

14th-team5-iOS/App/Sources/Presentation/PostDetail/ViewControllers/PostViewController.swift

@@ -8,6 +8,7 @@
 import UIKit
 import Core
 import Domain
+import Util
 
 import RxDataSources
 import RxSwift

14th-team5-iOS/App/Sources/Presentation/Privacy/PrivacyViewController.swift

@@ -8,6 +8,7 @@
 import UIKit
 
 import Core
+import Util
 import DesignSystem
 import RxSwift
 import RxCocoa

14th-team5-iOS/App/Sources/Presentation/Privacy/Reactor/PrivacyViewReactor.swift

@@ -10,6 +10,7 @@ import Foundation
 import Core
 import Domain
 import Data
+import Util
 import ReactorKit
 
 public final class PrivacyViewReactor: Reactor {

14th-team5-iOS/App/Sources/Presentation/Profile/ProfileFeedPageViewController.swift

@@ -9,6 +9,7 @@ import UIKit
 
 import Core
 import RxSwift
+import Util
 import ReactorKit
 import RxCocoa
 

14th-team5-iOS/App/Sources/Presentation/Profile/ProfileViewController.swift

@@ -8,6 +8,7 @@
 import UIKit
 
 import Core
+import Util
 import DesignSystem
 import Kingfisher
 import PhotosUI

14th-team5-iOS/App/Sources/Presentation/Profile/Reactor/ProfileViewReactor.swift

@@ -9,6 +9,7 @@ import Foundation
 
 import Core
 import Domain
+import Util
 import ReactorKit
 
 

14th-team5-iOS/App/Sources/Presentation/Resign/AccountResignViewController.swift

@@ -9,6 +9,7 @@ import UIKit
 
 import Core
 import DesignSystem
+import Util
 import RxCocoa
 import ReactorKit
 import RxDataSources

14th-team5-iOS/App/Sources/Presentation/Resign/Reactor/AccountResignViewReactor.swift

@@ -9,6 +9,7 @@ import Foundation
 
 import Core
 import Domain
+import Util
 import ReactorKit
 import RxSwift
 

14th-team5-iOS/Data/Sources/Storages/UserDefaults/FamilyUserDefaults/FamilyUserDefaults.swift

@@ -9,6 +9,7 @@ import Foundation
 
 import Core
 import Domain
+import Util
 
 
 public protocol FamilyInfoUserDefaultsType: UserDefaultsType {

14th-team5-iOS/Data/Sources/Trash/Account/AccountRepository/AccountRepository.swift

@@ -12,6 +12,7 @@ import UIKit
 import ReactorKit
 import RxCocoa
 import RxSwift
+import Util
 
 public enum AccountLoaction {
     case profile

14th-team5-iOS/Domain/Sources/Entities/Reaction/CreateReactionRequest.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import Core
 
 public struct CreateReactionRequest {
     public let emojiId: String

14th-team5-iOS/Util/Project.swift

@@ -0,0 +1,24 @@
+//
+//  Project.swift
+//  14th-team5-iOSManifests
+//
+//  Created by 김도현 on 12/26/24.
+//
+
+import ProjectDescription
+import ProjectDescriptionHelpers
+
+
+private let targets: [Target] = [
+    .makeModular(
+        layer: .Util,
+        factory: .init(
+            products: .framework(.static),
+            dependencies: ModuleLayer.Util.dependencies
+        )
+    )
+]
+
+private let util = Project.makeApp(name: ModuleLayer.Util.rawValue, target: targets)
+
+

14th-team5-iOS/Core/Sources/Utils/Logger/BBAnalyticsLogType.swift → 14th-team5-iOS/Util/Sources/Logger/BBAnalyticsLogType.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import Core
 
 public protocol BBAnalyticsLogType {
     var name: String { get }

14th-team5-iOS/Core/Sources/Utils/Logger/BBLogManager.swift → 14th-team5-iOS/Util/Sources/Logger/BBLogManager.swift

@@ -7,6 +7,7 @@
 
 import FirebaseCrashlytics
 import FirebaseAnalytics
+import Core
 
 
 public enum BBLogManager {

14th-team5-iOS/Core/Sources/Utils/Mixpanel/MixpanelService.swift → 14th-team5-iOS/Util/Sources/Mixpanel/MixpanelService.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 import Mixpanel
+import Core
 
 // MARK: Mixpanel Protocol
 protocol MixpanelTrackable {

Tuist/Package.swift

@@ -23,7 +23,7 @@ let package = Package(
         .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.6.0"),
         .package(url: "https://github.com/SnapKit/SnapKit.git", from: "5.6.0"),
         .package(url: "https://github.com/devxoul/Then.git", from: "3.0.0"),
-        .package(url: "https://github.com/firebase/firebase-ios-sdk.git", from: "10.24.0"),
+        .package(url: "https://github.com/firebase/firebase-ios-sdk.git", from: "10.25.0"),
         .package(url: "https://github.com/RxSwiftCommunity/RxDataSources.git", from: "5.0.0"),
         .package(url: "https://github.com/kakao/kakao-ios-sdk.git", from: "2.22.0"),
         .package(url: "https://github.com/kakao/kakao-ios-sdk-rx.git", from: "2.22.0"),

Tuist/ProjectDescriptionHelpers/Modular+Templates.swift

@@ -92,7 +92,7 @@ extension Target {
                 sources: factory.sources,
                 resources: factory.resources,
                 entitlements: factory.entitlements,
-                scripts: [.firebaseInfoByConfiguration, .firebaseCrashlytics],
+                scripts: [.firebaseCrashlytics],
                 dependencies: factory.dependencies,
                 settings: factory.settings
             )
@@ -115,7 +115,7 @@ extension Target {
             return .target(
                 name: layer.rawValue,
                 destinations: .iOS,
-                product: .staticFramework,
+                product: factory.products.isFramework ? .staticFramework : .framework,
                 bundleId: "com.\(layer.rawValue).project".lowercased(),
                 deploymentTargets: factory.deploymentTargets,
                 infoPlist: factory.infoPlist,
@@ -125,11 +125,26 @@ extension Target {
                 dependencies: factory.dependencies,
                 settings: factory.settings
             )
+        case .Util:
+            return .target(
+                name: layer.rawValue,
+                destinations: .iOS,
+                product: factory.products.isFramework ? .staticFramework : .framework,
+                bundleId: "com.\(layer.rawValue).project".lowercased(),
+                deploymentTargets: factory.deploymentTargets,
+                infoPlist: factory.infoPlist,
+                sources: factory.sources,
+                resources: factory.resources,
+                entitlements: factory.entitlements,
+                dependencies: factory.dependencies,
+                settings: factory.settings
+            )
+
         case .Core:
             return .target(
                 name: layer.rawValue,
                 destinations: .iOS,
-                product: .staticFramework,
+                product: factory.products.isLibrary ? .framework : .staticFramework,
                 bundleId: "com.\(layer.rawValue).project".lowercased(),
                 deploymentTargets: factory.deploymentTargets,
                 infoPlist: factory.infoPlist,