APP-iOS2 · hyeonghwan · May 8, 2024 · May 8, 2024 · May 14, 2024 · May 14, 2024
diff --git a/.github/workflows/test_dev.yml b/.github/workflows/test_dev.yml
@@ -2,7 +2,7 @@
 name: Run Test
 
 env:
-  PROJECT: 'Pickle'
+  PROJECT: 'PickleApp'
 
 on:
   # dev 브랜치에 pull request 이벤트가 일어났을때 해당 workflow 를 trigger
@@ -52,7 +52,7 @@ jobs:
       if: github.event_name == 'pull_request'
       run: | 
         xcodebuild test \
-        -project Pickle/Pickle.xcodeproj \
+        -workspace ${{env.PROJECT}}.xcworkspace \
         -scheme Pickle \
         -destination 'platform=iOS Simulator,name=iPhone 15 Pro,OS=17.0.1'
 

diff --git a/.gitignore b/.gitignore
@@ -94,4 +94,4 @@ iOSInjectionProject/
 
 # 프로젝트의 모든 경로에서 GoogleService-Info.plist 파일을 포함하지 않도록 함
 **/GoogleService-Info.plist
-
+**/keypath.txt
diff --git a/Pickle/Pickle-release-info.plist b/Pickle/Pickle-release-info.plist
@@ -2,6 +2,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>Supports Live Activities</key>
+	<string>YES</string>
 	<key>BGTaskSchedulerPermittedIdentifiers</key>
 	<array>
 		<string>com.ddudios.realpizza.refresh_badge</string>

