Skip to content

Commit 0217415

Browse files
Update iOS dependencies & use 16 KB page size (#1156)
* Support 16 kb page size, update ios deps, fix refelectable conflict, fix main.dart err * Use production env * Update the local_auth & uni_links & shared_preferences_android for the flutter upgrade to work on android * Update the podfile lock to the latest * Update flutter version on workflow * Update flutter version on analyze workflow --------- Co-authored-by: AhmedHanafy725 <hanafya@incubaid.com>
1 parent c520e17 commit 0217415

File tree

19 files changed

+346
-204
lines changed

19 files changed

+346
-204
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Flutter
2222
uses: subosito/flutter-action@v2
2323
with:
24-
flutter-version: "3.27.2"
24+
flutter-version: "3.35.7"
2525
channel: "stable"
2626

2727
- name: Get dependencies
@@ -47,4 +47,4 @@ jobs:
4747
uses: actions/upload-artifact@v4
4848
with:
4949
name: app-apk
50-
path: app/build/app/outputs/flutter-apk/app-debug.apk
50+
path: app/build/app/outputs/flutter-apk/app-debug.apk

.github/workflows/format_analyze.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Flutter
2222
uses: subosito/flutter-action@v2
2323
with:
24-
flutter-version: "3.27.2"
24+
flutter-version: "3.35.7"
2525
channel: 'stable'
2626

2727
- name: Get dependencies

app/android/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ org.gradle.jvmargs=-Xmx4096M \
1313
--add-opens=java.base/java.io=ALL-UNNAMED \
1414
--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
1515
dev.steenbakker.mobile_scanner.useUnbundled=true
16+
android.experimental.enablePageSizeSupport=true
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#
2+
# Generated file, do not edit.
3+
#
4+
5+
import lldb
6+
7+
def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict):
8+
"""Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages."""
9+
base = frame.register["x0"].GetValueAsAddress()
10+
page_len = frame.register["x1"].GetValueAsUnsigned()
11+
12+
# Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the
13+
# first page to see if handled it correctly. This makes diagnosing
14+
# misconfiguration (e.g. missing breakpoint) easier.
15+
data = bytearray(page_len)
16+
data[0:8] = b'IHELPED!'
17+
18+
error = lldb.SBError()
19+
frame.GetThread().GetProcess().WriteMemory(base, data, error)
20+
if not error.Success():
21+
print(f'Failed to write into {base}[+{page_len}]', error)
22+
return
23+
24+
def __lldb_init_module(debugger: lldb.SBDebugger, _):
25+
target = debugger.GetDummyTarget()
26+
# Caveat: must use BreakpointCreateByRegEx here and not
27+
# BreakpointCreateByName. For some reasons callback function does not
28+
# get carried over from dummy target for the later.
29+
bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$")
30+
bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__))
31+
bp.SetAutoContinue(True)
32+
print("-- LLDB integration loaded --")
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#
2+
# Generated file, do not edit.
3+
#
4+
5+
command script import --relative-to-command-file flutter_lldb_helper.py

app/ios/Podfile.lock

