Skip to content

Commit 7e1786c

Browse files
AhmedHanafy725AhmedHanafy725
authored
Merge pull request #1161 from threefoldtech/development_support_16KB
Update the packages to support 16 KB page size on android
2 parents 0217415 + be2bf6c commit 7e1786c

File tree

6 files changed

+259
-340
lines changed

6 files changed

+259
-340
lines changed

‎app/android/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ subprojects {
3232
if (project.plugins.hasPlugin("com.android.application") ||
3333
project.plugins.hasPlugin("com.android.library")) {
3434
project.android {
35-
compileSdkVersion 34
36-
buildToolsVersion "34.0.0"
35+
compileSdkVersion flutter.compileSdkVersion
3736
}
3837
}
3938
}

‎app/ios/Podfile‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,17 @@ target 'Runner' do
3434
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
3535
end
3636

37+
pre_install do |installer|
38+
# Workaround for https://github.com/CocoaPods/CocoaPods/issues/8891
39+
# Disable validation that prevents mixing static and dynamic frameworks
40+
Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
41+
end
42+
3743
post_install do |installer|
3844
installer.pods_project.targets.each do |target|
3945
flutter_additional_ios_build_settings(target)
40-
end
41-
42-
installer.pods_project.targets.each do |target|
46+
47+
# Special configurations for specific pods
4348
if target.name == "lottie-ios"
4449
target.build_configurations.each do |config|
4550
config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES'
@@ -51,7 +56,6 @@ post_install do |installer|
5156
config.build_settings['ENABLE_BITCODE'] = 'NO'
5257
end
5358
end
54-
flutter_additional_ios_build_settings(target)
5559
end
5660

5761
end

‎app/ios/Podfile.lock‎

