From 4a04bd7cc0002f62b25d5502928e6da265236dfc Mon Sep 17 00:00:00 2001 From: 6uohul Date: Sat, 11 May 2024 16:12:43 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[Fix]=20#287-=20googleService-Info=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Peekabook/Peekabook.xcodeproj/project.pbxproj | 21 ++++++------ .../xcshareddata/swiftpm/Package.resolved | 32 +++++++++---------- .../xcshareddata/xcschemes/Peekabook.xcscheme | 2 +- .../Peekabook/Application/AppDelegate.swift | 6 +--- .../{ => Firebase}/GoogleService-Info.plist | 0 Peekabook/Peekabook/Info.plist | 1 + 6 files changed, 30 insertions(+), 32 deletions(-) rename Peekabook/Peekabook/{ => Firebase}/GoogleService-Info.plist (100%) diff --git a/Peekabook/Peekabook.xcodeproj/project.pbxproj b/Peekabook/Peekabook.xcodeproj/project.pbxproj index abf06178..71342fda 100644 --- a/Peekabook/Peekabook.xcodeproj/project.pbxproj +++ b/Peekabook/Peekabook.xcodeproj/project.pbxproj @@ -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 */; }; @@ -189,11 +189,11 @@ 143DBFD62971FA980056C609 /* MyPageHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageHeaderView.swift; sourceTree = ""; }; 143FC664296EBA2B0034C7B9 /* GetRecommendResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetRecommendResponse.swift; sourceTree = ""; }; 1444CC042B18A4B400FB9F7E /* ForceUpdateVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ForceUpdateVC.swift; sourceTree = ""; }; - 144AD84C2B8B719B00272412 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 144AD84F2B8B8A0100272412 /* FCMManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FCMManager.swift; sourceTree = ""; }; 145DC3132A04ED8D00D2FB50 /* GetUpdatedTokenResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetUpdatedTokenResponse.swift; sourceTree = ""; }; 14772F652B9FF2E8007B9FC6 /* RecommendDeletePopUpVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendDeletePopUpVC.swift; sourceTree = ""; }; 1481CDD8296D227500F2B207 /* SearchUserResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchUserResponse.swift; sourceTree = ""; }; + 148AF5BD2BEBCA0400A90049 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 148C2E44296F64D200E04662 /* DeletePopUpVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeletePopUpVC.swift; sourceTree = ""; }; 1492DC5C2AFBC99D00C29B7F /* CheckVersionResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckVersionResponse.swift; sourceTree = ""; }; 1492DC612AFBFC8000C29B7F /* AppVersionCheck.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppVersionCheck.swift; sourceTree = ""; }; @@ -383,6 +383,7 @@ 144AD84E2B8B89EA00272412 /* Firebase */ = { isa = PBXGroup; children = ( + 148AF5BD2BEBCA0400A90049 /* GoogleService-Info.plist */, 144AD84F2B8B8A0100272412 /* FCMManager.swift */, ); path = Firebase; @@ -745,7 +746,6 @@ isa = PBXGroup; children = ( 144AD84E2B8B89EA00272412 /* Firebase */, - 144AD84C2B8B719B00272412 /* GoogleService-Info.plist */, 8E39A59D29C83CF3009AC57A /* Peekabook.entitlements */, 8E10BA0D295FF42400BCF58B /* Global */, 8E10BA10295FF44800BCF58B /* Network */, @@ -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 */, @@ -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"; @@ -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 = ""; @@ -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; @@ -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 = ""; diff --git a/Peekabook/Peekabook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Peekabook/Peekabook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 84abd2d1..e6c01286 100644 --- a/Peekabook/Peekabook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Peekabook/Peekabook.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -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" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/firebase/firebase-ios-sdk.git", "state" : { - "revision" : "be49849dcba96f2b5ee550d4eceb2c0fa27dade4", - "version" : "10.22.1" + "revision" : "f91c8167141d0279726c6f6d9d4a47c026785cbc", + "version" : "10.21.0" } }, { @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/GoogleAppMeasurement.git", "state" : { - "revision" : "482cfa4e5880f0a29f66ecfd60c5a62af28bd1f0", - "version" : "10.22.1" + "revision" : "cb8617fab75d181270a1d8f763f26b15c73e2e1e", + "version" : "10.21.0" } }, { @@ -59,8 +59,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/GoogleDataTransport.git", "state" : { - "revision" : "a637d318ae7ae246b02d7305121275bc75ed5565", - "version" : "9.4.0" + "revision" : "a732a4b47f59e4f725a2ea10f0c77e93a7131117", + "version" : "9.3.0" } }, { @@ -68,8 +68,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/GoogleUtilities.git", "state" : { - "revision" : "26c898aed8bed13b8a63057ee26500abbbcb8d55", - "version" : "7.13.1" + "revision" : "bc27fad73504f3d4af235de451f02ee22586ebd3", + "version" : "7.12.1" } }, { @@ -77,8 +77,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/google/grpc-binary.git", "state" : { - "revision" : "ea4cb5cc0c39c732b85386263116d2e2fdbbdc61", - "version" : "1.49.2" + "revision" : "a673bc2937fbe886dd1f99c401b01b6d977a9c98", + "version" : "1.49.1" } }, { @@ -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" } }, { @@ -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" } }, { diff --git a/Peekabook/Peekabook.xcodeproj/xcshareddata/xcschemes/Peekabook.xcscheme b/Peekabook/Peekabook.xcodeproj/xcshareddata/xcschemes/Peekabook.xcscheme index 5687e604..999fb7be 100644 --- a/Peekabook/Peekabook.xcodeproj/xcshareddata/xcschemes/Peekabook.xcscheme +++ b/Peekabook/Peekabook.xcodeproj/xcshareddata/xcschemes/Peekabook.xcscheme @@ -31,7 +31,7 @@ UIBackgroundModes + fetch remote-notification From 5cee34a981003c7d8fc671e8b9168512937d1124 Mon Sep 17 00:00:00 2001 From: 6uohul Date: Sat, 11 May 2024 16:13:10 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Fix]=20#287-=20=EC=B6=94=EC=B2=9C=ED=95=9C?= =?UTF-8?q?=20=EC=B1=85=20=EC=82=AD=EC=A0=9C=20=EC=95=88=20=EB=90=A8=20?= =?UTF-8?q?=EC=9D=B4=EC=8A=88=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Peekabook/Presentation/Recommend/VC/RecommendingVC.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Peekabook/Peekabook/Presentation/Recommend/VC/RecommendingVC.swift b/Peekabook/Peekabook/Presentation/Recommend/VC/RecommendingVC.swift index b22ba027..44841802 100644 --- a/Peekabook/Peekabook/Presentation/Recommend/VC/RecommendingVC.swift +++ b/Peekabook/Peekabook/Presentation/Recommend/VC/RecommendingVC.swift @@ -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) }