Lines changed: 67 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
PODS:
2+
- app_links (6.4.1):
3+
- Flutter
24
- audio_session (0.0.1):
35
- Flutter
6+
- awesome_notifications (0.10.0):
7+
- Flutter
8+
- IosAwnCore (~> 0.10.0)
9+
- background_fetch (1.3.8):
10+
- Flutter
11+
- connectivity_plus (0.0.1):
12+
- Flutter
413
- Crisp (2.8.2):
514
- Crisp/Crisp (= 2.8.2)
615
- Crisp/Crisp (2.8.2)
7-
- crisp_chat (2.2.3):
8-
- Crisp (~> 2.8.1)
16+
- crisp_chat (2.2.5):
17+
- Crisp (~> 2.8.2)
918
- Flutter
1019
- device_info_plus (0.0.1):
1120
- Flutter
@@ -53,10 +62,13 @@ PODS:
5362
- iDenfySDK/iDenfyLiveness (= 8.6.0)
5463
- iDenfySDK/iDenfyLiveness (8.6.0):
5564
- lottie-ios (= 4.4.3)
65+
- IosAwnCore (0.10.0)
5666
- just_audio (0.0.1):
5767
- Flutter
58-
- local_auth (0.0.1):
68+
- FlutterMacOS
69+
- local_auth_darwin (0.0.1):
5970
- Flutter
71+
- FlutterMacOS
6072
- lottie-ios (4.4.3)
6173
- MLImage (1.0.0-beta5)
6274
- MLKitBarcodeScanning (5.0.0):
@@ -83,30 +95,26 @@ PODS:
8395
- nanopb/encode (= 2.30910.0)
8496
- nanopb/decode (2.30910.0)
8597
- nanopb/encode (2.30910.0)
86-
- open_filex (0.0.2):
98+
- open_file_ios (0.0.1):
8799
- Flutter
88100
- OrderedSet (6.0.3)
89101
- package_info_plus (0.4.5):
90102
- Flutter
91103
- path_provider_foundation (0.0.1):
92104
- Flutter
93105
- FlutterMacOS
94-
- permission_handler_apple (9.3.0):
95-
- Flutter
96106
- PromisesObjC (2.4.0)
97107
- screen_brightness_ios (0.1.0):
98108
- Flutter
99109
- shared_preferences_foundation (0.0.1):
100110
- Flutter
101111
- FlutterMacOS
102-
- "sodium_libs (3.4.3+1)":
112+
- "sodium_libs (3.4.3+2)":
103113
- Flutter
104114
- FlutterMacOS
105115
- sqflite_darwin (0.0.4):
106116
- Flutter
107117
- FlutterMacOS
108-
- uni_links (0.0.1):
109-
- Flutter
110118
- url_launcher_ios (0.0.1):
111119
- Flutter
112120
- video_player_avfoundation (0.0.1):
@@ -119,26 +127,28 @@ PODS:
119127
- FlutterMacOS
120128