Lines changed: 31 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ PODS:
66
- awesome_notifications (0.10.0):
77
- Flutter
88
- IosAwnCore (~> 0.10.0)
9-
- background_fetch (1.3.8):
9+
- background_fetch (1.5.0):
1010
- Flutter
11+
- TSBackgroundFetch (~> 4.0)
1112
- connectivity_plus (0.0.1):
1213
- Flutter
1314
- Crisp (2.8.2):
1415
- Crisp/Crisp (= 2.8.2)
1516
- Crisp/Crisp (2.8.2)
16-
- crisp_chat (2.2.5):
17+
- crisp_chat (2.4.1):
1718
- Crisp (~> 2.8.2)
1819
- Flutter
1920
- device_info_plus (0.0.1):
@@ -30,71 +31,22 @@ PODS:
3031
- Flutter
3132
- flutter_pkid (0.0.1):
3233
- Flutter
33-
- GoogleDataTransport (9.4.1):
34-
- GoogleUtilities/Environment (~> 7.7)
35-
- nanopb (< 2.30911.0, >= 2.30908.0)
36-
- PromisesObjC (< 3.0, >= 1.2)
37-
- GoogleMLKit/BarcodeScanning (6.0.0):
38-
- GoogleMLKit/MLKitCore
39-
- MLKitBarcodeScanning (~> 5.0.0)
40-
- GoogleMLKit/MLKitCore (6.0.0):
41-
- MLKitCommon (~> 11.0.0)
42-
- GoogleToolboxForMac/Defines (4.2.1)
43-
- GoogleToolboxForMac/Logger (4.2.1):
44-
- GoogleToolboxForMac/Defines (= 4.2.1)
45-
- "GoogleToolboxForMac/NSData+zlib (4.2.1)":
46-
- GoogleToolboxForMac/Defines (= 4.2.1)
47-
- GoogleUtilities/Environment (7.13.3):
48-
- GoogleUtilities/Privacy
49-
- PromisesObjC (< 3.0, >= 1.2)
50-
- GoogleUtilities/Logger (7.13.3):
51-
- GoogleUtilities/Environment
52-
- GoogleUtilities/Privacy
53-
- GoogleUtilities/Privacy (7.13.3)
54-
- GoogleUtilities/UserDefaults (7.13.3):
55-
- GoogleUtilities/Logger
56-
- GoogleUtilities/Privacy
57-
- GoogleUtilitiesComponents (1.1.0):
58-
- GoogleUtilities/Logger
59-
- GTMSessionFetcher/Core (3.5.0)
60-
- idenfy_sdk_flutter (2.6.0):
34+
- idenfy_sdk_flutter (2.6.5):
6135
- Flutter
62-
- iDenfySDK/iDenfyLiveness (= 8.6.0)
63-
- iDenfySDK/iDenfyLiveness (8.6.0):
64-
- lottie-ios (= 4.4.3)
36+
- iDenfySDK/iDenfyLiveness (= 8.6.8)
37+
- iDenfySDK/iDenfyLiveness (8.6.8):
38+
- lottie-ios (= 4.5.0)
6539
- IosAwnCore (0.10.0)
6640
- just_audio (0.0.1):
6741
- Flutter
6842
- FlutterMacOS
6943
- local_auth_darwin (0.0.1):
7044
- Flutter
7145
- FlutterMacOS
72-
- lottie-ios (4.4.3)
73-
- MLImage (1.0.0-beta5)
74-
- MLKitBarcodeScanning (5.0.0):
75-
- MLKitCommon (~> 11.0)
76-
- MLKitVision (~> 7.0)
77-
- MLKitCommon (11.0.0):
78-
- GoogleDataTransport (< 10.0, >= 9.4.1)
79-
- GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
80-
- "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
81-
- GoogleUtilities/UserDefaults (< 8.0, >= 7.13.0)
82-
- GoogleUtilitiesComponents (~> 1.0)
83-
- GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
84-
- MLKitVision (7.0.0):
85-
- GoogleToolboxForMac/Logger (< 5.0, >= 4.2.1)
86-
- "GoogleToolboxForMac/NSData+zlib (< 5.0, >= 4.2.1)"
87-
- GTMSessionFetcher/Core (< 4.0, >= 3.3.2)
88-
- MLImage (= 1.0.0-beta5)
89-
- MLKitCommon (~> 11.0)
90-
- mobile_scanner (5.2.3):
46+
- lottie-ios (4.5.0)
47+
- mobile_scanner (7.0.0):
9148
- Flutter
92-
- GoogleMLKit/BarcodeScanning (~> 6.0.0)
93-
- nanopb (2.30910.0):
94-
- nanopb/decode (= 2.30910.0)
95-
- nanopb/encode (= 2.30910.0)
96-
- nanopb/decode (2.30910.0)
97-
- nanopb/encode (2.30910.0)
49+
- FlutterMacOS
9850
- open_file_ios (0.0.1):
9951
- Flutter
10052
- OrderedSet (6.0.3)
@@ -103,18 +55,18 @@ PODS:
10355
- path_provider_foundation (0.0.1):
10456
- Flutter
10557
- FlutterMacOS
106-
- PromisesObjC (2.4.0)
10758
- screen_brightness_ios (0.1.0):
10859
- Flutter
10960
- shared_preferences_foundation (0.0.1):
11061
- Flutter
11162
- FlutterMacOS
112-
- "sodium_libs (3.4.3+2)":
63+
- "sodium_libs (3.4.6+4)":
11364
- Flutter
11465
- FlutterMacOS
11566
- sqflite_darwin (0.0.4):
11667
- Flutter
11768
- FlutterMacOS
69+
- TSBackgroundFetch (4.0.5)
11870
- url_launcher_ios (0.0.1):
11971
- Flutter
12072
- video_player_avfoundation (0.0.1):
@@ -141,7 +93,7 @@ DEPENDENCIES:
14193
- idenfy_sdk_flutter (from `.symlinks/plugins/idenfy_sdk_flutter/ios`)
14294
- just_audio (from `.symlinks/plugins/just_audio/darwin`)
14395
- local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
144-
- mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`)
96+
- mobile_scanner (from `.symlinks/plugins/mobile_scanner/darwin`)
14597
- open_file_ios (from `.symlinks/plugins/open_file_ios/ios`)
14698
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
14799
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
@@ -157,22 +109,11 @@ DEPENDENCIES:
157109
SPEC REPOS:
158110
trunk:
159111
- Crisp
160-
- GoogleDataTransport
161-
- GoogleMLKit
162-
- GoogleToolboxForMac
163-
- GoogleUtilities
164-
- GoogleUtilitiesComponents
165-
- GTMSessionFetcher
166112
- iDenfySDK
167113
- IosAwnCore
168114
- lottie-ios
169-
- MLImage
170-
- MLKitBarcodeScanning
171-
- MLKitCommon
172-
- MLKitVision
173-
- nanopb
174115
- OrderedSet
175-
- PromisesObjC
116+
- TSBackgroundFetch
176117

177118
EXTERNAL SOURCES:
178119
app_links:
@@ -204,7 +145,7 @@ EXTERNAL SOURCES:
204145
local_auth_darwin:
205146
:path: ".symlinks/plugins/local_auth_darwin/darwin"
206147
mobile_scanner:
207-
:path: ".symlinks/plugins/mobile_scanner/ios"
148+
:path: ".symlinks/plugins/mobile_scanner/darwin"
208149
open_file_ios:
209150
:path: ".symlinks/plugins/open_file_ios/ios"
210151
package_info_plus:
@@ -232,47 +173,36 @@ SPEC CHECKSUMS:
232173
app_links: 3dbc685f76b1693c66a6d9dd1e9ab6f73d97dc0a
233174
audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
234175
awesome_notifications: 0f432b28098d193920b11a44cfa9d2d9313a3888
235-
background_fetch: 851122c99dc3f25a011a6aebec5379ccdf4ab5eb
176+
background_fetch: 7457cb2c7be3086b37d87207866f30bed2f9fb58
236177
connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
237178
Crisp: 6747c96b2b2c2a81babf1eaecd1688a65d98edd4
238-
crisp_chat: c2cfeeafbbda0d36465128982ba121b227755c5a
179+
crisp_chat: 15246d99e1e1551871455ef34493ba0afe0963c8
239180
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
240181
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
241182
flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
242183
flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619
243184
flutter_pkid: 816b9b6b9e0db3bd65fb88a23a6e70e6a3e9473e
244-
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
245-
GoogleMLKit: 97ac7af399057e99182ee8edfa8249e3226a4065
246-
GoogleToolboxForMac: d1a2cbf009c453f4d6ded37c105e2f67a32206d8
247-
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
248-
GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
249-
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
250-
idenfy_sdk_flutter: 8b8ea0804012526a6131ea0f4fff49bd40884e58
251-
iDenfySDK: 3fdbe83ca3fe4040917dd4f3c17f73625c0d0c47
185+
idenfy_sdk_flutter: 446c31efa9ec9be62654bb03304506e76bf3327a
186+
iDenfySDK: 8424b9e1b0887802d3b5ff8ec85f7f652e02d3df
252187
IosAwnCore: 653786a911089012092ce831f2945cd339855a89
253188
just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed
254189
local_auth_darwin: c3ee6cce0a8d56be34c8ccb66ba31f7f180aaebb
255-
lottie-ios: fcb5e73e17ba4c983140b7d21095c834b3087418
256-
MLImage: 1824212150da33ef225fbd3dc49f184cf611046c
257-
MLKitBarcodeScanning: 10ca0845a6d15f2f6e911f682a1998b68b973e8b
258-
MLKitCommon: afec63980417d29ffbb4790529a1b0a2291699e1
259-
MLKitVision: e858c5f125ecc288e4a31127928301eaba9ae0c1
260-
mobile_scanner: 92e8812bf22a8f84131e2a7f9d0f44dad1a4742b
261-
nanopb: 438bc412db1928dac798aa6fd75726007be04262
190+
lottie-ios: a881093fab623c467d3bce374367755c272bdd59
191+
mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93
262192
open_file_ios: 5ff7526df64e4394b4fe207636b67a95e83078bb
263193
OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
264194
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
265-
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
266-
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
267-
screen_brightness_ios: 28c5fbdb40634de44f86025d84470158ad4df48c
268-
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
269-
sodium_libs: 7ff4f74719644868b1ac31718e8c840a123ab07d
195+
path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
196+
screen_brightness_ios: 9953fd7da5bd480f1a93990daeec2eb42d4f3b52
197+
shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
198+
sodium_libs: 650f802d77b08c737ca4fed4ed68e822fa560c5a
270199
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
271-
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
272-
video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
273-
wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
274-
webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2
200+
TSBackgroundFetch: e91020924db32f27d0a43df7dec6f73f10743571
201+
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
202+
video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a
203+
wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
204+
webview_flutter_wkwebview: 8ebf4fded22593026f7dbff1fbff31ea98573c8d
275205

276-
PODFILE CHECKSUM: a8b05f0f374337dd60eca0b344e34b39ce88cf88
206+
PODFILE CHECKSUM: 6b3e92385375361c039b52cc909381145d3e3d57
277207

278208
COCOAPODS: 1.16.2

‎app/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@
152152
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
153153
7E75E6CA262DCE56000C2EBB /* Embed App Extensions */,
154154
1577792F4C138F0A6A12C487 /* [CP] Embed Pods Frameworks */,
155-
0AA71E2D6715C5B29C833181 /* [CP] Copy Pods Resources */,
156155
);
157156
buildRules = (
158157
);
@@ -212,23 +211,6 @@
212211
/* End PBXResourcesBuildPhase section */
213212

214213
/* Begin PBXShellScriptBuildPhase section */
215-
0AA71E2D6715C5B29C833181 /* [CP] Copy Pods Resources */ = {
216-
isa = PBXShellScriptBuildPhase;
217-
buildActionMask = 2147483647;
218-
files = (
219-
);
220-
inputFileListPaths = (
221-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
222-
);
223-
name = "[CP] Copy Pods Resources";
224-
outputFileListPaths = (
225-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
226-
);
227-
runOnlyForDeploymentPostprocessing = 0;
228-
shellPath = /bin/sh;
229-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
230-
showEnvVarsInLog = 0;
231-
};
232214
1577792F4C138F0A6A12C487 /* [CP] Embed Pods Frameworks */ = {
233215
isa = PBXShellScriptBuildPhase;
234216
buildActionMask = 2147483647;
@@ -237,10 +219,14 @@
237219
inputFileListPaths = (
238220
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
239221
);
222+
inputPaths = (
223+
);
240224
name = "[CP] Embed Pods Frameworks";
241225
outputFileListPaths = (
242226
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
243227
);
228+
outputPaths = (
229+
);
244230
runOnlyForDeploymentPostprocessing = 0;
245231
shellPath = /bin/sh;
246232
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -397,7 +383,7 @@
397383
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
398384
CODE_SIGN_IDENTITY = "Apple Development";
399385
CODE_SIGN_STYLE = Automatic;
400-
CURRENT_PROJECT_VERSION = 192;
386+
CURRENT_PROJECT_VERSION = 195;
401387
DEVELOPMENT_TEAM = 5KWG4UBB25;
402388
ENABLE_BITCODE = NO;
403389
FRAMEWORK_SEARCH_PATHS = (
@@ -414,7 +400,7 @@
414400
"$(inherited)",
415401
"$(PROJECT_DIR)/Flutter",
416402
);
417-
MARKETING_VERSION = 4.3.0;
403+
MARKETING_VERSION = 4.3.1;
418404
PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot;
419405
PRODUCT_NAME = "$(TARGET_NAME)";
420406
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -547,7 +533,7 @@
547533
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
548534
CODE_SIGN_IDENTITY = "Apple Development";
549535
CODE_SIGN_STYLE = Automatic;
550-
CURRENT_PROJECT_VERSION = 192;
536+
CURRENT_PROJECT_VERSION = 195;
551537
DEVELOPMENT_TEAM = 5KWG4UBB25;
552538
ENABLE_BITCODE = NO;
553539
FRAMEWORK_SEARCH_PATHS = (
@@ -564,7 +550,7 @@
564550
"$(inherited)",
565551
"$(PROJECT_DIR)/Flutter",
566552
);
567-
MARKETING_VERSION = 4.3.0;
553+
MARKETING_VERSION = 4.3.1;
568554
PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot;
569555
PRODUCT_NAME = "$(TARGET_NAME)";
570556
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -587,7 +573,7 @@
587573
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
588574
CODE_SIGN_IDENTITY = "Apple Development";
589575
CODE_SIGN_STYLE = Automatic;
590-
CURRENT_PROJECT_VERSION = 192;
576+
CURRENT_PROJECT_VERSION = 195;
591577
DEVELOPMENT_TEAM = 5KWG4UBB25;
592578
ENABLE_BITCODE = NO;
593579
FRAMEWORK_SEARCH_PATHS = (
@@ -604,7 +590,7 @@
604590
"$(inherited)",
605591
"$(PROJECT_DIR)/Flutter",
606592
);
607-
MARKETING_VERSION = 4.3.0;
593+
MARKETING_VERSION = 4.3.1;
608594
PRODUCT_BUNDLE_IDENTIFIER = org.jimber.threebot;
609595
PRODUCT_NAME = "$(TARGET_NAME)";
610596
PROVISIONING_PROFILE_SPECIFIER = "";

0 commit comments

Comments
 (0)