diff --git a/Pickle/Pickle.xcodeproj/project.pbxproj b/Pickle/Pickle.xcodeproj/project.pbxproj
diff --git a/Pickle/Pickle.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Pickle/Pickle.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,6 +1,15 @@
 {
-  "originHash" : "182db11c87d1734fe53a6366b674339f70901a93290bd85def29b63e25e34c43",
+  "originHash" : "3430a87206e1a7b3791f8b0cd89d99b1f4831ce93ae3bdf5f3fc4d62e8d0c589",
   "pins" : [
+    {
+      "identity" : "lottie-spm",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/airbnb/lottie-spm.git",
+      "state" : {
+        "revision" : "1d29eccc24cc8b75bff9f6804155112c0ffc9605",
+        "version" : "4.4.3"
+      }
+    },
     {
       "identity" : "realm-core",
       "kind" : "remoteSourceControl",

diff --git a/Pickle/Pickle.xcodeproj/xcshareddata/xcschemes/Pickle.xcscheme b/Pickle/Pickle.xcodeproj/xcshareddata/xcschemes/Pickle.xcscheme
@@ -4,7 +4,8 @@
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -26,17 +27,33 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:PickleTests/Pickle.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
-            skipped = "NO"
+            skipped = "YES"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "96AA8C8F2BEE747C0075CFE8"
+               BuildableName = "CommonTests.xctest"
+               BlueprintName = "CommonTests"
+               ReferencedContainer = "container:Pickle.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "YES"
             parallelizable = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "965C9B9E2ADAB2380015ABBE"
-               BuildableName = "PickleTests.xctest"
-               BlueprintName = "PickleTests"
+               BlueprintIdentifier = "96AA8CB22BEE74FA0075CFE8"
+               BuildableName = "PickleCommonTests.xctest"
+               BlueprintName = "PickleCommonTests"
                ReferencedContainer = "container:Pickle.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -64,7 +81,7 @@
       </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
@@ -84,7 +101,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>
diff --git a/Pickle/Pickle.xcodeproj/xcshareddata/xcschemes/PickleTests.xcscheme b/Pickle/Pickle.xcodeproj/xcshareddata/xcschemes/PickleTests.xcscheme
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1530"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "965C9B9E2ADAB2380015ABBE"
+               BuildableName = "PickleTests.xctest"
+               BlueprintName = "PickleTests"
+               ReferencedContainer = "container:Pickle.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Pickle/Pickle.xcodeproj/xcshareddata/xcschemes/TaskLiveActivityExtension.xcscheme b/Pickle/Pickle.xcodeproj/xcshareddata/xcschemes/TaskLiveActivityExtension.xcscheme
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1530"
+   wasCreatedForAppExtension = "YES"
+   version = "2.2">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <AutocreatedTestPlanReference>
+            </AutocreatedTestPlanReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "969B88F82BEB9F0000538D12"
+               BuildableName = "TaskLiveActivityExtension.appex"
+               BlueprintName = "TaskLiveActivityExtension"
+               ReferencedContainer = "container:Pickle.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "2137D5742AC1459C00AFE225"
+               BuildableName = "Pickle.app"
+               BlueprintName = "Pickle"
+               ReferencedContainer = "container:Pickle.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "96AA8C8F2BEE747C0075CFE8"
+               BuildableName = "CommonTests.xctest"
+               BlueprintName = "CommonTests"
+               ReferencedContainer = "container:Pickle.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "96AA8CB22BEE74FA0075CFE8"
+               BuildableName = "PickleCommonTests.xctest"
+               BlueprintName = "PickleCommonTests"
+               ReferencedContainer = "container:Pickle.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.springboard">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "969B88F82BEB9F0000538D12"
+            BuildableName = "TaskLiveActivityExtension.appex"
+            BlueprintName = "TaskLiveActivityExtension"
+            ReferencedContainer = "container:Pickle.xcodeproj">
+         </BuildableReference>
+      </RemoteRunnable>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "_XCWidgetKind"
+            value = ""
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetDefaultView"
+            value = "timeline"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetFamily"
+            value = "systemMedium"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "2137D5742AC1459C00AFE225"
+            BuildableName = "Pickle.app"
+            BlueprintName = "Pickle"
+            ReferencedContainer = "container:Pickle.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Pickle/Pickle/Data/Service/RealmMigrator.swift b/Pickle/Pickle/Data/Service/RealmMigrator.swift
@@ -25,7 +25,7 @@ class RealmMigrator {
                                          schemaVersion: 3, migrationBlock: { migration, oldSchemaVersion in
             if oldSchemaVersion < 2 { migrationFromV1ToV2(migration: migration) }
             if oldSchemaVersion < 3 { migrationFromV2ToV3(migration: migration) }
-        }, deleteRealmIfMigrationNeeded: true)
+        }, deleteRealmIfMigrationNeeded: false)
 
         func migrationFromV1ToV2(migration: Migration) {
             migration.enumerateObjects(ofType: UserObject.className()) { oldObject, newObject in

diff --git a/Pickle/Pickle/Global/Common/Alert/PizzaAlert.swift b/Pickle/Pickle/Global/Common/Alert/PizzaAlert.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import PickleCommon
 
 extension View {
     func showPizzaAlert(

diff --git a/Pickle/Pickle/Global/Common/Modifier/PrimaryButtonModifier.swift b/Pickle/Pickle/Global/Common/Modifier/PrimaryButtonModifier.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import PickleCommon
 
 struct PrimaryButtonModifier: ViewModifier {
 

diff --git a/Pickle/Pickle/Global/Common/Picker/PickerView.swift b/Pickle/Pickle/Global/Common/Picker/PickerView.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import PickleCommon
 
 struct PickerView: View {
 
@@ -26,10 +27,12 @@ struct PickerView: View {
                         .font(.pizzaBody)
                         .foregroundColor(.pickle)
                 }
+
                 Spacer()
 
                 Text("\(title) 설정")
                     .font(.nanumEbTitle)
+
                 Spacer()
 
                 Button {

diff --git a/Pickle/Pickle/Global/Dependency/Injected/Container.swift b/Pickle/Pickle/Global/Dependency/Injected/Container.swift
@@ -45,6 +45,7 @@ struct Container {
             }
             Log.error("fattalError singleton Occur")
             assert(false, "fattalError singleton Occur")
+
         case .newSingleton:
             let service = factories[serviceName]?() as? Dependency
             if let service = service {
@@ -53,13 +54,15 @@ struct Container {
             }
             Log.error("fattalError singleton Occur")
             assert(false, "fattalError singleton Occur")
+
         case .new, .automatic:
             if let dependency = factories[serviceName]?() as? Dependency {
                 return dependency
             }
             Log.error("fattalError singleton Occur")
             assert(false, "fattalError singleton Occur")
         }
+
         return nil
     }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -94,4 +94,4 @@ iOSInjectionProject/

		# 프로젝트의 모든 경로에서 GoogleService-Info.plist 파일을 포함하지 않도록 함
		**/GoogleService-Info.plist

		**/keypath.txt
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     //
     import SwiftUI
+    import PickleCommon
     struct PrimaryButtonModifier: ViewModifier {
@@ Expand Down @@