Skip to content

Commit 183fcb6

Browse files
dab246hoangdat
dab246
authored and
hoangdat
committed
Disable charset detector on iOS as workaround to fix build ios fail
Signed-off-by: dab246 <tdvu@linagora.com>
1 parent 8746080 commit 183fcb6

File tree

7 files changed

+53
-84
lines changed

7 files changed

+53
-84
lines changed

‎contact/pubspec.lock‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -344,27 +344,20 @@ packages:
344344
flutter_charset_detector:
345345
dependency: transitive
346346
description:
347-
name: flutter_charset_detector
348-
sha256: "5d4796d43dac2f37e14149b0f0c676fa08e8eb1ada8e99342a838d971d2fb9b1"
349-
url: "https://pub.dev"
350-
source: hosted
351-
version: "3.0.0"
347+
path: flutter_charset_detector
348+
ref: main
349+
resolved-ref: "36c3ffeea65f7b362c1e47e608802f0ca941f4d4"
350+
url: "https://github.com/dab246/flutter_charset_detector.git"
351+
source: git
352+
version: "5.0.0"
352353
flutter_charset_detector_android:
353354
dependency: transitive
354355
description:
355356
name: flutter_charset_detector_android
356-
sha256: bee057133d5f134fe211523a27200dd22c782b93777f43359a571bd2c77da2cc
357-
url: "https://pub.dev"
358-
source: hosted
359-
version: "2.1.1"
360-
flutter_charset_detector_darwin:
361-
dependency: transitive
362-
description:
363-
name: flutter_charset_detector_darwin
364-
sha256: daac20390275efb92fbb14350fe11286c5e29c7b80d6b0867f52d760f0d69763
357+
sha256: "443145e8fc8515b3b32aee375691e40dd59197a86a2ae153166bc88c8200d83b"
365358
url: "https://pub.dev"
366359
source: hosted
367-
version: "1.1.0"
360+
version: "3.0.0"
368361
flutter_charset_detector_platform_interface:
369362
dependency: transitive
370363
description:
@@ -377,10 +370,10 @@ packages:
377370
dependency: transitive
378371
description:
379372
name: flutter_charset_detector_web
380-
sha256: d8495115abada771c75f9395aae3e5809ffd506e8fc8f62b403ae11fc29e1d2b
373+
sha256: e3ac65f94b12f4887937b21a19365d7927db816840cb93274e3861241cb0e9f2
381374
url: "https://pub.dev"
382375
source: hosted
383-
version: "1.0.2"
376+
version: "2.0.0"
384377
flutter_image_compress:
385378
dependency: transitive
386379
description:

