Skip to content

Commit d86a896

Browse files
jjoonleojjoonleo
committed
Merge branch 'hotfix/remove-full-screen-intent'
2 parents f21b6b9 + 373369e commit d86a896

3 files changed

Lines changed: 107 additions & 40 deletions

File tree

‎ios/Flutter/Profile.xcconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"
2+
#include "Generated.xcconfig"
3+
#include "Dart-Defines.xcconfig"

‎ios/Podfile.lock‎

Lines changed: 97 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,54 @@ PODS:
99
- GoogleUtilities/Environment (~> 8.0)
1010
- GoogleUtilities/UserDefaults (~> 8.0)
1111
- PromisesObjC (~> 2.4)
12-
- Firebase/CoreOnly (12.12.0):
13-
- FirebaseCore (~> 12.12.0)
14-
- Firebase/Messaging (12.12.0):
12+
- Firebase/CoreOnly (12.13.0):
13+
- FirebaseCore (~> 12.13.0)
14+
- Firebase/Messaging (12.13.0):
1515
- Firebase/CoreOnly
16-
- FirebaseMessaging (~> 12.12.0)
17-
- firebase_core (4.7.0):
18-
- Firebase/CoreOnly (= 12.12.0)
16+
- FirebaseMessaging (~> 12.13.0)
17+
- firebase_analytics (12.4.1):
18+
- firebase_core
19+
- FirebaseAnalytics (= 12.13.0)
20+
- Flutter
21+
- firebase_core (4.9.0):
22+
- Firebase/CoreOnly (= 12.13.0)
1923
- Flutter
20-
- firebase_messaging (16.2.0):
21-
- Firebase/Messaging (= 12.12.0)
24+
- firebase_messaging (16.2.2):
25+
- Firebase/Messaging (= 12.13.0)
2226
- firebase_core
2327
- Flutter
24-
- FirebaseCore (12.12.1):
25-
- FirebaseCoreInternal (~> 12.12.0)
28+
- FirebaseAnalytics (12.13.0):
29+
- FirebaseAnalytics/Default (= 12.13.0)
30+
- FirebaseCore (~> 12.13.0)
31+
- FirebaseInstallations (~> 12.13.0)
32+
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
33+
- GoogleUtilities/MethodSwizzler (~> 8.1)
34+
- GoogleUtilities/Network (~> 8.1)
35+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
36+
- nanopb (~> 3.30910.0)
37+
- FirebaseAnalytics/Default (12.13.0):
38+
- FirebaseCore (~> 12.13.0)
39+
- FirebaseInstallations (~> 12.13.0)
40+
- GoogleAppMeasurement/Default (= 12.13.0)
41+
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
42+
- GoogleUtilities/MethodSwizzler (~> 8.1)
43+
- GoogleUtilities/Network (~> 8.1)
44+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
45+
- nanopb (~> 3.30910.0)
46+
- FirebaseCore (12.13.0):
47+
- FirebaseCoreInternal (~> 12.13.0)
2648
- GoogleUtilities/Environment (~> 8.1)
2749
- GoogleUtilities/Logger (~> 8.1)
28-
- FirebaseCoreInternal (12.12.0):
50+
- FirebaseCoreInternal (12.13.0):
2951
- "GoogleUtilities/NSData+zlib (~> 8.1)"
30-
- FirebaseInstallations (12.12.0):
31-
- FirebaseCore (~> 12.12.0)
52+
- FirebaseInstallations (12.13.0):
53+
- FirebaseCore (~> 12.13.0)
3254
- GoogleUtilities/Environment (~> 8.1)
3355
- GoogleUtilities/UserDefaults (~> 8.1)
3456
- PromisesObjC (~> 2.4)
35-
- FirebaseMessaging (12.12.0):
36-
- FirebaseCore (~> 12.12.0)
37-
- FirebaseInstallations (~> 12.12.0)
57+
- FirebaseMessaging (12.13.0):
58+
- FirebaseCore (~> 12.13.0)
59+
- FirebaseInstallations (~> 12.13.0)
3860
- GoogleDataTransport (~> 10.1)
3961
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
4062
- GoogleUtilities/Environment (~> 8.1)
@@ -55,6 +77,33 @@ PODS:
5577
- FlutterMacOS
5678
- GoogleSignIn (~> 9.0)
5779
- GTMSessionFetcher (>= 3.4.0)
80+
- GoogleAdsOnDeviceConversion (3.5.0):
81+
- GoogleUtilities/Environment (~> 8.1)
82+
- GoogleUtilities/Logger (~> 8.1)
83+
- GoogleUtilities/Network (~> 8.1)
84+
- nanopb (~> 3.30910.0)
85+
- GoogleAppMeasurement/Core (12.13.0):
86+
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
87+
- GoogleUtilities/MethodSwizzler (~> 8.1)
88+
- GoogleUtilities/Network (~> 8.1)
89+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
90+
- nanopb (~> 3.30910.0)
91+
- GoogleAppMeasurement/Default (12.13.0):
92+
- GoogleAdsOnDeviceConversion (~> 3.5.0)
93+
- GoogleAppMeasurement/Core (= 12.13.0)
94+
- GoogleAppMeasurement/IdentitySupport (= 12.13.0)
95+
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
96+
- GoogleUtilities/MethodSwizzler (~> 8.1)
97+
- GoogleUtilities/Network (~> 8.1)
98+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
99+
- nanopb (~> 3.30910.0)
100+
- GoogleAppMeasurement/IdentitySupport (12.13.0):
101+
- GoogleAppMeasurement/Core (= 12.13.0)
102+
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
103+
- GoogleUtilities/MethodSwizzler (~> 8.1)
104+
- GoogleUtilities/Network (~> 8.1)
105+
- "GoogleUtilities/NSData+zlib (~> 8.1)"
106+
- nanopb (~> 3.30910.0)
58107
- GoogleDataTransport (10.1.0):
59108
- nanopb (~> 3.30910.0)
60109
- PromisesObjC (~> 2.4)
@@ -73,6 +122,9 @@ PODS:
73122
- GoogleUtilities/Logger (8.1.0):
74123
- GoogleUtilities/Environment
75124
- GoogleUtilities/Privacy
125+
- GoogleUtilities/MethodSwizzler (8.1.0):
126+
- GoogleUtilities/Logger
127+
- GoogleUtilities/Privacy
76128
- GoogleUtilities/Network (8.1.0):
77129
- GoogleUtilities/Logger
78130
- "GoogleUtilities/NSData+zlib"
@@ -145,6 +197,7 @@ PODS:
145197
- FlutterMacOS
146198

