Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Hotfix] #287 - 업데이트 전 이슈 처리 #288

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[Hotfix] #287 - 업데이트 전 이슈 처리 #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a04bd7
[Fix] #287- googleService-Info 업데이트
6uohul May 11, 2024
5cee34a
[Fix] #287- 추천한 책 삭제 안 됨 이슈 해결
6uohul May 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions Peekabook/Peekabook.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
143FC665296EBA2B0034C7B9 /* GetRecommendResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 143FC664296EBA2B0034C7B9 /* GetRecommendResponse.swift */; };
1444CC052B18A4B400FB9F7E /* ForceUpdateVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1444CC042B18A4B400FB9F7E /* ForceUpdateVC.swift */; };
144AD84B2B8B6F4700272412 /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = 144AD84A2B8B6F4700272412 /* FirebaseMessaging */; };
144AD84D2B8B719B00272412 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 144AD84C2B8B719B00272412 /* GoogleService-Info.plist */; };
144AD8502B8B8A0100272412 /* FCMManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 144AD84F2B8B8A0100272412 /* FCMManager.swift */; };
145DC3142A04ED8D00D2FB50 /* GetUpdatedTokenResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 145DC3132A04ED8D00D2FB50 /* GetUpdatedTokenResponse.swift */; };
14772F662B9FF2E8007B9FC6 /* RecommendDeletePopUpVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14772F652B9FF2E8007B9FC6 /* RecommendDeletePopUpVC.swift */; };
1481CDD9296D227500F2B207 /* SearchUserResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1481CDD8296D227500F2B207 /* SearchUserResponse.swift */; };
148AF5BE2BEBCA0400A90049 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 148AF5BD2BEBCA0400A90049 /* GoogleService-Info.plist */; };
148C2E45296F64D200E04662 /* DeletePopUpVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 148C2E44296F64D200E04662 /* DeletePopUpVC.swift */; };
1492DC5D2AFBC99D00C29B7F /* CheckVersionResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1492DC5C2AFBC99D00C29B7F /* CheckVersionResponse.swift */; };
1492DC622AFBFC8000C29B7F /* AppVersionCheck.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1492DC612AFBFC8000C29B7F /* AppVersionCheck.swift */; };
Expand Down Expand Up @@ -189,11 +189,11 @@
143DBFD62971FA980056C609 /* MyPageHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageHeaderView.swift; sourceTree = "<group>"; };
143FC664296EBA2B0034C7B9 /* GetRecommendResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetRecommendResponse.swift; sourceTree = "<group>"; };
1444CC042B18A4B400FB9F7E /* ForceUpdateVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForceUpdateVC.swift; sourceTree = "<group>"; };
144AD84C2B8B719B00272412 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
144AD84F2B8B8A0100272412 /* FCMManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FCMManager.swift; sourceTree = "<group>"; };
145DC3132A04ED8D00D2FB50 /* GetUpdatedTokenResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetUpdatedTokenResponse.swift; sourceTree = "<group>"; };
14772F652B9FF2E8007B9FC6 /* RecommendDeletePopUpVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendDeletePopUpVC.swift; sourceTree = "<group>"; };
1481CDD8296D227500F2B207 /* SearchUserResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchUserResponse.swift; sourceTree = "<group>"; };
148AF5BD2BEBCA0400A90049 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
148C2E44296F64D200E04662 /* DeletePopUpVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeletePopUpVC.swift; sourceTree = "<group>"; };
1492DC5C2AFBC99D00C29B7F /* CheckVersionResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckVersionResponse.swift; sourceTree = "<group>"; };
1492DC612AFBFC8000C29B7F /* AppVersionCheck.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppVersionCheck.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -383,6 +383,7 @@
144AD84E2B8B89EA00272412 /* Firebase */ = {
isa = PBXGroup;
children = (
148AF5BD2BEBCA0400A90049 /* GoogleService-Info.plist */,
144AD84F2B8B8A0100272412 /* FCMManager.swift */,
);
path = Firebase;
Expand Down Expand Up @@ -745,7 +746,6 @@
isa = PBXGroup;
children = (
144AD84E2B8B89EA00272412 /* Firebase */,
144AD84C2B8B719B00272412 /* GoogleService-Info.plist */,
8E39A59D29C83CF3009AC57A /* Peekabook.entitlements */,
8E10BA0D295FF42400BCF58B /* Global */,
8E10BA10295FF44800BCF58B /* Network */,
Expand Down Expand Up @@ -1119,7 +1119,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
144AD84D2B8B719B00272412 /* GoogleService-Info.plist in Resources */,
148AF5BE2BEBCA0400A90049 /* GoogleService-Info.plist in Resources */,
8E5A30AB295DAE6F00285A15 /* Assets.xcassets in Resources */,
8E5A30A9295DAE6D00285A15 /* Main.storyboard in Resources */,
8E5A30AE295DAE6F00285A15 /* LaunchScreen.storyboard in Resources */,
Expand Down Expand Up @@ -1472,10 +1472,9 @@
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Peekabook/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "피카북";
INFOPLIST_KEY_LSApplicationCategoryType = "";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.books";
INFOPLIST_KEY_NSCameraUsageDescription = "바코드 인식 및 프로필 등록을 위해 카메라를 사용합니다";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UIMainStoryboardFile = Main;
INFOPLIST_KEY_UIStatusBarStyle = UIStatusBarStyleLightContent;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "\"\" UIInterfaceOrientationPortrait";
Expand All @@ -1486,7 +1485,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.0;
MARKETING_VERSION = 1.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.sopt.peekabook.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -1504,12 +1503,14 @@
CODE_SIGN_ENTITLEMENTS = Peekabook/Peekabook.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 23090804;
CURRENT_PROJECT_VERSION = 3;
DEPLOYMENT_POSTPROCESSING = NO;
DEVELOPMENT_TEAM = 6SUGCZ4YRX;
ENABLE_HARDENED_RUNTIME = NO;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Peekabook/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "피카북";
INFOPLIST_KEY_LSApplicationCategoryType = "";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.books";
INFOPLIST_KEY_NSCameraUsageDescription = "바코드 인식 및 프로필 등록을 위해 카메라를 사용합니다";
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
Expand All @@ -1523,7 +1524,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.0;
MARKETING_VERSION = 1.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.sopt.peekabook.ios;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
32 changes: 16 additions & 16 deletions Peekabook/Peekabook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/abseil-cpp-binary.git",
"state" : {
"revision" : "df308b8b46607675f2b9ec8e569109008f9155ce",
"version" : "1.2022062300.1"
"revision" : "bfc0b6f81adc06ce5121eb23f628473638d67c5c",
"version" : "1.2022062300.0"
}
},
{
Expand Down Expand Up @@ -41,44 +41,44 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/firebase-ios-sdk.git",
"state" : {
"revision" : "be49849dcba96f2b5ee550d4eceb2c0fa27dade4",
"version" : "10.22.1"
"revision" : "f91c8167141d0279726c6f6d9d4a47c026785cbc",
"version" : "10.21.0"
}
},
{
"identity" : "googleappmeasurement",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleAppMeasurement.git",
"state" : {
"revision" : "482cfa4e5880f0a29f66ecfd60c5a62af28bd1f0",
"version" : "10.22.1"
"revision" : "cb8617fab75d181270a1d8f763f26b15c73e2e1e",
"version" : "10.21.0"
}
},
{
"identity" : "googledatatransport",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleDataTransport.git",
"state" : {
"revision" : "a637d318ae7ae246b02d7305121275bc75ed5565",
"version" : "9.4.0"
"revision" : "a732a4b47f59e4f725a2ea10f0c77e93a7131117",
"version" : "9.3.0"
}
},
{
"identity" : "googleutilities",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleUtilities.git",
"state" : {
"revision" : "26c898aed8bed13b8a63057ee26500abbbcb8d55",
"version" : "7.13.1"
"revision" : "bc27fad73504f3d4af235de451f02ee22586ebd3",
"version" : "7.12.1"
}
},
{
"identity" : "grpc-binary",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/grpc-binary.git",
"state" : {
"revision" : "ea4cb5cc0c39c732b85386263116d2e2fdbbdc61",
"version" : "1.49.2"
"revision" : "a673bc2937fbe886dd1f99c401b01b6d977a9c98",
"version" : "1.49.1"
}
},
{
Expand Down Expand Up @@ -122,8 +122,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/leveldb.git",
"state" : {
"revision" : "43aaef65e0c665daadf848761d560e446d350d3d",
"version" : "1.22.4"
"revision" : "9d108e9112aa1d65ce508facf804674546116d9c",
"version" : "1.22.3"
}
},
{
Expand All @@ -140,8 +140,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/firebase/nanopb.git",
"state" : {
"revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
"version" : "2.30910.0"
"revision" : "819d0a2173aff699fb8c364b6fb906f7cdb1a692",
"version" : "2.30909.0"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Peekabook/Peekabook.xcodeproj/xcshareddata/xcschemes/Peekabook.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
Expand Down
6 changes: 1 addition & 5 deletions Peekabook/Peekabook/Application/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,9 @@ extension AppDelegate: UNUserNotificationCenterDelegate, MessagingDelegate {

// FCM Token 업데이트시
func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {
FCMManager.shared.fcmToken = fcmToken
if let fcmToken {
print("FCM Token: \(fcmToken)")
//
// // TODO: 기존 유저 대응 후 버전 업하면서 아래 코드를 제거합니다.
// let userService = UserService()
// userService.updateFCMToken()
FCMManager.shared.fcmToken = fcmToken
}
}

Expand Down
0 Peekabook/Peekabook/GoogleService-Info.plist → ...ekabook/Firebase/GoogleService-Info.plist
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions Peekabook/Peekabook/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
</dict>
<key>UIBackgroundModes</key>
<array>
<string>fetch</string>
<string>remote-notification</string>
</array>
</dict>
Expand Down
1 change: 1 addition & 0 deletions Peekabook/Peekabook/Presentation/Recommend/VC/RecommendingVC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ extension RecommendingVC {
if let userInfo = notification.userInfo,
let recommendID = userInfo["recommendID"] as? Int {
let deletePopUpVC = RecommendDeletePopUpVC()
deletePopUpVC.recommendId = recommendID
deletePopUpVC.modalPresentationStyle = .overFullScreen
self.present(deletePopUpVC, animated: false)
}
Expand Down