121129
DEPENDENCIES:
130+
- app_links (from `.symlinks/plugins/app_links/ios`)
122131
- audio_session (from `.symlinks/plugins/audio_session/ios`)
132+
- awesome_notifications (from `.symlinks/plugins/awesome_notifications/ios`)
133+
- background_fetch (from `.symlinks/plugins/background_fetch/ios`)
134+
- connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
123135
- crisp_chat (from `.symlinks/plugins/crisp_chat/ios`)
124136
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
125137
- Flutter (from `Flutter`)
126138
- flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
127139
- flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
128140
- flutter_pkid (from `.symlinks/plugins/flutter_pkid/ios`)
129141
- idenfy_sdk_flutter (from `.symlinks/plugins/idenfy_sdk_flutter/ios`)
130-
- just_audio (from `.symlinks/plugins/just_audio/ios`)
131-
- local_auth (from `.symlinks/plugins/local_auth/ios`)
142+
- just_audio (from `.symlinks/plugins/just_audio/darwin`)
143+
- local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
132144
- mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`)
133-
- open_filex (from `.symlinks/plugins/open_filex/ios`)
145+
- open_file_ios (from `.symlinks/plugins/open_file_ios/ios`)
134146
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
135147
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
136-
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
137148
- screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
138149
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
139150
- sodium_libs (from `.symlinks/plugins/sodium_libs/darwin`)
140151
- sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
141-
- uni_links (from `.symlinks/plugins/uni_links/ios`)
142152
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
143153
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
144154
- wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
@@ -154,6 +164,7 @@ SPEC REPOS:
154164
- GoogleUtilitiesComponents
155165
- GTMSessionFetcher
156166
- iDenfySDK
167+
- IosAwnCore
157168
- lottie-ios
158169
- MLImage
159170
- MLKitBarcodeScanning
@@ -164,8 +175,16 @@ SPEC REPOS:
164175
- PromisesObjC
165176

166177
EXTERNAL SOURCES:
178+
app_links:
179+
:path: ".symlinks/plugins/app_links/ios"
167180
audio_session:
168181
:path: ".symlinks/plugins/audio_session/ios"
182+
awesome_notifications:
183+
:path: ".symlinks/plugins/awesome_notifications/ios"
184+
background_fetch:
185+
:path: ".symlinks/plugins/background_fetch/ios"
186+
connectivity_plus:
187+
:path: ".symlinks/plugins/connectivity_plus/ios"
169188
crisp_chat:
170189
:path: ".symlinks/plugins/crisp_chat/ios"
171190
device_info_plus:
@@ -181,19 +200,17 @@ EXTERNAL SOURCES:
181200
idenfy_sdk_flutter:
182201
:path: ".symlinks/plugins/idenfy_sdk_flutter/ios"
183202
just_audio:
184-
:path: ".symlinks/plugins/just_audio/ios"
185-
local_auth:
186-
:path: ".symlinks/plugins/local_auth/ios"
203+
:path: ".symlinks/plugins/just_audio/darwin"
204+
local_auth_darwin:
205+
:path: ".symlinks/plugins/local_auth_darwin/darwin"
187206
mobile_scanner:
188207
:path: ".symlinks/plugins/mobile_scanner/ios"
189-
open_filex:
190-
:path: ".symlinks/plugins/open_filex/ios"
208+
open_file_ios:
209+
:path: ".symlinks/plugins/open_file_ios/ios"
191210
package_info_plus:
192211
:path: ".symlinks/plugins/package_info_plus/ios"
193212
path_provider_foundation:
194213
:path: ".symlinks/plugins/path_provider_foundation/darwin"
195-
permission_handler_apple:
196-
:path: ".symlinks/plugins/permission_handler_apple/ios"
197214
screen_brightness_ios:
198215
:path: ".symlinks/plugins/screen_brightness_ios/ios"
199216
shared_preferences_foundation:
@@ -202,8 +219,6 @@ EXTERNAL SOURCES:
202219
:path: ".symlinks/plugins/sodium_libs/darwin"
203220
sqflite_darwin:
204221
:path: ".symlinks/plugins/sqflite_darwin/darwin"
205-
uni_links:
206-
:path: ".symlinks/plugins/uni_links/ios"
207222
url_launcher_ios:
208223
:path: ".symlinks/plugins/url_launcher_ios/ios"
209224
video_player_avfoundation:
@@ -214,47 +229,50 @@ EXTERNAL SOURCES:
214229
:path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"
215230

216231
SPEC CHECKSUMS:
217-
audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207
232+
app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a
233+
audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
234+
awesome_notifications: 0f432b28098d193920b11a44cfa9d2d9313a3888
235+
background_fetch: 851122c99dc3f25a011a6aebec5379ccdf4ab5eb
236+
connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
218237
Crisp: 6747c96b2b2c2a81babf1eaecd1688a65d98edd4
219-
crisp_chat: 0d82d8a11d2119ec4ba173611c7c15885b05332d
220-
device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
221-
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
222-
flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
223-
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
224-
flutter_pkid: 7808bd0baee7580afc1cebebf2a6f3b290e190c5
238+
crisp_chat: c2cfeeafbbda0d36465128982ba121b227755c5a
239+
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
240+
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
241+
flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
242+
flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619
243+
flutter_pkid: 816b9b6b9e0db3bd65fb88a23a6e70e6a3e9473e
225244
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
226245
GoogleMLKit: 97ac7af399057e99182ee8edfa8249e3226a4065
227246
GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8
228247
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
229248
GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
230249
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
231-
idenfy_sdk_flutter: 34d12f5496381ffa2a732f7a12c37e136227e4dc
250+
idenfy_sdk_flutter: 8b8ea0804012526a6131ea0f4fff49bd40884e58
232251
iDenfySDK: 3fdbe83ca3fe4040917dd4f3c17f73625c0d0c47
233-
just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
234-
local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
252+
IosAwnCore: 653786a911089012092ce831f2945cd339855a89
253+
just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed
254+
local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
235255
lottie-ios: fcb5e73e17ba4c983140b7d21095c834b3087418
236256
MLImage: 1824212150da33ef225fbd3dc49f184cf611046c
237257
MLKitBarcodeScanning: 10ca0845a6d15f2f6e911f682a1998b68b973e8b
238258
MLKitCommon: afec63980417d29ffbb4790529a1b0a2291699e1
239259
MLKitVision: e858c5f125ecc288e4a31127928301eaba9ae0c1
240-
mobile_scanner: 96e91f2e1fb396bb7df8da40429ba8dfad664740
260+
mobile_scanner: 92e8812bf22a8f84131e2a7f9d0f44dad1a4742b
241261
nanopb: 438bc412db1928dac798aa6fd75726007be04262
242-
open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
262+
open_file_ios: 5ff7526df64e4394b4fe207636b67a95e83078bb
243263
OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
244-
package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
245-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
246-
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
264+
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
265+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
247266
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
248-
screen_brightness_ios: 7437207a2a9bc56553aa10f782afecf830b4c4e2
249-
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
250-
sodium_libs: 2ec9dede9b53c8de7e26e53d085cfe4ecc288f95
251-
sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
252-
uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
253-
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
254-
video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
255-
wakelock_plus: 373cfe59b235a6dd5837d0fb88791d2f13a90d56
256-
webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4
267+
screen_brightness_ios: 28c5fbdb40634de44f86025d84470158ad4df48c
268+
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
269+
sodium_libs: 7ff4f74719644868b1ac31718e8c840a123ab07d
270+
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
271+
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
272+
video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
273+
wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
274+
webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2
257275

258-
PODFILE CHECKSUM: 050ff199c8e97450c391a88d64db90da96da9995
276+
PODFILE CHECKSUM: a8b05f0f374337dd60eca0b344e34b39ce88cf88
259277

260-
COCOAPODS: 1.16.2
278+
COCOAPODS: 1.16.2

app/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
isa = PBXProject;
171171
attributes = {
172172
LastSwiftUpdateCheck = 1240;
173-
LastUpgradeCheck = 1430;
173+
LastUpgradeCheck = 1510;
174174
ORGANIZATIONNAME = "";
175175
TargetAttributes = {
176176
97C146ED1CF9000F007C117D = {
@@ -395,6 +395,8 @@
395395
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
396396
CLANG_ENABLE_MODULES = YES;
397397
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
398+
CODE_SIGN_IDENTITY = "Apple Development";
399+
CODE_SIGN_STYLE = Automatic;
398400
CURRENT_PROJECT_VERSION = 192;
399401
DEVELOPMENT_TEAM = 5KWG4UBB25;
400402
ENABLE_BITCODE = NO;
@@ -403,7 +405,7 @@
403405
"$(PROJECT_DIR)/Flutter",
404406
);
405407
INFOPLIST_FILE = Runner/Info.plist;
406-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
408+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
407409
LD_RUNPATH_SEARCH_PATHS = (
408410
"$(inherited)",
409411
"@executable_path/Frameworks",
@@ -415,6 +417,7 @@
415417
MARKETING_VERSION = 4.3.0;
416418
PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot;
417419
PRODUCT_NAME = "$(TARGET_NAME)";
420+
PROVISIONING_PROFILE_SPECIFIER = "";
418421
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
419422
SWIFT_VERSION = 5.0;
420423
VERSIONING_SYSTEM = "apple-generic";
@@ -542,6 +545,8 @@
542545
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
543546
CLANG_ENABLE_MODULES = YES;
544547
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
548+
CODE_SIGN_IDENTITY = "Apple Development";
549+
CODE_SIGN_STYLE = Automatic;
545550
CURRENT_PROJECT_VERSION = 192;
546551
DEVELOPMENT_TEAM = 5KWG4UBB25;
547552
ENABLE_BITCODE = NO;
@@ -550,7 +555,7 @@
550555
"$(PROJECT_DIR)/Flutter",
551556
);
552557
INFOPLIST_FILE = Runner/Info.plist;
553-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
558+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
554559
LD_RUNPATH_SEARCH_PATHS = (
555560
"$(inherited)",
556561
"@executable_path/Frameworks",
@@ -562,6 +567,7 @@
562567
MARKETING_VERSION = 4.3.0;
563568
PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot;
564569
PRODUCT_NAME = "$(TARGET_NAME)";
570+
PROVISIONING_PROFILE_SPECIFIER = "";
565571
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
566572
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
567573
SWIFT_VERSION = 5.0;
@@ -579,6 +585,8 @@
579585
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
580586
CLANG_ENABLE_MODULES = YES;
581587
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
588+
CODE_SIGN_IDENTITY = "Apple Development";
589+
CODE_SIGN_STYLE = Automatic;
582590
CURRENT_PROJECT_VERSION = 192;
583591
DEVELOPMENT_TEAM = 5KWG4UBB25;
584592
ENABLE_BITCODE = NO;
@@ -587,7 +595,7 @@
587595
"$(PROJECT_DIR)/Flutter",
588596
);
589597
INFOPLIST_FILE = Runner/Info.plist;
590-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
598+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
591599
LD_RUNPATH_SEARCH_PATHS = (
592600
"$(inherited)",
593601
"@executable_path/Frameworks",
@@ -599,6 +607,7 @@
599607
MARKETING_VERSION = 4.3.0;
600608
PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot;
601609
PRODUCT_NAME = "$(TARGET_NAME)";
610+
PROVISIONING_PROFILE_SPECIFIER = "";
602611
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
603612
SWIFT_VERSION = 5.0;
604613
VERSIONING_SYSTEM = "apple-generic";

0 commit comments

Comments
 (0)