Merge branch 'develop' into refactor/#91-login

Team-HMH · Nov 7, 2024 · cb8bfb4 · cb8bfb4
2 parents f1df98e + 7e1ea40
commit cb8bfb4
Show file tree

Hide file tree

Showing 237 changed files with 7,248 additions and 2,287 deletions.
diff --git a/HMH_Tuist_iOS/HMH-Tuist-iOS.xcworkspace/contents.xcworkspacedata b/HMH_Tuist_iOS/HMH-Tuist-iOS.xcworkspace/contents.xcworkspacedata
diff --git a/...ist_iOS/HMH-Tuist-iOS.xcworkspace/xcshareddata/xcschemes/HMH-Tuist-iOS-Workspace.xcscheme b/...ist_iOS/HMH-Tuist-iOS.xcworkspace/xcshareddata/xcschemes/HMH-Tuist-iOS-Workspace.xcscheme
diff --git a/HMH_Tuist_iOS/Plugins/DependencyPlugin/ProjectDescriptionHelpers/Dependency+SPM.swift b/HMH_Tuist_iOS/Plugins/DependencyPlugin/ProjectDescriptionHelpers/Dependency+SPM.swift
@@ -16,8 +16,6 @@ public extension TargetDependency {
 }
 
 public extension TargetDependency.SPM {
-    static let Kingfisher = TargetDependency.external(name: "Kingfisher")
-    static let Moya = TargetDependency.external(name: "Moya")
     static let Lottie = TargetDependency.external(name: "Lottie")
     static let KakaoSDK = TargetDependency.external(name: "KakaoSDK")
     static let KeychainAccess = TargetDependency.external(name: "KeychainAccess")

diff --git a/HMH_Tuist_iOS/Projects/App/Project.swift b/HMH_Tuist_iOS/Projects/App/Project.swift
@@ -14,8 +14,7 @@ let project = Project.makeModule(
     name: env.workspaceName,
     targets: [.app],
     internalDependencies: [
-//        .data, //현재 너무 역할이 애매함으로 Network 모듈로 수정해둠
-        .Modules.networks,
+        .data,
         .Features.RootFeature
     ]
 )

diff --git a/...ombine/Service/Foundation/CancelBag.swift → ...ources/Extension/Combine+/CancelBag.swift b/...ombine/Service/Foundation/CancelBag.swift → ...ources/Extension/Combine+/CancelBag.swift
@@ -1,8 +1,8 @@
 //
-//  CancelBag.swift
-//  MyPageFeatureInterface
+//  File.swift
+//  Core
 //
-//  Created by 류희재 on 8/13/24.
+//  Created by 류희재 on 10/30/24.
 //  Copyright © 2024 HMH-iOS. All rights reserved.
 //
 

diff --git a/HMH_Tuist_iOS/Projects/Core/Sources/Extension/Combine+/Mapper.swift b/HMH_Tuist_iOS/Projects/Core/Sources/Extension/Combine+/Mapper.swift
@@ -0,0 +1,32 @@
+//
+//  Combine+.swift
+//  Core
+//
+//  Created by 류희재 on 10/29/24.
+//  Copyright © 2024 HMH-iOS. All rights reserved.
+//
+
+import Foundation
+import Combine
+
+public extension Publisher {
+    /// Output을 Void로 변환하는 메서드
+    func asVoid() -> AnyPublisher<Void, Failure> {
+        self.map { _ in () }
+            .eraseToAnyPublisher()
+    }
+
+    /// Error 타입을 일반 Error로 변환하는 메서드
+    func mapToGeneralError() -> AnyPublisher<Output, Error> {
+        self.mapError { $0 as Error }
+            .eraseToAnyPublisher()
+    }
+
+    /// Output을 Void로 변환하고, Failure 타입을 일반 Error로 변환하는 메서드
+    func asVoidWithGeneralError() -> AnyPublisher<Void, Error> {
+        self.map { _ in () }
+            .mapError { $0 as Error }
+            .eraseToAnyPublisher()
+    }
+}
+
diff --git a/...Tuist_iOS/Projects/Data/Demo/Resources/Assets.xcassets/AccentColor.colorset/Contents.json b/...Tuist_iOS/Projects/Data/Demo/Resources/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HMH_Tuist_iOS/Projects/Data/Demo/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/HMH_Tuist_iOS/Projects/Data/Demo/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,98 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HMH_Tuist_iOS/Projects/Data/Demo/Resources/Assets.xcassets/Contents.json b/HMH_Tuist_iOS/Projects/Data/Demo/Resources/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/HMH_Tuist_iOS/Projects/Data/Derived/InfoPlists/DataDemo-Info.plist b/HMH_Tuist_iOS/Projects/Data/Derived/InfoPlists/DataDemo-Info.plist
@@ -0,0 +1,76 @@
+<?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>BASE_URL</key>
+	<string>$(BASE_URL)</string>
+	<key>BGTaskSchedulerPermittedIdentifiers</key>
+	<array>
+		<string>com.HMH.dailyTask</string>
+	</array>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>kakao$(KAKAO_API_KEY)</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>KAKAO_API_KEY</key>
+	<string>$(KAKAO_API_KEY)</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>kakaokompassauth</string>
+		<string>kakaolink</string>
+	</array>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>UIAppFonts</key>
+	<array>
+		<string>Pretendard-Regular.otf</string>
+		<string>Pretendard-SemiBold.otf</string>
+		<string>Pretendard-Medium.otf</string>
+	</array>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict/>
+	</dict>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff --git a/HMH_Tuist_iOS/Projects/Data/Derived/InfoPlists/DataTests-Info.plist b/HMH_Tuist_iOS/Projects/Data/Derived/InfoPlists/DataTests-Info.plist
@@ -0,0 +1,22 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>