‎core/lib/utils/file_utils.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ class FileUtils {
141141

142142
Future<String> getCharsetFromBytes(Uint8List bytes) async {
143143
try {
144+
if (PlatformInfo.isIOS || PlatformInfo.isMacOS) return DEFAULT_CHARSET;
144145
final decodedResult = await CharsetDetector.autoDecode(bytes);
145146
log('FileUtils::getCharsetFromBytes: FILE_CHARSET = ${decodedResult.charset}');
146147
return decodedResult.charset;

‎core/pubspec.lock‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -337,43 +337,36 @@ packages:
337337
flutter_charset_detector:
338338
dependency: "direct main"
339339
description:
340-
name: flutter_charset_detector
341-
sha256: "5d4796d43dac2f37e14149b0f0c676fa08e8eb1ada8e99342a838d971d2fb9b1"
342-
url: "https://pub.dev"
343-
source: hosted
344-
version: "3.0.0"
340+
path: flutter_charset_detector
341+
ref: main
342+
resolved-ref: "36c3ffeea65f7b362c1e47e608802f0ca941f4d4"
343+
url: "https://github.com/dab246/flutter_charset_detector.git"
344+
source: git
345+
version: "5.0.0"
345346
flutter_charset_detector_android:
346347
dependency: transitive
347348
description:
348349
name: flutter_charset_detector_android
349-
sha256: "43d0c0063242d036b873ade737ebae38716af5cd8b2a4df1754adfd186d58e2c"
350+
sha256: "443145e8fc8515b3b32aee375691e40dd59197a86a2ae153166bc88c8200d83b"
350351
url: "https://pub.dev"
351352
source: hosted
352-
version: "2.0.1"
353-
flutter_charset_detector_darwin:
354-
dependency: transitive
355-
description:
356-
name: flutter_charset_detector_darwin
357-
sha256: d17c1847366a0501449d95d18a43417585841afe10200ceefb4422e6b7fccefb
358-
url: "https://pub.dev"
359-
source: hosted
360-
version: "1.0.0"
353+
version: "3.0.0"
361354
flutter_charset_detector_platform_interface:
362355
dependency: transitive
363356
description:
364357
name: flutter_charset_detector_platform_interface
365-
sha256: fcb61de27285031164c945aca4b42e4d36f9a9e359212f21ab652275c9c723ec
358+
sha256: "1c09ed7b314a5a9dde76057b98b7d35458ba881eed03d5e5b6f7f74b4869d18c"
366359
url: "https://pub.dev"
367360
source: hosted
368-
version: "1.0.0"
361+
version: "1.1.0"
369362
flutter_charset_detector_web:
370363
dependency: transitive
371364
description:
372365
name: flutter_charset_detector_web
373-
sha256: d8495115abada771c75f9395aae3e5809ffd506e8fc8f62b403ae11fc29e1d2b
366+
sha256: e3ac65f94b12f4887937b21a19365d7927db816840cb93274e3861241cb0e9f2
374367
url: "https://pub.dev"
375368
source: hosted
376-
version: "1.0.2"
369+
version: "2.0.0"
377370
flutter_image_compress:
378371
dependency: "direct main"
379372
description:

‎core/pubspec.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,14 @@ dependencies:
8989

9090
fk_user_agent: 2.1.0
9191

92-
flutter_charset_detector: 3.0.0
92+
# flutter_charset_detector: 3.0.0
93+
# TODO: Disable charset detector on IOS/MACOS to wait for migration status to complete.
94+
# https://gitlab.freedesktop.org/uchardet/uchardet.git
95+
flutter_charset_detector:
96+
git:
97+
url: https://github.com/dab246/flutter_charset_detector.git
98+
ref: main
99+
path: flutter_charset_detector
93100

94101
debounce_throttle: 2.0.0
95102

‎ios/Podfile.lock‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@ PODS:
9393
- flutter_appauth (0.0.1):
9494
- AppAuth (= 1.7.4)
9595
- Flutter
96-
- flutter_charset_detector_darwin (0.0.1):
97-
- Flutter
98-
- FlutterMacOS
99-
- UniversalDetector2 (= 2.0.1)
10096
- flutter_downloader (0.0.1):
10197
- Flutter
10298
- flutter_file_dialog (0.0.1):
@@ -201,7 +197,6 @@ PODS:
201197
- Flutter
202198
- FlutterMacOS
203199
- SwiftyGif (5.4.4)
204-
- UniversalDetector2 (2.0.1)
205200
- url_launcher_ios (0.0.1):
206201
- Flutter
207202
- workmanager (0.0.1):
@@ -221,7 +216,6 @@ DEPENDENCIES:
221216
- fk_user_agent (from `.symlinks/plugins/fk_user_agent/ios`)
222217
- Flutter (from `Flutter`)
223218
- flutter_appauth (from `.symlinks/plugins/flutter_appauth/ios`)
224-
- flutter_charset_detector_darwin (from `.symlinks/plugins/flutter_charset_detector_darwin/darwin`)
225219
- flutter_downloader (from `.symlinks/plugins/flutter_downloader/ios`)
226220
- flutter_file_dialog (from `.symlinks/plugins/flutter_file_dialog/ios`)
227221
- flutter_image_compress_common (from `.symlinks/plugins/flutter_image_compress_common/ios`)
@@ -267,7 +261,6 @@ SPEC REPOS:
267261
- SDWebImage
268262
- SDWebImageWebPCoder
269263
- SwiftyGif
270-
- UniversalDetector2
271264

272265
EXTERNAL SOURCES:
273266
app_links:
@@ -296,8 +289,6 @@ EXTERNAL SOURCES:
296289
:path: Flutter
297290
flutter_appauth:
298291
:path: ".symlinks/plugins/flutter_appauth/ios"
299-
flutter_charset_detector_darwin:
300-
:path: ".symlinks/plugins/flutter_charset_detector_darwin/darwin"
301292
flutter_downloader:
302293
:path: ".symlinks/plugins/flutter_downloader/ios"
303294
flutter_file_dialog:
@@ -366,7 +357,6 @@ SPEC CHECKSUMS:
366357
fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545
367358
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
368359
flutter_appauth: 1ce438877bc111c5d8f42da47729909290624886
369-
flutter_charset_detector_darwin: fb3692d6d72cb6afcce7b0dd1a9516be6e78556e
370360
flutter_downloader: b7301ae057deadd4b1650dc7c05375f10ff12c39
371361
flutter_file_dialog: 4c014a45b105709a27391e266c277d7e588e9299
372362
flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e
@@ -398,7 +388,6 @@ SPEC CHECKSUMS:
398388
share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
399389
shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
400390
SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
401-
UniversalDetector2: 7c9ffd935cf050eeb19edf7e90f6febe3743a1af
402391
url_launcher_ios: 68d46cc9766d0c41dbdc884310529557e3cd7a86
403392
workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6
404393

‎model/pubspec.lock‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -344,27 +344,20 @@ packages:
344344
flutter_charset_detector:
345345
dependency: transitive
346346
description:
347-
name: flutter_charset_detector
348-
sha256: "5d4796d43dac2f37e14149b0f0c676fa08e8eb1ada8e99342a838d971d2fb9b1"
349-
url: "https://pub.dev"
350-
source: hosted
351-
version: "3.0.0"
347+
path: flutter_charset_detector
348+
ref: main
349+
resolved-ref: "36c3ffeea65f7b362c1e47e608802f0ca941f4d4"
350+
url: "https://github.com/dab246/flutter_charset_detector.git"
351+
source: git
352+
version: "5.0.0"
352353
flutter_charset_detector_android:
353354
dependency: transitive
354355
description:
355356
name: flutter_charset_detector_android
356-
sha256: bee057133d5f134fe211523a27200dd22c782b93777f43359a571bd2c77da2cc
357-
url: "https://pub.dev"
358-
source: hosted
359-
version: "2.1.1"
360-
flutter_charset_detector_darwin:
361-
dependency: transitive
362-
description:
363-
name: flutter_charset_detector_darwin
364-
sha256: daac20390275efb92fbb14350fe11286c5e29c7b80d6b0867f52d760f0d69763
357+
sha256: "443145e8fc8515b3b32aee375691e40dd59197a86a2ae153166bc88c8200d83b"
365358
url: "https://pub.dev"
366359
source: hosted
367-
version: "1.1.0"
360+
version: "3.0.0"
368361
flutter_charset_detector_platform_interface:
369362
dependency: transitive
370363
description:
@@ -377,10 +370,10 @@ packages:
377370
dependency: transitive
378371
description:
379372
name: flutter_charset_detector_web
380-
sha256: d8495115abada771c75f9395aae3e5809ffd506e8fc8f62b403ae11fc29e1d2b
373+
sha256: e3ac65f94b12f4887937b21a19365d7927db816840cb93274e3861241cb0e9f2
381374
url: "https://pub.dev"
382375
source: hosted
383-
version: "1.0.2"
376+
version: "2.0.0"
384377
flutter_image_compress:
385378
dependency: transitive
386379
description:

‎pubspec.lock‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -714,43 +714,36 @@ packages:
714714
flutter_charset_detector:
715715
dependency: transitive
716716
description:
717-
name: flutter_charset_detector
718-
sha256: "5d4796d43dac2f37e14149b0f0c676fa08e8eb1ada8e99342a838d971d2fb9b1"
719-
url: "https://pub.dev"
720-
source: hosted
721-
version: "3.0.0"
717+
path: flutter_charset_detector
718+
ref: main
719+
resolved-ref: "36c3ffeea65f7b362c1e47e608802f0ca941f4d4"
720+
url: "https://github.com/dab246/flutter_charset_detector.git"
721+
source: git
722+
version: "5.0.0"
722723
flutter_charset_detector_android:
723724
dependency: transitive
724725
description:
725726
name: flutter_charset_detector_android
726-
sha256: "43d0c0063242d036b873ade737ebae38716af5cd8b2a4df1754adfd186d58e2c"
727+
sha256: "443145e8fc8515b3b32aee375691e40dd59197a86a2ae153166bc88c8200d83b"
727728
url: "https://pub.dev"
728729
source: hosted
729-
version: "2.0.1"
730-
flutter_charset_detector_darwin:
731-
dependency: transitive
732-
description:
733-
name: flutter_charset_detector_darwin
734-
sha256: d17c1847366a0501449d95d18a43417585841afe10200ceefb4422e6b7fccefb
735-
url: "https://pub.dev"
736-
source: hosted
737-
version: "1.0.0"
730+
version: "3.0.0"
738731
flutter_charset_detector_platform_interface:
739732
dependency: transitive
740733
description:
741734
name: flutter_charset_detector_platform_interface
742-
sha256: fcb61de27285031164c945aca4b42e4d36f9a9e359212f21ab652275c9c723ec
735+
sha256: "1c09ed7b314a5a9dde76057b98b7d35458ba881eed03d5e5b6f7f74b4869d18c"
743736
url: "https://pub.dev"
744737
source: hosted
745-
version: "1.0.0"
738+
version: "1.1.0"
746739
flutter_charset_detector_web:
747740
dependency: transitive
748741
description:
749742
name: flutter_charset_detector_web
750-
sha256: d8495115abada771c75f9395aae3e5809ffd506e8fc8f62b403ae11fc29e1d2b
743+
sha256: e3ac65f94b12f4887937b21a19365d7927db816840cb93274e3861241cb0e9f2
751744
url: "https://pub.dev"
752745
source: hosted
753-
version: "1.0.2"
746+
version: "2.0.0"
754747
flutter_colorpicker:
755748
dependency: transitive
756749
description:

0 commit comments

Comments
 (0)