147199
DEPENDENCIES:
200+
- firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`)
148201
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
149202
- firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
150203
- Flutter (from `Flutter`)
@@ -166,10 +219,13 @@ SPEC REPOS:
166219
- AppAuth
167220
- AppCheckCore
168221
- Firebase
222+
- FirebaseAnalytics
169223
- FirebaseCore
170224
- FirebaseCoreInternal
171225
- FirebaseInstallations
172226
- FirebaseMessaging
227+
- GoogleAdsOnDeviceConversion
228+
- GoogleAppMeasurement
173229
- GoogleDataTransport
174230
- GoogleSignIn
175231
- GoogleUtilities
@@ -180,6 +236,8 @@ SPEC REPOS:
180236
- sqlite3
181237

182238
EXTERNAL SOURCES:
239+
firebase_analytics:
240+
:path: ".symlinks/plugins/firebase_analytics/ios"
183241
firebase_core:
184242
:path: ".symlinks/plugins/firebase_core/ios"
185243
firebase_messaging:
@@ -214,34 +272,38 @@ EXTERNAL SOURCES:
214272
SPEC CHECKSUMS:
215273
AppAuth: 1c1a8afa7e12f2ec3a294d9882dfa5ab7d3cb063
216274
AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f
217-
Firebase: aa154fee4e9b8eac17aa42344988865b3e857d33
218-
firebase_core: 40bc9f4c0ee3a28fbfb1e00e2ddaed744bb86388
219-
firebase_messaging: 7168ed5c5f52fc396426745be147263cfcc39ecc
220-
FirebaseCore: 86241206e656f5c80c995e370e6c975913b9b284
221-
FirebaseCoreInternal: 7c12fc3011d889085e765e317d7b9fd1cef97af9
222-
FirebaseInstallations: 4e6e162aa4abaaeeeb01dd00179dfc5ad9c2194e
223-
FirebaseMessaging: 341004946fa7ffc741344b20f1b667514fc93e31
275+
Firebase: 7d62445aeabdaea36f7d372f33052fed9a72514f
276+
firebase_analytics: 51adf1f5ff2bf44ebe0ce62e75054c2d5d65a75b
277+
firebase_core: 0013f886fbd0b4950865551eaab47784424bfdb5
278+
firebase_messaging: b875e4088ddd9ecd1834f6c89f6e0a1ffc7d98f0
279+
FirebaseAnalytics: 853fa849aca9e418f163c2de5ed0a867efa4fddf
280+
FirebaseCore: 58905958aa00a061397a0fd759ae4b55bddb3576
281+
FirebaseCoreInternal: 37bee58388fc6d183f0ab1b32d69ae44f2cf8aad
282+
FirebaseInstallations: 134bde50e477628ded76070efdb12d515d53f948
283+
FirebaseMessaging: 30564b85d2f81a96f9d312bd23acf8186ff092ae
224284
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
225-
flutter_appauth: 88fcbc27871cbedac400db9d39b1363e4850179d
226-
flutter_local_notifications: ff50f8405aaa0ccdc7dcfb9022ca192e8ad9688f
227-
flutter_secure_storage_darwin: 557817588b80e60213cbecb573c45c76b788018d
228-
google_sign_in_ios: 4bb0e529b167cadc6ac785b6ed943c0a0a4cc1c9
285+
flutter_appauth: d4abcf54856e5d8ba82ed7646ffc83245d4aa448
286+
flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
287+
flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23
288+
google_sign_in_ios: 205742c688aea0e64db9da03c33121694a365109
289+
GoogleAdsOnDeviceConversion: 914d95386d0dd6815e8b1d70c465fe1d13312a1e
290+
GoogleAppMeasurement: 01e991b4c0c025dd66558dbc5133b5d70ccdf88e
229291
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
230292
GoogleSignIn: fcee2257188d5eda57a5e2b6a715550ffff9206d
231293
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
232294
GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238
233295
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
234-
kakao_flutter_sdk_common: a21740b9dd4900f96161f365a2b6ece7a97cbf4f
296+
kakao_flutter_sdk_common: 682b3606698f87467788598dc2dc09d4e6867fbd
235297
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
236-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
237-
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
298+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
299+
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
238300
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
239-
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
240-
sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440
301+
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
302+
sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418
241303
sqlite3: a51c07cf16e023d6c48abd5e5791a61a47354921
242-
sqlite3_flutter_libs: f9114e4bbe1f2e03dd543373c53d23245982ca13
243-
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
244-
webview_flutter_wkwebview: a4af96a051138e28e29f60101d094683b9f82188
304+
sqlite3_flutter_libs: b3e120efe9a82017e5552a620f696589ed4f62ab
305+
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
306+
webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2
245307

246308
PODFILE CHECKSUM: be4663332fca77601dd6736e3676fe47177084e1
247309

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,19 @@
5757
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
5858
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
5959
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
60+
7AFA3C8F1D35360C0083082E /* Profile.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Profile.xcconfig; path = Flutter/Profile.xcconfig; sourceTree = "<group>"; };
6061
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
6162
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
6263
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
6364
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
6465
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
6566
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
66-
D77738812D8A000000000001 /* Info-Debug.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Debug.plist"; sourceTree = "<group>"; };
6767
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6868
9B0A0B393C9095132C2689C0 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
6969
9C12B98E3998C1270FDE43D1 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
7070
9FCEB1E9F994E1CBEED0F697 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7171
D65DAC376C735608767615E8 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
72+
D77738812D8A000000000001 /* Info-Debug.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Debug.plist"; sourceTree = "<group>"; };
7273
F7718A4898602D489454D4F5 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
7374
/* End PBXFileReference section */
7475

@@ -128,6 +129,7 @@
128129
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
129130
9740EEB21CF90195004384FC /* Debug.xcconfig */,
130131
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
132+
7AFA3C8F1D35360C0083082E /* Profile.xcconfig */,
131133
9740EEB31CF90195004384FC /* Generated.xcconfig */,
132134
);
133135
name = Flutter;
@@ -513,13 +515,13 @@
513515
};
514516
249021D4217E4FDB00AE95B9 /* Profile */ = {
515517
isa = XCBuildConfiguration;
516-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
518+
baseConfigurationReference = 7AFA3C8F1D35360C0083082E /* Profile.xcconfig */;
517519
buildSettings = {
518520
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
519521
CLANG_ENABLE_MODULES = YES;
520522
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
521523
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
522-
DEVELOPMENT_TEAM = SA9884Z46P;
524+
DEVELOPMENT_TEAM = FV4XWCGPRZ;
523525
ENABLE_BITCODE = NO;
524526
INFOPLIST_FILE = Runner/Info.plist;
525527
LD_RUNPATH_SEARCH_PATHS = (
@@ -703,7 +705,7 @@
703705
CLANG_ENABLE_MODULES = YES;
704706
CODE_SIGN_ENTITLEMENTS = Runner/RunnerDebug.entitlements;
705707
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
706-
DEVELOPMENT_TEAM = SA9884Z46P;
708+
DEVELOPMENT_TEAM = FV4XWCGPRZ;
707709
ENABLE_BITCODE = NO;
708710
INFOPLIST_FILE = "Runner/Info-Debug.plist";
709711
LD_RUNPATH_SEARCH_PATHS = (
@@ -727,7 +729,7 @@
727729
CLANG_ENABLE_MODULES = YES;
728730
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
729731
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
730-
DEVELOPMENT_TEAM = SA9884Z46P;
732+
DEVELOPMENT_TEAM = FV4XWCGPRZ;
731733
ENABLE_BITCODE = NO;
732734
INFOPLIST_FILE = Runner/Info.plist;
733735
LD_RUNPATH_SEARCH_PATHS = (

0 commit comments

Comments
 (0)