Skip to content

Commit e657aa8

Browse files
Fix build ios (#1242)
1 parent afd6d83 commit e657aa8

File tree

5 files changed

+44
-129
lines changed

5 files changed

+44
-129
lines changed

ios/Podfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ target 'Runner' do
3333
use_modular_headers!
3434

3535
flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
36+
37+
pod 'FirebaseSharedSwift', '11.13.0'
38+
pod 'FirebaseRemoteConfigInterop', '11.13.0'
3639
end
3740

3841
post_install do |installer|

ios/Podfile.lock

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ PODS:
8181
- FirebaseSharedSwift (~> 11.0)
8282
- GoogleUtilities/Environment (~> 8.0)
8383
- "GoogleUtilities/NSData+zlib (~> 8.0)"
84-
- FirebaseRemoteConfigInterop (11.14.0)
84+
- FirebaseRemoteConfigInterop (11.13.0)
8585
- FirebaseSessions (11.10.0):
8686
- FirebaseCore (~> 11.10.0)
8787
- FirebaseCoreExtension (~> 11.10.0)
@@ -91,15 +91,8 @@ PODS:
9191
- GoogleUtilities/UserDefaults (~> 8.0)
9292
- nanopb (~> 3.30910.0)
9393
- PromisesSwift (~> 2.1)
94-
- FirebaseSharedSwift (11.14.0)
94+
- FirebaseSharedSwift (11.13.0)
9595
- Flutter (1.0.0)
96-
- flutter_inappwebview_ios (0.0.1):
97-
- Flutter
98-
- flutter_inappwebview_ios/Core (= 0.0.1)
99-
- OrderedSet (~> 6.0.3)
100-
- flutter_inappwebview_ios/Core (0.0.1):
101-
- Flutter
102-
- OrderedSet (~> 6.0.3)
10396
- flutter_secure_storage (6.0.0):
10497
- Flutter
10598
- fluttertoast (0.0.2):
@@ -167,7 +160,6 @@ PODS:
167160
- nanopb/encode (= 3.30910.0)
168161
- nanopb/decode (3.30910.0)
169162
- nanopb/encode (3.30910.0)
170-
- OrderedSet (6.0.3)
171163
- package_info_plus (0.4.5):
172164
- Flutter
173165
- path_provider_foundation (0.0.1):
@@ -194,8 +186,9 @@ DEPENDENCIES:
194186
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
195187
- firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
196188
- firebase_remote_config (from `.symlinks/plugins/firebase_remote_config/ios`)
189+
- FirebaseRemoteConfigInterop (= 11.13.0)
190+
- FirebaseSharedSwift (= 11.13.0)
197191
- Flutter (from `Flutter`)
198-
- flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
199192
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
200193
- fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
201194
- in_app_review (from `.symlinks/plugins/in_app_review/ios`)
@@ -226,7 +219,6 @@ SPEC REPOS:
226219
- GoogleUtilities
227220
- MSAL
228221
- nanopb
229-
- OrderedSet
230222
- PromisesObjC
231223
- PromisesSwift
232224

@@ -245,8 +237,6 @@ EXTERNAL SOURCES:
245237
:path: ".symlinks/plugins/firebase_remote_config/ios"
246238
Flutter:
247239
:path: Flutter
248-
flutter_inappwebview_ios:
249-
:path: ".symlinks/plugins/flutter_inappwebview_ios/ios"
250240
flutter_secure_storage:
251241
:path: ".symlinks/plugins/flutter_secure_storage/ios"
252242
fluttertoast:
@@ -284,11 +274,10 @@ SPEC CHECKSUMS:
284274
FirebaseCrashlytics: 84b073c997235740e6a951b7ee49608932877e5c
285275
FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3
286276
FirebaseRemoteConfig: 10695bc0ce3b103e3706a5578c43f2a9f69d5aaa
287-
FirebaseRemoteConfigInterop: 7b74ceaa54e28863ed17fa39da8951692725eced
277+
FirebaseRemoteConfigInterop: 7915cec47731a806cda541f90898ad0fab8f9f86
288278
FirebaseSessions: 9b3b30947b97a15370e0902ee7a90f50ef60ead6
289-
FirebaseSharedSwift: bdd5c8674c4712a98e70287c936bc5cca5d640f6
279+
FirebaseSharedSwift: aca73668bc95e8efccb618e0167eab05d19d3a75
290280
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
291-
flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
292281
flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
293282
fluttertoast: 21eecd6935e7064cc1fcb733a4c5a428f3f24f0f
294283
GoogleAppMeasurement: 36684bfb3ee034e2b42b4321eb19da3a1b81e65d
@@ -298,7 +287,6 @@ SPEC CHECKSUMS:
298287
MSAL: 088bc688c1ce1a62f0d9c13905ddb31f8f1ac700
299288
msal_auth: 1a1feed23c03c9c2f627d9d1669b4bc8f1650853
300289
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
301-
OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
302290
package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
303291
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
304292
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
@@ -308,6 +296,6 @@ SPEC CHECKSUMS:
308296
sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
309297
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
310298

311-
PODFILE CHECKSUM: f572917ae84758132022c9f4ae7e2ee3d120ffba
299+
PODFILE CHECKSUM: 478aa23663a968cec78c84fd0ed8a500a9aa68b9
312300

313301
COCOAPODS: 1.16.2
Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,37 @@
11
// Package imports:
2-
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
3-
import 'package:url_launcher/url_launcher.dart' as url_launch;
2+
import 'package:url_launcher/url_launcher.dart';
43

54
// Project imports:
65
import 'package:notredame/data/repositories/settings_repository.dart';
76
import 'package:notredame/locator.dart';
8-
import 'package:notredame/ui/core/themes/app_palette.dart';
97

108
class LaunchUrlService {
119
final SettingsRepository settingsManager = locator<SettingsRepository>();
12-
final browser = ChromeSafariBrowser();
1310

1411
Future<void> writeEmail(String emailAddress, String subject) async {
1512
final uri = Uri.parse('mailto:$emailAddress?subject=$subject');
16-
if (await url_launch.canLaunchUrl(uri)) {
17-
url_launch.launchUrl(uri);
13+
if (await canLaunchUrl(uri)) {
14+
launchUrl(uri);
1815
} else {
1916
throw 'Could not send email to $emailAddress';
2017
}
2118
}
2219

2320
Future<void> call(String phoneNumber) async {
2421
final uri = Uri.parse('tel:$phoneNumber');
25-
if (await url_launch.canLaunchUrl(uri)) {
26-
url_launch.launchUrl(uri);
22+
if (await canLaunchUrl(uri)) {
23+
launchUrl(uri);
2724
} else {
2825
throw 'Could not call $phoneNumber';
2926
}
3027
}
3128

32-
void launchInBrowser(String url) {
33-
browser.open(
34-
url: WebUri(url),
35-
settings: ChromeSafariBrowserSettings(
36-
// Android
37-
dismissButtonStyle: DismissButtonStyle.CLOSE,
38-
enableUrlBarHiding: true,
39-
toolbarBackgroundColor: AppPalette.etsLightRed,
40-
navigationBarColor: AppPalette.grey.black,
41-
42-
// iOS
43-
barCollapsingEnabled: true,
44-
preferredControlTintColor: AppPalette.grey.white,
45-
preferredBarTintColor: AppPalette.etsLightRed,
46-
),
47-
);
29+
Future<void> launchInBrowser(String url) async {
30+
final uri = Uri.parse(url);
31+
if (await canLaunchUrl(uri)) {
32+
launchUrl(uri, browserConfiguration: BrowserConfiguration(showTitle: false));
33+
} else {
34+
throw 'Could not launch $url';
35+
}
4836
}
4937
}

pubspec.lock

Lines changed: 20 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ packages:
1313
dependency: transitive
1414
description:
1515
name: _flutterfire_internals
16-
sha256: "214e6f07e2a44f45972e0365c7b537eaeaddb4598db0778dd4ac64b4acd3f5b1"
16+
sha256: de9ecbb3ddafd446095f7e833c853aff2fa1682b017921fe63a833f9d6f0e422
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "1.3.55"
19+
version: "1.3.54"
2020
analyzer:
2121
dependency: transitive
2222
description:
@@ -277,34 +277,34 @@ packages:
277277
dependency: "direct main"
278278
description:
279279
name: firebase_analytics
280-
sha256: b5b31727ad7c7f41e139637d1d582e435fd14054abcbd162c64476f90737105c
280+
sha256: "2416b9d864412ab7b571dafded801bbcc7e29b5824623c055002d4d0819bea2b"
281281
url: "https://pub.dev"
282282
source: hosted
283-
version: "11.4.6"
283+
version: "11.4.5"
284284
firebase_analytics_platform_interface:
285285
dependency: transitive
286286
description:
287287
name: firebase_analytics_platform_interface
288-
sha256: "86817ee7db6377e09830467932c31644713d8e8915cefff64610ad735612bc7d"
288+
sha256: "3ccf5c876a8bea186016de4bcf53fc1bc6fa01236d740fb501d7ef9be356c58e"
289289
url: "https://pub.dev"
290290
source: hosted
291-
version: "4.3.6"
291+
version: "4.3.5"
292292
firebase_analytics_web:
293293
dependency: transitive
294294
description:
295295
name: firebase_analytics_web
296-
sha256: "4914e184a6aa37811d976db59f95fa8fda1d58db49ab7f73d4d8aac9dd9b19b7"
296+
sha256: "5e4e3f001b67c2034b76cb2a42a0eed330fb3a8fb41ad13eceb04e8d9a74f662"
297297
url: "https://pub.dev"
298298
source: hosted
299-
version: "0.5.10+12"
299+
version: "0.5.10+11"
300300
firebase_core:
301301
dependency: "direct main"
302302
description:
303303
name: firebase_core
304-
sha256: "8cfe3c900512399ce8d50fcc817e5758ff8615eeb6fa5c846a4cc47bbf6353b6"
304+
sha256: "017d17d9915670e6117497e640b2859e0b868026ea36bf3a57feb28c3b97debe"
305305
url: "https://pub.dev"
306306
source: hosted
307-
version: "3.13.1"
307+
version: "3.13.0"
308308
firebase_core_platform_interface:
309309
dependency: transitive
310310
description:
@@ -325,42 +325,42 @@ packages:
325325
dependency: "direct main"
326326
description:
327327
name: firebase_crashlytics
328-
sha256: "49d20b1dd87bb42746e27b5c72c1e3a3d84ae6415d062f8b31ecb71a35d36d0c"
328+
sha256: f3fa4a17c2f061b16b2e3ac7aaed889ae954b8952d0fd3e0009a9870cde7bbd2
329329
url: "https://pub.dev"
330330
source: hosted
331-
version: "4.3.6"
331+
version: "4.3.5"
332332
firebase_crashlytics_platform_interface:
333333
dependency: transitive
334334
description:
335335
name: firebase_crashlytics_platform_interface
336-
sha256: "0a5b2c9a662db7563482547b31da06a3951277cbfb42af12c5b52a15456ea951"
336+
sha256: cedfbe39927711c0e56fc38bfecbd89e17816b21698a3d88d63298c530ed375c
337337
url: "https://pub.dev"
338338
source: hosted
339-
version: "3.8.6"
339+
version: "3.8.5"
340340
firebase_remote_config:
341341
dependency: "direct main"
342342
description:
343343
name: firebase_remote_config
344-
sha256: e65062f7435c8be13826d38c75218b30251a096ca742e7da55342b33ff8b4749
344+
sha256: "0178bc8f44a8a30e720ec837fc2a0bac3d99837091d53c2a84d2d5d11da55854"
345345
url: "https://pub.dev"
346346
source: hosted
347-
version: "5.4.4"
347+
version: "5.4.3"
348348
firebase_remote_config_platform_interface:
349349
dependency: transitive
350350
description:
351351
name: firebase_remote_config_platform_interface
352-
sha256: "6d2f94570edbea0b1fb47e623af576f1896d14f839b1e3ba9b393a5e7c93c84d"
352+
sha256: df77610b1d0b542729e66358c9a1fd3633b35eb58634269686d36058e57e3c84
353353
url: "https://pub.dev"
354354
source: hosted
355-
version: "1.5.4"
355+
version: "1.5.3"
356356
firebase_remote_config_web:
357357
dependency: transitive
358358
description:
359359
name: firebase_remote_config_web
360-
sha256: "5cf6eff2748193b64e9eb9965d5d727585f562d2946a53239385ad667e1c22e4"
360+
sha256: "0cbfbe358f396f1663e53bdae626748efed4cf17bf316f29c680c975aa7601e8"
361361
url: "https://pub.dev"
362362
source: hosted
363-
version: "1.8.4"
363+
version: "1.8.3"
364364
fixnum:
365365
dependency: transitive
366366
description:
@@ -382,70 +382,6 @@ packages:
382382
url: "https://pub.dev"
383383
source: hosted
384384
version: "3.4.1"
385-
flutter_inappwebview:
386-
dependency: "direct main"
387-
description:
388-
name: flutter_inappwebview
389-
sha256: "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5"
390-
url: "https://pub.dev"
391-
source: hosted
392-
version: "6.1.5"
393-
flutter_inappwebview_android:
394-
dependency: transitive
395-
description:
396-
name: flutter_inappwebview_android
397-
sha256: "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba"
398-
url: "https://pub.dev"
399-
source: hosted
400-
version: "1.1.3"
401-
flutter_inappwebview_internal_annotations:
402-
dependency: transitive
403-
description:
404-
name: flutter_inappwebview_internal_annotations
405-
sha256: "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd"
406-
url: "https://pub.dev"
407-
source: hosted
408-
version: "1.2.0"
409-
flutter_inappwebview_ios:
410-
dependency: transitive
411-
description:
412-
name: flutter_inappwebview_ios
413-
sha256: "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d"
414-
url: "https://pub.dev"
415-
source: hosted
416-
version: "1.1.2"
417-
flutter_inappwebview_macos:
418-
dependency: transitive
419-
description:
420-
name: flutter_inappwebview_macos
421-
sha256: c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1
422-
url: "https://pub.dev"
423-
source: hosted
424-
version: "1.1.2"
425-
flutter_inappwebview_platform_interface:
426-
dependency: transitive
427-
description:
428-
name: flutter_inappwebview_platform_interface
429-
sha256: cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500
430-
url: "https://pub.dev"
431-
source: hosted
432-
version: "1.3.0+1"
433-
flutter_inappwebview_web:
434-
dependency: transitive
435-
description:
436-
name: flutter_inappwebview_web
437-
sha256: "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598"
438-
url: "https://pub.dev"
439-
source: hosted
440-
version: "1.1.2"
441-
flutter_inappwebview_windows:
442-
dependency: transitive
443-
description:
444-
name: flutter_inappwebview_windows
445-
sha256: "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055"
446-
url: "https://pub.dev"
447-
source: hosted
448-
version: "0.6.0"
449385
flutter_launcher_icons:
450386
dependency: "direct dev"
451387
description:

pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: The 4th generation of ÉTSMobile, the main gateway between the Éco
55
# pub.dev using `pub publish`. This is preferred for private packages.
66
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
77

8-
version: 4.59.8
8+
version: 4.59.9
99

1010
environment:
1111
sdk: '>=3.8.0 <4.0.0'
@@ -26,8 +26,8 @@ dependencies:
2626
firebase_analytics: ^11.4.6
2727
firebase_crashlytics: ^4.3.6
2828
firebase_remote_config: ^5.4.4
29+
2930
# Web
30-
flutter_inappwebview: ^6.1.5
3131
url_launcher: ^6.3.1
3232

3333
# Utils

0 commit comments

Comments
 (0)