From 8c469551507e499fa161713495a9acfc38f5fabe Mon Sep 17 00:00:00 2001 From: YumNumm Date: Thu, 30 May 2024 04:50:23 +0900 Subject: [PATCH] fix: lock --- .../FcmServiceExtension/NotificationService.swift | 14 -------------- app/ios/Podfile | 2 ++ app/ios/Podfile.lock | 6 +++++- app/ios/Runner.xcodeproj/project.pbxproj | 15 ++------------- 4 files changed, 9 insertions(+), 28 deletions(-) diff --git a/app/ios/FcmServiceExtension/NotificationService.swift b/app/ios/FcmServiceExtension/NotificationService.swift index a84bcd965..96a4d3782 100644 --- a/app/ios/FcmServiceExtension/NotificationService.swift +++ b/app/ios/FcmServiceExtension/NotificationService.swift @@ -36,20 +36,6 @@ class NotificationService: UNNotificationServiceExtension { contentHandler(bestAttemptContent!) return } - /* DEBUG */ - // notificationPayloadをJSON化 - let encoder = JSONEncoder() - encoder.outputFormatting = .prettyPrinted - - let jsonData = try! - encoder.encode(notificationPayload) - - let jsonString = String(data: jsonData, encoding: .utf8)! - bestAttemptContent!.body = bestAttemptContent!.body + "\n" + jsonString - - contentHandler(bestAttemptContent!) - return - /* DEBUG END */ // EEW if notificationPayload!.type == .eew diff --git a/app/ios/Podfile b/app/ios/Podfile index 0e8e68987..256cdfd2e 100644 --- a/app/ios/Podfile +++ b/app/ios/Podfile @@ -39,6 +39,7 @@ target 'FcmServiceExtension' do use_frameworks! pod 'Firebase/Messaging' pod 'SwiftProtobuf', '~> 1.0' + pod 'GzipSwift' end post_install do |installer| @@ -47,6 +48,7 @@ post_install do |installer| # Start of the permission_handler configuration target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0' # You can enable the permissions needed here. For example to enable camera # permission, just remove the `#` character in front so it looks like this: diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock index 77f30d263..801b5a19e 100644 --- a/app/ios/Podfile.lock +++ b/app/ios/Podfile.lock @@ -170,6 +170,7 @@ PODS: - GoogleUtilities/UserDefaults (7.13.3): - GoogleUtilities/Logger - GoogleUtilities/Privacy + - GzipSwift (5.1.1) - in_app_review (0.2.0): - Flutter - MapLibre (6.4.1) @@ -221,6 +222,7 @@ DEPENDENCIES: - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`) - GoogleUtilities + - GzipSwift - in_app_review (from `.symlinks/plugins/in_app_review/ios`) - maplibre_gl (from `.symlinks/plugins/maplibre_gl/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) @@ -248,6 +250,7 @@ SPEC REPOS: - GoogleAppMeasurement - GoogleDataTransport - GoogleUtilities + - GzipSwift - MapLibre - nanopb - PromisesObjC @@ -322,6 +325,7 @@ SPEC CHECKSUMS: GoogleAppMeasurement: 9abf64b682732fed36da827aa2a68f0221fd2356 GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 + GzipSwift: 893f3e48e597a1a4f62fafcb6514220fcf8287fa in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d MapLibre: 33d082810e1ca968c561dfc85e7e20346f943f11 maplibre_gl: 71d457d869fa39ff03cbec0aa32fb96d749411ac @@ -340,6 +344,6 @@ SPEC CHECKSUMS: SwiftProtobuf: 5e8349171e7c2f88f5b9e683cb3cb79d1dc780b3 url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe -PODFILE CHECKSUM: 0b8b5903d4f7ea7ba6bf199382a502476fb3b42d +PODFILE CHECKSUM: 1742a16a3e169e67321e01c709d08c33d1ab3e29 COCOAPODS: 1.15.2 diff --git a/app/ios/Runner.xcodeproj/project.pbxproj b/app/ios/Runner.xcodeproj/project.pbxproj index ae859c989..26b710cc6 100644 --- a/app/ios/Runner.xcodeproj/project.pbxproj +++ b/app/ios/Runner.xcodeproj/project.pbxproj @@ -12,12 +12,11 @@ 4A6E6F82172719E05F9BD593 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = AD5D302A98B76C01E6D49E1B /* GoogleService-Info.plist */; }; 4F115C462BE9682B00DAAD73 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 4F115C452BE9682B00DAAD73 /* PrivacyInfo.xcprivacy */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; - 7B7B782513B5BD61B436275F /* Pods_FcmServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99B391858A4EFC95F561B05E /* Pods_FcmServiceExtension.framework */; }; 854858802BFF92D90025EC74 /* notification_settings.proto in Sources */ = {isa = PBXBuildFile; fileRef = 8548587E2BFF92D90025EC74 /* notification_settings.proto */; }; 854858812BFF92D90025EC74 /* notification_settings.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8548587F2BFF92D90025EC74 /* notification_settings.pb.swift */; }; + 856D29292C07B84E0015B9FD /* Pods_FcmServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99B391858A4EFC95F561B05E /* Pods_FcmServiceExtension.framework */; }; 859DF75C2BBE9FFC00B827B1 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 859DF75B2BBE9FFC00B827B1 /* StoreKit.framework */; }; 859DF75E2BBEA0F000B827B1 /* Synced - EQMonitor.storekit in Resources */ = {isa = PBXBuildFile; fileRef = 859DF75D2BBEA0F000B827B1 /* Synced - EQMonitor.storekit */; }; - 85B0048F2C077A9B0063ADD5 /* Gzip in Frameworks */ = {isa = PBXBuildFile; productRef = 85B0048E2C077A9B0063ADD5 /* Gzip */; }; 85E609552BFF792C00C21983 /* FcmServiceExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 85E6094E2BFF792C00C21983 /* FcmServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 85E6095B2BFF7AC300C21983 /* notification_payload.proto in Sources */ = {isa = PBXBuildFile; fileRef = 85E6095A2BFF7AC300C21983 /* notification_payload.proto */; }; 85E6095E2BFF7B6400C21983 /* notification_payload.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85E6095C2BFF7B6400C21983 /* notification_payload.pb.swift */; }; @@ -106,8 +105,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 85B0048F2C077A9B0063ADD5 /* Gzip in Frameworks */, - 7B7B782513B5BD61B436275F /* Pods_FcmServiceExtension.framework in Frameworks */, + 856D29292C07B84E0015B9FD /* Pods_FcmServiceExtension.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -237,7 +235,6 @@ ); name = FcmServiceExtension; packageProductDependencies = ( - 85B0048E2C077A9B0063ADD5 /* Gzip */, ); productName = FcmServiceExtension; productReference = 85E6094E2BFF792C00C21983 /* FcmServiceExtension.appex */; @@ -964,14 +961,6 @@ }; }; /* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 85B0048E2C077A9B0063ADD5 /* Gzip */ = { - isa = XCSwiftPackageProductDependency; - package = 85B0048D2C077A9B0063ADD5 /* XCRemoteSwiftPackageReference "GzipSwift" */; - productName = Gzip; - }; -/* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; }